*jump

3 files changed, 54 insertions, 3 deletions

diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs
new file mode 100644
index 00000000..9afd68c4
--- /dev/null
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ConditionCheckJumpState : ConditionBase
+{
+	JumpAbility m_Ability;
+	JumpAbility.State m_State;
+	JumpAbility.Direction m_Direction;
+
+	public ConditionCheckJumpState(JumpAbility ability, JumpAbility.State state = JumpAbility.State.None, JumpAbility.Direction direction = JumpAbility.Direction.None)
+	{
+		m_Ability = ability;
+		m_State = state;
+		m_Direction = direction;
+	}
+
+	public override bool Evaluate()
+	{
+		if (m_Ability == null)
+			return false;
+		if (m_State != JumpAbility.State.None && m_Direction != JumpAbility.Direction.None)
+		{
+			return m_Ability.CurState == m_State
+				&& m_Ability.CurDirection == m_Direction;
+		}
+		else if (m_State != JumpAbility.State.None && m_Direction == JumpAbility.Direction.None)
+		{
+			return m_Ability.CurState == m_State;
+		}
+		else if (m_State == JumpAbility.State.None && m_Direction != JumpAbility.Direction.None)
+		{
+			return m_Ability.CurDirection == m_Direction;
+		}
+		else
+			return false;
+	}
+}
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta
new file mode 100644
index 00000000..aefa0807
--- /dev/null
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d7c948fe9eefbd14d9137b19e92e1fc4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs
index 8d900348..1f213a50 100644
--- a/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs
@@ -5,14 +5,16 @@ using UnityEngine;
 public class ConditionJumpDone : ConditionBase

 {

     JumpAbility m_Jump;

+	float m_T;

 

-    public ConditionJumpDone(JumpAbility jump)

+    public ConditionJumpDone(JumpAbility jump, float t = 1f)

     {

         m_Jump = jump;

-    }

+		m_T = t;

+	}

 

     public override bool Evaluate()

     {

-        return m_Jump.IsJumpDone();

+        return m_Jump.IsJumpDone(m_T);

     }

 }