152 files changed, 193 insertions, 95 deletions
diff --git a/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs
deleted file mode 100644
index 7a5c00df..00000000
--- a/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class HurtAbility : 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.meta b/Assets/Scripts/Avatar.meta
index 11b04f5f..11b04f5f 100644
--- a/Assets/Scripts/AbilitySystem.meta
+++ b/Assets/Scripts/Avatar.meta
diff --git a/Assets/Scripts/AbilitySystem/Abilities.meta b/Assets/Scripts/Avatar/Abilities.meta
index 4b958769..4b958769 100644
--- a/Assets/Scripts/AbilitySystem/Abilities.meta
+++ b/Assets/Scripts/Avatar/Abilities.meta
diff --git a/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs b/Assets/Scripts/Avatar/Abilities/AbilityBase.cs
index 8b1a5549..8b1a5549 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs
+++ b/Assets/Scripts/Avatar/Abilities/AbilityBase.cs
diff --git a/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs.meta b/Assets/Scripts/Avatar/Abilities/AbilityBase.cs.meta
index 79a6b7eb..79a6b7eb 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs.meta
+++ b/Assets/Scripts/Avatar/Abilities/AbilityBase.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs b/Assets/Scripts/Avatar/Abilities/AttackAbility.cs
index 168b6086..9ca52a4c 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs
+++ b/Assets/Scripts/Avatar/Abilities/AttackAbility.cs
@@ -13,26 +13,43 @@ public struct AttackAbilityConfig
 // 单独的一个招式
 public class AttackAbility : AbilityBase
 {
-	AttackAbilityConfig m_Config = new AttackAbilityConfig();
+    AttackAbilityConfig m_Config = new AttackAbilityConfig();
+
+    /// <summary>
+    /// 在跑动状态时可以切换的ability
+    /// </summary>
+    private List<Trigger> m_Triggers = new List<Trigger>();
+
+    private List<Trigger> m_LateTriggers = new List<Trigger>();
+
+    /// <summary>
+    /// 这个招式所有hit的效果
+    /// </summary>
+    public HitDefination[] HitDef;
+
+    /// <summary>
+    /// 从动画结束开始计时
+    /// </summary>
+    float m_TimeCount;
+    public float ExpireTime
+    {
+        get
+        {
+            return m_TimeCount;
+        }
+    }
+
+    /// <summary>
+    /// 这个招式的hit个数
+    /// </summary>
+    public int HitCount
+    {
+        get
+        {
+            return HitDef != null ? HitDef.Length : 0;
+        }
+    }
 
-	/// <summary>
-	/// 在跑动状态时可以切换的ability
-	/// </summary>
-	private List<Trigger> m_Triggers = new List<Trigger>();
-
-	private List<Trigger> m_LateTriggers = new List<Trigger>();
-
-	/// <summary>
-	/// 从动画结束开始计时
-	/// </summary>
-	float m_TimeCount;
-	public float ExpireTime
-	{
-		get
-		{
-			return m_TimeCount;
-		}
-	}
 
 	public AttackAbility(Animator animator, int animation, PhysicsBody body = null)
 	{
diff --git a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs.meta b/Assets/Scripts/Avatar/Abilities/AttackAbility.cs.meta
index 4159d2bc..4159d2bc 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs.meta
+++ b/Assets/Scripts/Avatar/Abilities/AttackAbility.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs b/Assets/Scripts/Avatar/Abilities/DashAbility.cs
index b9a479b5..b9a479b5 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs
+++ b/Assets/Scripts/Avatar/Abilities/DashAbility.cs
diff --git a/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs.meta b/Assets/Scripts/Avatar/Abilities/DashAbility.cs.meta
index c246c665..c246c665 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs.meta
+++ b/Assets/Scripts/Avatar/Abilities/DashAbility.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs b/Assets/Scripts/Avatar/Abilities/DodgeAbility.cs
index 79e8fc61..79e8fc61 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs
+++ b/Assets/Scripts/Avatar/Abilities/DodgeAbility.cs
diff --git a/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs.meta b/Assets/Scripts/Avatar/Abilities/DodgeAbility.cs.meta
index e7297a88..e7297a88 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs.meta
+++ b/Assets/Scripts/Avatar/Abilities/DodgeAbility.cs.meta
diff --git a/Assets/Scripts/Avatar/Abilities/HurtAbility.cs b/Assets/Scripts/Avatar/Abilities/HurtAbility.cs
new file mode 100644
index 00000000..c12c89c6
--- /dev/null
+++ b/Assets/Scripts/Avatar/Abilities/HurtAbility.cs
@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 将伤害类型进行分类，决定不同的motion类型
+/// </summary>
+public enum HurtType
+{
+    Light = 0,  // 轻击
+    Medium, // 中击
+    Hard,   // 重击
+    Back,    
+    Up,
+    Diagup
+}
+
+public class HurtAbility : AbilityBase
+{
+
+}
diff --git a/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs.meta b/Assets/Scripts/Avatar/Abilities/HurtAbility.cs.meta
index 0e70d0be..0e70d0be 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs.meta
+++ b/Assets/Scripts/Avatar/Abilities/HurtAbility.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs b/Assets/Scripts/Avatar/Abilities/IdleAbility.cs
index d42308db..d42308db 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs
+++ b/Assets/Scripts/Avatar/Abilities/IdleAbility.cs
diff --git a/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs.meta b/Assets/Scripts/Avatar/Abilities/IdleAbility.cs.meta
index 07d0c292..07d0c292 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs.meta
+++ b/Assets/Scripts/Avatar/Abilities/IdleAbility.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Abilities/JumpAbility.cs b/Assets/Scripts/Avatar/Abilities/JumpAbility.cs
index e0f73efa..e0f73efa 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/JumpAbility.cs
+++ b/Assets/Scripts/Avatar/Abilities/JumpAbility.cs
diff --git a/Assets/Scripts/AbilitySystem/Abilities/JumpAbility.cs.meta b/Assets/Scripts/Avatar/Abilities/JumpAbility.cs.meta
index 6c67c462..6c67c462 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/JumpAbility.cs.meta
+++ b/Assets/Scripts/Avatar/Abilities/JumpAbility.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs b/Assets/Scripts/Avatar/Abilities/MoveAbility.cs
index 757cd2d1..757cd2d1 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs
+++ b/Assets/Scripts/Avatar/Abilities/MoveAbility.cs
diff --git a/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs.meta b/Assets/Scripts/Avatar/Abilities/MoveAbility.cs.meta
index 08b2954c..08b2954c 100644
--- a/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs.meta
+++ b/Assets/Scripts/Avatar/Abilities/MoveAbility.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/AbilitySystem.cs b/Assets/Scripts/Avatar/AbilitySystem.cs
index 46156c55..46156c55 100644
--- a/Assets/Scripts/AbilitySystem/AbilitySystem.cs
+++ b/Assets/Scripts/Avatar/AbilitySystem.cs
diff --git a/Assets/Scripts/AbilitySystem/AbilitySystem.cs.meta b/Assets/Scripts/Avatar/AbilitySystem.cs.meta
index 52e8267c..52e8267c 100644
--- a/Assets/Scripts/AbilitySystem/AbilitySystem.cs.meta
+++ b/Assets/Scripts/Avatar/AbilitySystem.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions.meta b/Assets/Scripts/Avatar/Actions.meta
index d3b985d9..d3b985d9 100644
--- a/Assets/Scripts/AbilitySystem/Actions.meta
+++ b/Assets/Scripts/Avatar/Actions.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs b/Assets/Scripts/Avatar/Actions/ActionAnimCrossFade.cs
index 6f2252d7..6f2252d7 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionAnimCrossFade.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs.meta b/Assets/Scripts/Avatar/Actions/ActionAnimCrossFade.cs.meta
index 6eed1575..6eed1575 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionAnimCrossFade.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionBase.cs b/Assets/Scripts/Avatar/Actions/ActionBase.cs
index 1458e340..1458e340 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionBase.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionBase.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionBase.cs.meta b/Assets/Scripts/Avatar/Actions/ActionBase.cs.meta
index 8ef84b69..8ef84b69 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionBase.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionBase.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs b/Assets/Scripts/Avatar/Actions/ActionDontUseGravity.cs
index 82b176fd..82b176fd 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionDontUseGravity.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs.meta b/Assets/Scripts/Avatar/Actions/ActionDontUseGravity.cs.meta
index 9957eef0..9957eef0 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionDontUseGravity.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionEffects.meta b/Assets/Scripts/Avatar/Actions/ActionEffects.meta
index 17a426dd..17a426dd 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionEffects.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionEffects.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs b/Assets/Scripts/Avatar/Actions/ActionFlashEffect.cs
index c411c3fa..c411c3fa 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionFlashEffect.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs.meta b/Assets/Scripts/Avatar/Actions/ActionFlashEffect.cs.meta
index ea99c96b..ea99c96b 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionFlashEffect.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs b/Assets/Scripts/Avatar/Actions/ActionFreeze.cs
index 7f26f35a..7f26f35a 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionFreeze.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs.meta b/Assets/Scripts/Avatar/Actions/ActionFreeze.cs.meta
index eb9fe77a..eb9fe77a 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionFreeze.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionJump.cs b/Assets/Scripts/Avatar/Actions/ActionJump.cs
index cb3da106..cb3da106 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionJump.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionJump.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionJump.cs.meta b/Assets/Scripts/Avatar/Actions/ActionJump.cs.meta
index 8c48a0a7..8c48a0a7 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionJump.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionJump.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionJumpBack.cs b/Assets/Scripts/Avatar/Actions/ActionJumpBack.cs
index c21fce77..c21fce77 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionJumpBack.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionJumpBack.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionJumpBack.cs.meta b/Assets/Scripts/Avatar/Actions/ActionJumpBack.cs.meta
index c8db01c7..c8db01c7 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionJumpBack.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionJumpBack.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionJumpBackward.cs b/Assets/Scripts/Avatar/Actions/ActionJumpBackward.cs
index 0751d659..0751d659 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionJumpBackward.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionJumpBackward.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionJumpBackward.cs.meta b/Assets/Scripts/Avatar/Actions/ActionJumpBackward.cs.meta
index 99c729b3..99c729b3 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionJumpBackward.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionJumpBackward.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionJumpForward.cs b/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs
index 4e71dcf6..4e71dcf6 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionJumpForward.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionJumpForward.cs.meta b/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs.meta
index 27f6ba43..27f6ba43 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionJumpForward.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionLog.cs b/Assets/Scripts/Avatar/Actions/ActionLog.cs
index b276d2ef..b276d2ef 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionLog.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionLog.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionLog.cs.meta b/Assets/Scripts/Avatar/Actions/ActionLog.cs.meta
index 92995276..92995276 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionLog.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionLog.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySfx.cs b/Assets/Scripts/Avatar/Actions/ActionPlaySfx.cs
index 442ce999..442ce999 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySfx.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionPlaySfx.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySfx.cs.meta b/Assets/Scripts/Avatar/Actions/ActionPlaySfx.cs.meta
index 2b206e8f..2b206e8f 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySfx.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionPlaySfx.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs b/Assets/Scripts/Avatar/Actions/ActionPlaySound.cs
index 237b7455..237b7455 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionPlaySound.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs.meta b/Assets/Scripts/Avatar/Actions/ActionPlaySound.cs.meta
index a9bbf014..a9bbf014 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionPlaySound.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionPositionAdd.cs b/Assets/Scripts/Avatar/Actions/ActionPositionAdd.cs
index 9db10173..9db10173 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionPositionAdd.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionPositionAdd.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionPositionAdd.cs.meta b/Assets/Scripts/Avatar/Actions/ActionPositionAdd.cs.meta
index 209f3795..209f3795 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionPositionAdd.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionPositionAdd.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionRush.cs b/Assets/Scripts/Avatar/Actions/ActionRush.cs
index 19f1b625..19f1b625 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionRush.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionRush.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionRush.cs.meta b/Assets/Scripts/Avatar/Actions/ActionRush.cs.meta
index 760ef5f0..760ef5f0 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionRush.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionRush.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionSetFeetPosition.cs b/Assets/Scripts/Avatar/Actions/ActionSetFeetPosition.cs
index 8869801d..8869801d 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionSetFeetPosition.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionSetFeetPosition.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionSetFeetPosition.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSetFeetPosition.cs.meta
index 87656dc0..87656dc0 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionSetFeetPosition.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionSetFeetPosition.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionSetPosition.cs b/Assets/Scripts/Avatar/Actions/ActionSetPosition.cs
index a4e62294..a4e62294 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionSetPosition.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionSetPosition.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionSetPosition.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSetPosition.cs.meta
index 466f5692..466f5692 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionSetPosition.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionSetPosition.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionSetVelocity.cs b/Assets/Scripts/Avatar/Actions/ActionSetVelocity.cs
index 3289ac81..3289ac81 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionSetVelocity.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionSetVelocity.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionSetVelocity.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSetVelocity.cs.meta
index 3f677ed0..3f677ed0 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionSetVelocity.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionSetVelocity.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs b/Assets/Scripts/Avatar/Actions/ActionShakeCamera.cs
index d55270ab..d55270ab 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionShakeCamera.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs.meta b/Assets/Scripts/Avatar/Actions/ActionShakeCamera.cs.meta
index 93a39df8..93a39df8 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionShakeCamera.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionSwitchAbility.cs b/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs
index 1e214d72..1e214d72 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionSwitchAbility.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionSwitchAbility.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs.meta
index 3059d95d..3059d95d 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionSwitchAbility.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTowardLeft.cs b/Assets/Scripts/Avatar/Actions/ActionTowardLeft.cs
index 8d888d30..8d888d30 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionTowardLeft.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionTowardLeft.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTowardLeft.cs.meta b/Assets/Scripts/Avatar/Actions/ActionTowardLeft.cs.meta
index 313b4775..313b4775 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionTowardLeft.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionTowardLeft.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTowardRight.cs b/Assets/Scripts/Avatar/Actions/ActionTowardRight.cs
index b7dadf3a..b7dadf3a 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionTowardRight.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionTowardRight.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTowardRight.cs.meta b/Assets/Scripts/Avatar/Actions/ActionTowardRight.cs.meta
index 1477951b..1477951b 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionTowardRight.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionTowardRight.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTurn180.cs b/Assets/Scripts/Avatar/Actions/ActionTurn180.cs
index 325a3e88..325a3e88 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionTurn180.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionTurn180.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTurn180.cs.meta b/Assets/Scripts/Avatar/Actions/ActionTurn180.cs.meta
index ee218a48..ee218a48 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionTurn180.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionTurn180.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs b/Assets/Scripts/Avatar/Actions/ActionUseGravity.cs
index 92cf3261..92cf3261 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionUseGravity.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs.meta b/Assets/Scripts/Avatar/Actions/ActionUseGravity.cs.meta
index 42eeb7aa..42eeb7aa 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionUseGravity.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionWipeCmdRecord.cs b/Assets/Scripts/Avatar/Actions/ActionWipeCmdRecord.cs
index b3bdd3fa..b3bdd3fa 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionWipeCmdRecord.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionWipeCmdRecord.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionWipeCmdRecord.cs.meta b/Assets/Scripts/Avatar/Actions/ActionWipeCmdRecord.cs.meta
index 86c5ec59..86c5ec59 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionWipeCmdRecord.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/ActionWipeCmdRecord.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/CameraActions.meta b/Assets/Scripts/Avatar/Actions/CameraActions.meta
index a4650ff8..a4650ff8 100644
--- a/Assets/Scripts/AbilitySystem/Actions/CameraActions.meta
+++ b/Assets/Scripts/Avatar/Actions/CameraActions.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/CameraActions/ActionMoveCamera.cs b/Assets/Scripts/Avatar/Actions/CameraActions/ActionMoveCamera.cs
index 607473c2..607473c2 100644
--- a/Assets/Scripts/AbilitySystem/Actions/CameraActions/ActionMoveCamera.cs
+++ b/Assets/Scripts/Avatar/Actions/CameraActions/ActionMoveCamera.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/CameraActions/ActionMoveCamera.cs.meta b/Assets/Scripts/Avatar/Actions/CameraActions/ActionMoveCamera.cs.meta
index 3812e732..3812e732 100644
--- a/Assets/Scripts/AbilitySystem/Actions/CameraActions/ActionMoveCamera.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/CameraActions/ActionMoveCamera.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/CameraActions/ActionPauseTime.cs b/Assets/Scripts/Avatar/Actions/CameraActions/ActionPauseTime.cs
index 5a22bc1e..5a22bc1e 100644
--- a/Assets/Scripts/AbilitySystem/Actions/CameraActions/ActionPauseTime.cs
+++ b/Assets/Scripts/Avatar/Actions/CameraActions/ActionPauseTime.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/CameraActions/ActionPauseTime.cs.meta b/Assets/Scripts/Avatar/Actions/CameraActions/ActionPauseTime.cs.meta
index 5cca5838..5cca5838 100644
--- a/Assets/Scripts/AbilitySystem/Actions/CameraActions/ActionPauseTime.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/CameraActions/ActionPauseTime.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/EffectActions.meta b/Assets/Scripts/Avatar/Actions/EffectActions.meta
index 8b300c5b..8b300c5b 100644
--- a/Assets/Scripts/AbilitySystem/Actions/EffectActions.meta
+++ b/Assets/Scripts/Avatar/Actions/EffectActions.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/EffectActions/ActionDisableGhost.cs b/Assets/Scripts/Avatar/Actions/EffectActions/ActionDisableGhost.cs
index 2da01daf..2da01daf 100644
--- a/Assets/Scripts/AbilitySystem/Actions/EffectActions/ActionDisableGhost.cs
+++ b/Assets/Scripts/Avatar/Actions/EffectActions/ActionDisableGhost.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/EffectActions/ActionDisableGhost.cs.meta b/Assets/Scripts/Avatar/Actions/EffectActions/ActionDisableGhost.cs.meta
index 185da50b..185da50b 100644
--- a/Assets/Scripts/AbilitySystem/Actions/EffectActions/ActionDisableGhost.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/EffectActions/ActionDisableGhost.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/EffectActions/ActionEffectGhost.cs b/Assets/Scripts/Avatar/Actions/EffectActions/ActionEffectGhost.cs
index fa2d8e74..fa2d8e74 100644
--- a/Assets/Scripts/AbilitySystem/Actions/EffectActions/ActionEffectGhost.cs
+++ b/Assets/Scripts/Avatar/Actions/EffectActions/ActionEffectGhost.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/EffectActions/ActionEffectGhost.cs.meta b/Assets/Scripts/Avatar/Actions/EffectActions/ActionEffectGhost.cs.meta
index 6a55db7d..6a55db7d 100644
--- a/Assets/Scripts/AbilitySystem/Actions/EffectActions/ActionEffectGhost.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/EffectActions/ActionEffectGhost.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/UberActions.meta b/Assets/Scripts/Avatar/Actions/UberActions.meta
index c2620d0e..c2620d0e 100644
--- a/Assets/Scripts/AbilitySystem/Actions/UberActions.meta
+++ b/Assets/Scripts/Avatar/Actions/UberActions.meta
diff --git a/Assets/Scripts/AbilitySystem/Actions/UberActions/ActionUber.cs b/Assets/Scripts/Avatar/Actions/UberActions/ActionUber.cs
index b62d3b37..b62d3b37 100644
--- a/Assets/Scripts/AbilitySystem/Actions/UberActions/ActionUber.cs
+++ b/Assets/Scripts/Avatar/Actions/UberActions/ActionUber.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/UberActions/ActionUber.cs.meta b/Assets/Scripts/Avatar/Actions/UberActions/ActionUber.cs.meta
index 69d003aa..69d003aa 100644
--- a/Assets/Scripts/AbilitySystem/Actions/UberActions/ActionUber.cs.meta
+++ b/Assets/Scripts/Avatar/Actions/UberActions/ActionUber.cs.meta
diff --git a/Assets/Scripts/Avatar/Avatar.cs b/Assets/Scripts/Avatar/Avatar.cs
new file mode 100644
index 00000000..47d8c4b7
--- /dev/null
+++ b/Assets/Scripts/Avatar/Avatar.cs
@@ -0,0 +1,62 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+/// <summary>
+/// 角色，包括player和opponents
+/// </summary>
+public class Avatar : MonoBehaviour, IInteractable
+{
+
+
+    public PhysicsBody m_Body;
+    public PhysicsBox m_BodyCollider;
+    public PhysicsBox[] m_Hitbox;
+    public PhysicsBox[] m_Hurtbox;
+
+    public PhysicsPrimitive[] GetAllPrimitive()
+    {
+        throw new System.NotImplementedException();
+    }
+
+    public PhysicsBox GetHitbox()
+    {
+        throw new System.NotImplementedException();
+    }
+
+    public PhysicsBox GetHurtbox()
+    {
+        throw new System.NotImplementedException();
+    }
+
+    public PhysicsPrimitive[] GetAllHit()
+    {
+        throw new System.NotImplementedException();
+    }
+
+    public bool IsHit()
+    {
+        for (int i = 0; i < m_Hitbox.Length; ++i)
+        {
+            if (PhysicsWorld.Instance.HasCollision(m_Hitbox[i]))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public bool IsHurt()
+    {
+        for (int i = 0; i < m_Hitbox.Length; ++i)
+        {
+            if (PhysicsWorld.Instance.HasCollision(m_Hurtbox[i]))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/Assets/Scripts/Avatar/Avatar.cs.meta b/Assets/Scripts/Avatar/Avatar.cs.meta
new file mode 100644
index 00000000..88269a31
--- /dev/null
+++ b/Assets/Scripts/Avatar/Avatar.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4a9cb2414b4a10143919919cfe80537e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Bahaviours.meta b/Assets/Scripts/Avatar/Bahaviours.meta
index 982222bf..982222bf 100644
--- a/Assets/Scripts/AbilitySystem/Bahaviours.meta
+++ b/Assets/Scripts/Avatar/Bahaviours.meta
diff --git a/Assets/Scripts/AbilitySystem/Bahaviours/GhostEffectSpwan.cs b/Assets/Scripts/Avatar/Bahaviours/GhostEffectSpwan.cs
index cbc9c632..cbc9c632 100644
--- a/Assets/Scripts/AbilitySystem/Bahaviours/GhostEffectSpwan.cs
+++ b/Assets/Scripts/Avatar/Bahaviours/GhostEffectSpwan.cs
diff --git a/Assets/Scripts/AbilitySystem/Bahaviours/GhostEffectSpwan.cs.meta b/Assets/Scripts/Avatar/Bahaviours/GhostEffectSpwan.cs.meta
index 4acfc78c..4acfc78c 100644
--- a/Assets/Scripts/AbilitySystem/Bahaviours/GhostEffectSpwan.cs.meta
+++ b/Assets/Scripts/Avatar/Bahaviours/GhostEffectSpwan.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions.meta b/Assets/Scripts/Avatar/Conditions.meta
index 0bfa1b8d..0bfa1b8d 100644
--- a/Assets/Scripts/AbilitySystem/Conditions.meta
+++ b/Assets/Scripts/Avatar/Conditions.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs b/Assets/Scripts/Avatar/Conditions/ConditionAbilitySeq.cs
index b55cacb8..b55cacb8 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionAbilitySeq.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionAbilitySeq.cs.meta
index 5070f1cc..5070f1cc 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionAbilitySeq.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAttkExpireTime.cs b/Assets/Scripts/Avatar/Conditions/ConditionAttkExpireTime.cs
index a3944600..a3944600 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionAttkExpireTime.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionAttkExpireTime.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAttkExpireTime.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionAttkExpireTime.cs.meta
index 80b4d7a7..80b4d7a7 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionAttkExpireTime.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionAttkExpireTime.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs b/Assets/Scripts/Avatar/Conditions/ConditionBase.cs
index 8dff29da..8dff29da 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionBase.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionBase.cs.meta
index 4c321ffd..4c321ffd 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionBase.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionButtonHold.cs b/Assets/Scripts/Avatar/Conditions/ConditionButtonHold.cs
index 52abad03..52abad03 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionButtonHold.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionButtonHold.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionButtonHold.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionButtonHold.cs.meta
index 82d350e2..82d350e2 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionButtonHold.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionButtonHold.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckHp.cs b/Assets/Scripts/Avatar/Conditions/ConditionCheckHp.cs
index ec4e489c..ec4e489c 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckHp.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCheckHp.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckHp.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCheckHp.cs.meta
index e5b205b2..e5b205b2 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckHp.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCheckHp.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckMp.cs b/Assets/Scripts/Avatar/Conditions/ConditionCheckMp.cs
index c14bff3c..c14bff3c 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckMp.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCheckMp.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckMp.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCheckMp.cs.meta
index d920a18f..d920a18f 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCheckMp.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCheckMp.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs b/Assets/Scripts/Avatar/Conditions/ConditionCombo.cs
index 1b6159cb..1b6159cb 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCombo.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCombo.cs.meta
index 45582943..45582943 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCombo.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs b/Assets/Scripts/Avatar/Conditions/ConditionCommand.cs
index d735ef5b..d735ef5b 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCommand.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCommand.cs.meta
index 100638e6..100638e6 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCommand.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs b/Assets/Scripts/Avatar/Conditions/ConditionCommandSeq.cs
index 71a7dbf3..71a7dbf3 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCommandSeq.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCommandSeq.cs.meta
index fc77bd3c..fc77bd3c 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCommandSeq.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs b/Assets/Scripts/Avatar/Conditions/ConditionInair.cs
index 2c631970..2c631970 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionInair.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionInair.cs.meta
index 8bbf610f..8bbf610f 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionInair.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpDone.cs b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs
index 8d900348..8d900348 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpDone.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpDone.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs.meta
index 34a9de96..34a9de96 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpDone.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs b/Assets/Scripts/Avatar/Conditions/ConditionJumpOnGround.cs
index 47f74cab..47f74cab 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionJumpOnGround.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionJumpOnGround.cs.meta
index 33f0341b..33f0341b 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionJumpOnGround.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpReady.cs b/Assets/Scripts/Avatar/Conditions/ConditionJumpReady.cs
index a6bd96c0..a6bd96c0 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpReady.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionJumpReady.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpReady.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionJumpReady.cs.meta
index d947e116..d947e116 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpReady.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionJumpReady.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionAtEnd.cs b/Assets/Scripts/Avatar/Conditions/ConditionMotionAtEnd.cs
index 18d71e86..18d71e86 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionAtEnd.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionMotionAtEnd.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionAtEnd.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionMotionAtEnd.cs.meta
index 1688dd68..1688dd68 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionAtEnd.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionMotionAtEnd.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionFrameRange.cs b/Assets/Scripts/Avatar/Conditions/ConditionMotionFrameRange.cs
index 282ef929..282ef929 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionFrameRange.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionMotionFrameRange.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionFrameRange.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionMotionFrameRange.cs.meta
index 3fc88fb1..3fc88fb1 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionFrameRange.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionMotionFrameRange.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionRange.cs b/Assets/Scripts/Avatar/Conditions/ConditionMotionRange.cs
index c902ae26..c902ae26 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionRange.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionMotionRange.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionRange.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionMotionRange.cs.meta
index 926a8560..926a8560 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionMotionRange.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionMotionRange.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionMoveButtonHold.cs b/Assets/Scripts/Avatar/Conditions/ConditionMoveButtonHold.cs
index 1084f191..1084f191 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionMoveButtonHold.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionMoveButtonHold.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionMoveButtonHold.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionMoveButtonHold.cs.meta
index 45cf47bb..45cf47bb 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionMoveButtonHold.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionMoveButtonHold.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionNoMoveButtonHold.cs b/Assets/Scripts/Avatar/Conditions/ConditionNoMoveButtonHold.cs
index 06a76784..06a76784 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionNoMoveButtonHold.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionNoMoveButtonHold.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionNoMoveButtonHold.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionNoMoveButtonHold.cs.meta
index db883c19..db883c19 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionNoMoveButtonHold.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionNoMoveButtonHold.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionNotHit.cs b/Assets/Scripts/Avatar/Conditions/ConditionNotHit.cs
index 8db94951..8db94951 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionNotHit.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionNotHit.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionNotHit.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionNotHit.cs.meta
index 7058713f..7058713f 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionNotHit.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionNotHit.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionNotHurt.cs b/Assets/Scripts/Avatar/Conditions/ConditionNotHurt.cs
index 9604677a..9604677a 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionNotHurt.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionNotHurt.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionNotHurt.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionNotHurt.cs.meta
index bbe77240..bbe77240 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionNotHurt.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionNotHurt.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardLeft.cs b/Assets/Scripts/Avatar/Conditions/ConditionTowardLeft.cs
index 36cbfd05..36cbfd05 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardLeft.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionTowardLeft.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardLeft.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionTowardLeft.cs.meta
index e3a399a6..e3a399a6 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardLeft.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionTowardLeft.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardRight.cs b/Assets/Scripts/Avatar/Conditions/ConditionTowardRight.cs
index d26a1fd0..d26a1fd0 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardRight.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionTowardRight.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardRight.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionTowardRight.cs.meta
index 901efb57..901efb57 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardRight.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/ConditionTowardRight.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive.meta b/Assets/Scripts/Avatar/Conditions/Interactive.meta
index cf125393..cf125393 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/Interactive.meta
+++ b/Assets/Scripts/Avatar/Conditions/Interactive.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHit.cs
index d36cc538..d36cc538 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs
+++ b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHit.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs.meta b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHit.cs.meta
index 9c607983..9c607983 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHit.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHurt.cs
index 8a76528d..8a76528d 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs
+++ b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHurt.cs
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs.meta b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHurt.cs.meta
index e54feb2d..e54feb2d 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs.meta
+++ b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHurt.cs.meta
diff --git a/Assets/Scripts/Avatar/HitDef.cs b/Assets/Scripts/Avatar/HitDef.cs
new file mode 100644
index 00000000..a0361753
--- /dev/null
+++ b/Assets/Scripts/Avatar/HitDef.cs
@@ -0,0 +1,9 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+// 一个hit的效果，如果一个attack有多个hit，需要定义多个HitDef
+public struct HitDefination
+{
+
+}
diff --git a/Assets/Scripts/Avatar/HitDef.cs.meta b/Assets/Scripts/Avatar/HitDef.cs.meta
new file mode 100644
index 00000000..d542f9ff
--- /dev/null
+++ b/Assets/Scripts/Avatar/HitDef.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 25b7556b2c9481e49938afa25157f3fc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/IInteractable.cs b/Assets/Scripts/Avatar/IInteractable.cs
index 23e49912..23e49912 100644
--- a/Assets/Scripts/AbilitySystem/IInteractable.cs
+++ b/Assets/Scripts/Avatar/IInteractable.cs
diff --git a/Assets/Scripts/AbilitySystem/IInteractable.cs.meta b/Assets/Scripts/Avatar/IInteractable.cs.meta
index ae065c04..ae065c04 100644
--- a/Assets/Scripts/AbilitySystem/IInteractable.cs.meta
+++ b/Assets/Scripts/Avatar/IInteractable.cs.meta
diff --git a/Assets/Scripts/AbilitySystem/Trigger.cs b/Assets/Scripts/Avatar/Trigger.cs
index 70a6d0f4..70a6d0f4 100644
--- a/Assets/Scripts/AbilitySystem/Trigger.cs
+++ b/Assets/Scripts/Avatar/Trigger.cs
diff --git a/Assets/Scripts/AbilitySystem/Trigger.cs.meta b/Assets/Scripts/Avatar/Trigger.cs.meta
index 91d7d1b8..91d7d1b8 100644
--- a/Assets/Scripts/AbilitySystem/Trigger.cs.meta
+++ b/Assets/Scripts/Avatar/Trigger.cs.meta
diff --git a/Assets/Scripts/Physics/PhysicsBody.cs b/Assets/Scripts/Physics/PhysicsBody.cs
index b8f3b7ed..4077696a 100644
--- a/Assets/Scripts/Physics/PhysicsBody.cs
+++ b/Assets/Scripts/Physics/PhysicsBody.cs
@@ -104,9 +104,21 @@ public sealed class PhysicsBody : MonoBehaviour
         }
     }
 
-    [Tooltip("摩擦系数")]
+    [Tooltip("地面摩擦系数")]
     [SerializeField]
     private float m_Frication;
+    public float GroundFriction
+    {
+        get { return m_Frication; }
+    }
+
+    //[Tooltip("空气摩擦力")]
+    //[SerializeField]
+    //private Vector3 m_AirFriction; 
+    //public Vector3 AirFriction
+    //{
+    //    get { return m_AirFriction; }
+    //}
 
 	[Tooltip("力")]
 	[SerializeField]
diff --git a/Assets/Scripts/Physics/PhysicsWorld.cs b/Assets/Scripts/Physics/PhysicsWorld.cs
index cc7ce7c6..41ea59f8 100644
--- a/Assets/Scripts/Physics/PhysicsWorld.cs
+++ b/Assets/Scripts/Physics/PhysicsWorld.cs
@@ -28,6 +28,9 @@ public enum PhysicsTag
 	Oponent = 1 << 1, // 从属于对手
 }
 
+/// <summary>
+/// 物理子系统
+/// </summary>
 public class PhysicsWorld : Singleton<PhysicsWorld>
 {
     private int m_UpdateRate = 60;
@@ -221,15 +224,24 @@ public class PhysicsWorld : Singleton<PhysicsWorld>
 
 		body.transform.position = position;
 
-		PhysicsBox box = prim as PhysicsBox;
-		if(box.Bottom < 0.1f)
+		if(prim.IsOnGround)
 		{
+            // pos=0, Vy=0
 			position.y = 0.1f;
 			body.transform.position = position;
-			velocity.y = 0;
-			body.Velocity = velocity;
-		}
-	}
+
+            // 地面摩擦力
+            if(body.Velocity.x != 0 && body.GroundFriction != 0)
+            {
+                float dv = body.GroundFriction * dt;
+                dv = Mathf.Min(dv, Mathf.Abs(body.Velocity.x));
+                dv = body.Velocity.x > 0 ? -dv : dv;
+                velocity.x += dv;
+            }
+            velocity.y = 0;
+            body.Velocity = velocity;
+        }
+    }
 	
 	void SolveCollision(PhysicsPrimitive prim, PhysicsCollisionInfo collision, float dt)
 	{
diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta
new file mode 100644
index 00000000..bb96602e
--- /dev/null
+++ b/Assets/Scripts/Props.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f299520ed9fcf4a45858ad4ef5a8d5d1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Test/SaionjiScript.cs b/Assets/Scripts/Test/SaionjiScript.cs
index 03dfbf8d..10f2e9e3 100644
--- a/Assets/Scripts/Test/SaionjiScript.cs
+++ b/Assets/Scripts/Test/SaionjiScript.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public partial class SaionjiScript : MonoBehaviour, IInteractable
+public partial class SaionjiScript : Avatar
 {
     HitBoxTest hitbox;
     Animator animator;
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs
index 10f358e4..32859b8d 100644
--- a/Assets/Scripts/Test/SaionjiScript_Ability.cs
+++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public partial class SaionjiScript : MonoBehaviour
+public partial class SaionjiScript : Avatar
 {
 	/// <summary>
 	/// ability system
diff --git a/Assets/Scripts/Test/SaionjiScript_Anim.cs b/Assets/Scripts/Test/SaionjiScript_Anim.cs
index 5dec9db6..9b7bfca5 100644
--- a/Assets/Scripts/Test/SaionjiScript_Anim.cs
+++ b/Assets/Scripts/Test/SaionjiScript_Anim.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public partial class SaionjiScript : MonoBehaviour
+public partial class SaionjiScript : Avatar
 {
 	int Anim_Idle;
 	int Anim_Run;
diff --git a/Assets/Scripts/Test/SaionjiScript_Physics.cs b/Assets/Scripts/Test/SaionjiScript_Physics.cs
index 1b296f43..b6fcb393 100644
--- a/Assets/Scripts/Test/SaionjiScript_Physics.cs
+++ b/Assets/Scripts/Test/SaionjiScript_Physics.cs
@@ -2,54 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public partial class SaionjiScript : MonoBehaviour, IInteractable
+public partial class SaionjiScript : Avatar
 {
-	public PhysicsBox[] m_Hitbox;
-	public PhysicsBox[] m_Hurtbox;
-	public PhysicsBody m_Body;
-    public PhysicsBox m_BodyCollider;
 
-	public PhysicsPrimitive[] GetAllPrimitive()
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public PhysicsBox GetHitbox()
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public PhysicsBox GetHurtbox()
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public PhysicsPrimitive[] GetAllHit()
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public bool IsHit()
-	{
-		for(int i = 0;i < m_Hitbox.Length; ++i)
-		{
-			if(PhysicsWorld.Instance.HasCollision(m_Hitbox[i]))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public bool IsHurt()
-	{
-		for (int i = 0; i < m_Hitbox.Length; ++i)
-		{
-			if (PhysicsWorld.Instance.HasCollision(m_Hurtbox[i]))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
 }