diff options
Diffstat (limited to 'Assets/Scripts')
15 files changed, 200 insertions, 75 deletions
diff --git a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs index 39298b6f..6732cf57 100644 --- a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs +++ b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine;
/// <summary>
-/// 攻击ability
+/// 单个招式ability
/// </summary>
public class AttackAbilityBase : AbilityBase
{
diff --git a/Assets/Scripts/Physics/HurtBox.cs b/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs index c7fd97bd..1c27a487 100644 --- a/Assets/Scripts/Physics/HurtBox.cs +++ b/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs @@ -1,18 +1,18 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class HurtBox : MonoBehaviour
-{
- // Start is called before the first frame update
- void Start()
- {
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
- }
-}
+using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ActionDontUseGravity : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Physics/HurtBox.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs.meta index c74284f1..9957eef0 100644 --- a/Assets/Scripts/Physics/HurtBox.cs.meta +++ b/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fdb3c8999ca3f954e81886171ce9517f +guid: 500bcab3888d71747971dfa5f364fcd6 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Physics/HitBox.cs b/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs index a6337abd..da83d163 100644 --- a/Assets/Scripts/Physics/HitBox.cs +++ b/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs @@ -1,8 +1,10 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class HitBox : PhysicsBox
-{
-
-}
+using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ActionUseGravity : ActionBase +{ + public override void Execute() + { + } +} diff --git a/Assets/Scripts/Physics/DefendBox.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs.meta index bc2f10ad..42eeb7aa 100644 --- a/Assets/Scripts/Physics/DefendBox.cs.meta +++ b/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cb44b541bd6b6f747bb9079c7249d23f +guid: 5b25d9149f0503645907db055a0e94f5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Physics/DefendBox.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckHp.cs index 730fe640..ec4e489c 100644 --- a/Assets/Scripts/Physics/DefendBox.cs +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckHp.cs @@ -1,18 +1,18 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class DefendBox : MonoBehaviour
-{
- // Start is called before the first frame update
- void Start()
- {
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
- }
-}
+using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ConditionCheckHp : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Physics/HitBox.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckHp.cs.meta index f220b38f..e5b205b2 100644 --- a/Assets/Scripts/Physics/HitBox.cs.meta +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckHp.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73d73d5d2dc8d324b8b75ccd818af01d +guid: e4b80b2be76ae9149af7b8a57f1e68ef MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckMp.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckMp.cs new file mode 100644 index 00000000..c14bff3c --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckMp.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ConditionCheckMp : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckMp.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckMp.cs.meta new file mode 100644 index 00000000..d920a18f --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckMp.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a603843f7ac083c45ba5b2ec23d4cc0b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Physics/PhysicsBox.cs b/Assets/Scripts/Physics/PhysicsBox.cs index 657aea71..8c93a1e1 100644 --- a/Assets/Scripts/Physics/PhysicsBox.cs +++ b/Assets/Scripts/Physics/PhysicsBox.cs @@ -29,9 +29,11 @@ public class PhysicsBox : PhysicsPrimitive public float Wide { get { return m_Size.y; } }
public float Height { get { return m_Size.z; } }
+ public bool m_DrawGizmo = true;
+
public void OnDrawGizmos()
{
- if (!m_IsActive)
+ if (!m_IsActive || !m_DrawGizmo)
return;
Vector3 pos = Position;
Gizmos.color = m_HintColor;
diff --git a/Assets/Scripts/Physics/PhysicsHelper.cs b/Assets/Scripts/Physics/PhysicsHelper.cs index 94916bfc..aa31108e 100644 --- a/Assets/Scripts/Physics/PhysicsHelper.cs +++ b/Assets/Scripts/Physics/PhysicsHelper.cs @@ -2,12 +2,23 @@ using System.Collections.Generic;
using UnityEngine;
+enum CollisionType
+{
+ BallvsBall = 1,
+ BallvsBox,
+ BoxvsBox
+}
+
+
/// <summary>
/// 碰撞的信息
/// </summary>
public class PhysicsCollisionInfo
{
-
+ CollisionType type;
+ PhysicsPrimitive prim1;
+ PhysicsPrimitive prim2;
+ Vector3 contacts;
}
public sealed class PhysicsHelper
@@ -34,6 +45,39 @@ public sealed class PhysicsHelper return true;
}
+ public static bool BallvsRay(PhysicsBall ball, Vector3 ray)
+ {
+ return false;
+ }
+
+ public static bool BoxvsRay(PhysicsBox box, Vector3 ray)
+ {
+ return false;
+ }
+
+ public static bool RayvsRay(Vector3 ray1, Vector3 ray2)
+ {
+ return false;
+ }
+
+ public static bool PrimvsPrim(PhysicsPrimitive prim1, PhysicsPrimitive prim2, out PhysicsCollisionInfo info)
+ {
+ if(prim1.Type == PrimitiveType.Ball)
+ {
+ if (prim2.Type == PrimitiveType.Ball)
+ return BallvsBall2D(prim1 as PhysicsBall, prim2 as PhysicsBall, out info);
+ else
+ return BallvsBox2D(prim1 as PhysicsBall, prim2 as PhysicsBox, out info);
+ }
+ else
+ {
+ if (prim2.Type == PrimitiveType.Ball)
+ return BallvsBox2D(prim2 as PhysicsBall, prim1 as PhysicsBox, out info);
+ else
+ return BoxvsBox2D(prim1 as PhysicsBox, prim2 as PhysicsBox, out info);
+ }
+ }
+
#endregion
public static bool BallvsBall(PhysicsBall ball1, PhysicsBall ball2, out PhysicsCollisionInfo info)
diff --git a/Assets/Scripts/Physics/PhysicsPrimitive.cs b/Assets/Scripts/Physics/PhysicsPrimitive.cs index 99549db3..59c56aaf 100644 --- a/Assets/Scripts/Physics/PhysicsPrimitive.cs +++ b/Assets/Scripts/Physics/PhysicsPrimitive.cs @@ -64,6 +64,7 @@ public abstract class PhysicsPrimitive : MonoBehaviour }
}
+ [Tooltip("给primitive分组，决定大组和大组之间是否有碰撞检测")]
[SerializeField]
protected PhysicsGroup m_Group;
public PhysicsGroup Group
@@ -74,6 +75,7 @@ public abstract class PhysicsPrimitive : MonoBehaviour }
}
+ [Tooltip("给primitive一个标记，表明它的从属关系。帮助做hitbox和hurtbox")]
[SerializeField]
protected PhysicsTag m_Tag;
public PhysicsTag Tag
@@ -84,7 +86,19 @@ public abstract class PhysicsPrimitive : MonoBehaviour }
}
- [SerializeField]
+ [Tooltip("同一个标签的没有碰撞检测")]
+ [SerializeField]
+ protected string m_Label;
+ public string Label
+ {
+ get
+ {
+ return m_Label;
+ }
+ }
+
+ [Tooltip("单个碰撞体的描述(名称)，作为标识用来识别")]
+ [SerializeField]
protected string m_Title;
public string Title
{
diff --git a/Assets/Scripts/Physics/PhysicsWorld.cs b/Assets/Scripts/Physics/PhysicsWorld.cs index 5ef747b2..3514934c 100644 --- a/Assets/Scripts/Physics/PhysicsWorld.cs +++ b/Assets/Scripts/Physics/PhysicsWorld.cs @@ -1,17 +1,8 @@ -using System.Collections;
+ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
/// <summary>
-/// primitive标记
-/// </summary>
-public enum PhysicsTag
-{
- Player = 1, // 从属于玩家
- Oponent = 1 << 1, // 从属于对手
-}
-
-/// <summary>
/// primitive分类
/// </summary>
public enum PhysicsGroup
@@ -20,17 +11,36 @@ public enum PhysicsGroup Prop, // 物体
Ground, // 地面
Wall, // 墙面
+
+ GroupCount,
+}
+
+/// <summary>
+/// primitive标记
+/// </summary>
+public enum PhysicsTag
+{
+ Player = 1, // 从属于玩家
+ Oponent = 1 << 1, // 从属于对手
}
public class PhysicsWorld : Singleton<PhysicsWorld>
{
- private int m_UpdateRate = 30;
+ private int m_UpdateRate = 60;
// 重力加速度
private readonly Vector3 m_Gravity = new Vector3(0, -9.8f, 0);
// 当前管理的碰撞体
private List<PhysicsPrimitive> m_Primitives;
private float m_TimeCount;
+ private readonly int[] m_CollisionTable = {
+ // wall ground prop character
+/*character*/ 1, 1, 1, 1,
+/*prop */ 1, 1, 0, 0,
+/*ground */ 0, 0, 0, 0,
+/*wall */ 0, 0, 0, 0,
+ };
+
public void Init()
{
m_Primitives = new List<PhysicsPrimitive>();
@@ -74,9 +84,33 @@ public class PhysicsWorld : Singleton<PhysicsWorld> private void Tick()
{
- float deltaTime = 1f / m_UpdateRate;
- //Debug.Log("Physics Tick");
+ float deltaTime = 1f / m_UpdateRate;
+ int groupCount = (int)PhysicsGroup.GroupCount;
+ for (int i = 0; i < m_Primitives.Count; ++i)
+ {
+ PhysicsPrimitive prim1 = m_Primitives[i];
+ for(int j = i + 1; j < m_Primitives.Count; ++j)
+ {
+ PhysicsPrimitive prim2 = m_Primitives[j];
+
+ // check collision by group
+ int minType = Mathf.Min((int)prim1.Type, (int)prim2.Type);
+ int maxType = Mathf.Max((int)prim1.Type, (int)prim2.Type);
+ if (m_CollisionTable[minType * groupCount + groupCount - maxType - 1] == 0)
+ continue;
+
+ // check collision by label
+ if (prim1.Label == prim2.Label)
+ continue;
+ PhysicsCollisionInfo info;
+ if(PhysicsHelper.PrimvsPrim(prim1, prim2, out info))
+ {
+ //没有physics body的primitive将不会被移动，只有那些绑定了physics body的会被施加物理效果，比如角色身体、物品
+
+ }
+ }
+ }
}
-}
+}
\ No newline at end of file diff --git a/Assets/Scripts/Test/SaionjiScript.cs b/Assets/Scripts/Test/SaionjiScript.cs index a3216dd5..f10c9b1d 100644 --- a/Assets/Scripts/Test/SaionjiScript.cs +++ b/Assets/Scripts/Test/SaionjiScript.cs @@ -17,16 +17,6 @@ public partial class SaionjiScript : MonoBehaviour IdleHash = Animator.StringToHash("Idle Fight 0");
}
- private void OnCollisionEnter(Collision collision)
- {
- Debug.Log("OnCollisionEnter()");
- }
-
- private void OnTriggerEnter(Collider other)
- {
- Debug.Log("OnTriggerEnter()");
- }
-
private void Update()
{
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs index cc6e8caf..59d55630 100644 --- a/Assets/Scripts/Test/SaionjiScript_Ability.cs +++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs @@ -9,6 +9,16 @@ public partial class SaionjiScript : MonoBehaviour /// </summary>
AbilitySystem m_AbilitySystem = new AbilitySystem();
+ ConditionBase And(ConditionBase c1, ConditionBase c2)
+ {
+ return new ConditionAnd(c1, c2);
+ }
+
+ ConditionBase Or(ConditionBase c1, ConditionBase c2)
+ {
+ return new ConditionOr(c1,c2);
+ }
+
/// <summary>
/// 设置abilities
/// </summary>
|