*misc

6 files changed, 13 insertions, 19 deletions

diff --git a/Assets/Scripts/Avatar/Avatar.cs b/Assets/Scripts/Avatar/Avatar.cs
index c44af96c..1f3990a9 100644
--- a/Assets/Scripts/Avatar/Avatar.cs
+++ b/Assets/Scripts/Avatar/Avatar.cs
@@ -18,7 +18,14 @@ public partial class Avatar : MonoBehaviour, IInteractable
 

     protected AbilitySystem m_AbilitySystem = new AbilitySystem();

 

-    public PhysicsBody Body

+	// 预定义的ability，角色必须定义的

+	protected AbilityBase m_AbilityLightHurt;

+	protected AbilityBase m_AbilityMidiumHurt;

+	protected AbilityBase m_AbilityHeavyHurt;

+	protected AbilityBase m_AbilityGroundHurt;

+	protected AbilityBase m_AbilityAirHurt;

+

+	public PhysicsBody Body

     {

         get

         {

diff --git a/Assets/Scripts/Avatar/Avatar_Hurt.cs b/Assets/Scripts/Avatar/Avatar_Hurt.cs
index f0cedffa..3f26bcbe 100644
--- a/Assets/Scripts/Avatar/Avatar_Hurt.cs
+++ b/Assets/Scripts/Avatar/Avatar_Hurt.cs
@@ -11,6 +11,9 @@ public partial class Avatar : MonoBehaviour, IInteractable
             m_Body.AddForce(hit.hurtAddForce);

         }

 

+		// force switch to hurt ability 

+

+

     }

 

 }

diff --git a/Assets/Scripts/Managers/BattleManager.cs b/Assets/Scripts/Managers/BattleManager.cs
index 012862cd..967f5c4d 100644
--- a/Assets/Scripts/Managers/BattleManager.cs
+++ b/Assets/Scripts/Managers/BattleManager.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 

 public class BattleManager : Singleton<BattleManager>

 {

-    public void OnHitOccured()

+    public void OnHitOccur()

     {

 

     }

diff --git a/Assets/Scripts/Managers/HitManager.cs b/Assets/Scripts/Managers/HitManager.cs
index 9ccb3b39..d16a462c 100644
--- a/Assets/Scripts/Managers/HitManager.cs
+++ b/Assets/Scripts/Managers/HitManager.cs
@@ -114,7 +114,7 @@ public class HitManager : Singleton<HitManager>
                 hurtbox.Host.OnHurt(hurtInfo);

 

                 // 场景处理特效等

-                BattleManager.Instance.OnHitOccured();

+                BattleManager.Instance.OnHitOccur();

             }

         }

     }

diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta
deleted file mode 100644
index bb96602e..00000000
--- a/Assets/Scripts/Props.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f299520ed9fcf4a45858ad4ef5a8d5d1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta
deleted file mode 100644
index eb7a8716..00000000
--- a/Assets/Scripts/Scene.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: eaee2d0f48cff9b40baf0686a8105600
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: