From 65ed53a40f990e895305ff17a5e48e3cd6b8785b Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 24 Oct 2020 17:30:07 +0800
Subject: =?UTF-8?q?*=E7=89=A9=E7=90=86=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Conditions/Interactive/ConditionHit.cs         | 10 ++++++---
 .../Conditions/Interactive/ConditionHurt.cs        | 24 ++++++++++++----------
 2 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'Assets/Scripts/AbilitySystem/Conditions/Interactive')

diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs
index b50121fe..d36cc538 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs
+++ b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs
@@ -5,13 +5,17 @@ using UnityEngine;
 // hitbox击中
 public class ConditionHit : ConditionBase
 {
-    public ConditionHit()
+	IInteractable m_Obj;
+
+    public ConditionHit(IInteractable obj)
     {
+		m_Obj = obj;
 
-    }
+	}
 
     public override bool Evaluate()
     {
-        throw new System.NotImplementedException();
+		bool isHit = m_Obj.IsHit();
+		return isHit;
     }
 }
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs
index b4acd71a..8a76528d 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs
+++ b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs
@@ -2,17 +2,19 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class ConditionHurt : MonoBehaviour
+// hurtbox被击中
+public class ConditionHurt : ConditionBase
 {
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
+	IInteractable m_Obj;
 
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
+	public ConditionHurt(IInteractable obj)
+	{
+		m_Obj = obj;
+	}
+
+	public override bool Evaluate()
+	{
+		bool isHit = m_Obj.IsHit();
+		return isHit;
+	}
 }
-- 
cgit v1.1-26-g67d0