summaryrefslogtreecommitdiff
path: root/Assets/Scripts/AbilitySystem/Conditions
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scripts/AbilitySystem/Conditions')
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs8
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs6
2 files changed, 8 insertions, 6 deletions
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs
index c41e17e1..82db03e0 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs
@@ -8,16 +8,18 @@ using UnityEngine;
public sealed class ConditionAnimRange : ConditionBase
{
Vector2 m_TimeRange = new Vector2();
+ Animator m_Animator;
- public ConditionAnimRange(float start, float end)
+ public ConditionAnimRange(Animator animator, float start, float end)
{
m_TimeRange.Set(start, end);
-
}
public override bool Evaluate()
{
- return false;
+ AnimatorStateInfo info = m_Animator.GetCurrentAnimatorStateInfo(0);
+ float time = info.normalizedTime;
+ return time >= m_TimeRange.x && time <= m_TimeRange.y;
}
}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
index e63bedb0..38889278 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
@@ -104,7 +104,7 @@ public sealed class ConditionNone : ConditionBase
/// <summary>
-/// 两个condition都达成才会返回真
+/// 多个condition都达成才会返回真
/// </summary>
public sealed class ConditionMultiAnd : ConditionBase
{
@@ -128,7 +128,7 @@ public sealed class ConditionMultiAnd : ConditionBase
}
/// <summary>
-/// 两个condition至少一个达成才会返回真
+/// 多个condition至少一个达成才会返回真
/// </summary>
public sealed class ConditionMultiOr : ConditionBase
{
@@ -152,7 +152,7 @@ public sealed class ConditionMultiOr : ConditionBase
}
/// <summary>
-/// 两个condition都不达成才会返回真
+/// 多个condition都不达成才会返回真
/// </summary>
public sealed class ConditionMultiNone : ConditionBase
{