* HitManager

1 files changed, 17 insertions, 13 deletions

diff --git a/Assets/Scripts/Avatar/AbilitySystem.cs b/Assets/Scripts/Avatar/AbilitySystem.cs
index 3e2ab838..9d289884 100644
--- a/Assets/Scripts/Avatar/AbilitySystem.cs
+++ b/Assets/Scripts/Avatar/AbilitySystem.cs
@@ -62,31 +62,26 @@ public class AbilitySystem
         }

     }
 
-	public void OnLateUpdate()
+	public void OnPhysicsUpdate()
 	{
 		if(m_Currrent != null)
 		{
-			m_Currrent.OnLateUpdate();
+			m_Currrent.OnPhysicsUpdate();
 		}
         if(m_UberAbility != null)

         {

-            m_UberAbility.OnLateUpdate();
+            m_UberAbility.OnPhysicsUpdate();
         }

     }

 

-    public void OnHit(PhysicsCollisionInfo info)

+    public void OnHit(HitInfo info)

     {

-        if(m_Currrent != null)

-        {

-            m_Currrent.OnHit(info);

-        }

+

     }
-    public void OnHurt(PhysicsCollisionInfo info)

+
+    public void OnHurt(HurtInfo info)

     {

-        if (m_Currrent != null)

-        {

-            m_Currrent.OnHurt(info);

-        }

+
     }
 

     public void SwitchToAbility(AbilityBase targetAbility)
@@ -97,4 +92,13 @@ public class AbilitySystem
 		m_Currrent.OnEnter();
 	}
 
+    // 获得当前击打如果有的话

+    public Hit GetHit()

+    {

+        if (Current == null || !(Current is AttackAbility))

+            return null;

+        AttackAbility ability = Current as AttackAbility;

+        return ability.GetHit();

+    }
+
 }
\ No newline at end of file