From d21321d1e0d594ab247679cbfde86737aa24979c Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 9 Nov 2020 20:50:17 +0800
Subject: *misc

---
 Assets/Scripts/Avatar/AbilitySystem.cs | 6 ++++--
 Assets/Scripts/Avatar/Avatar.cs        | 6 ++++--
 Assets/Scripts/Avatar/HitDefination.cs | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'Assets/Scripts/Avatar')

diff --git a/Assets/Scripts/Avatar/AbilitySystem.cs b/Assets/Scripts/Avatar/AbilitySystem.cs
index 9d289884..5f6e9364 100644
--- a/Assets/Scripts/Avatar/AbilitySystem.cs
+++ b/Assets/Scripts/Avatar/AbilitySystem.cs
@@ -76,12 +76,14 @@ public class AbilitySystem
 
     public void OnHit(HitInfo info)
     {
-
+        if (m_Currrent != null)
+            m_Currrent.OnHit(info);
     }
 
     public void OnHurt(HurtInfo info)
     {
-
+        if (m_Currrent != null)
+            m_Currrent.OnHurt(info);
     }
 
     public void SwitchToAbility(AbilityBase targetAbility)
diff --git a/Assets/Scripts/Avatar/Avatar.cs b/Assets/Scripts/Avatar/Avatar.cs
index dc6c7858..03cceccb 100644
--- a/Assets/Scripts/Avatar/Avatar.cs
+++ b/Assets/Scripts/Avatar/Avatar.cs
@@ -99,12 +99,14 @@ public class Avatar : MonoBehaviour, IInteractable
 
     public virtual void OnHit(HitInfo hitInfo)
     {
-        Debug.Log("Hit");
+        //Debug.Log("Hit");
+        m_AbilitySystem.OnHit(hitInfo);
     }
 
     public virtual void OnHurt(HurtInfo hurtInfo)
     {
-        Debug.Log("Hurt");
+        //Debug.Log("Hurt");
+        m_AbilitySystem.OnHurt(hurtInfo);
     }
 
 }
diff --git a/Assets/Scripts/Avatar/HitDefination.cs b/Assets/Scripts/Avatar/HitDefination.cs
index 96ceaf00..22a78325 100644
--- a/Assets/Scripts/Avatar/HitDefination.cs
+++ b/Assets/Scripts/Avatar/HitDefination.cs
@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-// 一个hit的效果，如果一个attack有多个hit，需要定义多个HitDef
+/// <summary>
+/// 一个hit的效果，如果一个attack有多个hit，需要定义多个HitDef
+/// </summary>
 public class HitDefination
 {
 	public float start = 0f;
@@ -13,6 +15,4 @@ public class HitDefination
 	public Vector3 sparkPosition; // 特效位置（sparkHost为空时生效）
 	public Quaternion sparkRotation; // 特效旋转
 	public Vector3 sparkScale = Vector3.one; // 特效缩放
-
-
 }
\ No newline at end of file
-- 
cgit v1.1-26-g67d0