*ability system

2 files changed, 5 insertions, 6 deletions

diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs
index 420fecc5..a7487d33 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs
@@ -7,16 +7,16 @@ using UnityEngine;
 /// </summary>

 public class ConditionCommand : ConditionBase

 {

-    Command m_TargetCommand;

+	CommandCode m_TargetCommand;

 

-    public ConditionCommand(Command command)

+    public ConditionCommand(CommandCode command)

     {

         m_TargetCommand = command;

     }

 

     public override bool Evaluate()

     {

-        return false;

+		return InputManager.Instance.CurrentCommand.code == m_TargetCommand;

     }

 

 }

diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs
index 69570487..745d2aa8 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs
@@ -3,13 +3,12 @@ using System.Collections.Generic;
 using UnityEngine;

 

 /// <summary>

-/// 一个command序列，一般用来触发连击

+/// 一个command序列，用来触发连击

 /// </summary>

 public class ConditionCommandSeq : ConditionBase

 {

 

-

-    public ConditionCommandSeq()

+    public ConditionCommandSeq(List<CommandCode> commandSeq, float maxDeltaTime)

     {

 

     }