From 71c03c717b189ee0ff0e62d219f02b8ab336c40a Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 13 Oct 2020 17:20:14 +0800
Subject: +ability system

---
 .../Conditions/ConditionAbilitySeq.cs              |  26 +++++
 .../Conditions/ConditionAbilitySeq.cs.meta         |  11 +++
 .../AbilitySystem/Conditions/ConditionAnimAtEnd.cs |  31 ++++++
 .../Conditions/ConditionAnimAtEnd.cs.meta          |  11 +++
 .../AbilitySystem/Conditions/ConditionAnimRange.cs |  23 +++++
 .../Conditions/ConditionAnimRange.cs.meta          |  11 +++
 .../AbilitySystem/Conditions/ConditionBase.cs      | 105 +++++++++++++++++++++
 .../AbilitySystem/Conditions/ConditionBase.cs.meta |  11 +++
 .../AbilitySystem/Conditions/ConditionCombo.cs     |  14 +++
 .../Conditions/ConditionCombo.cs.meta              |  11 +++
 .../AbilitySystem/Conditions/ConditionCommand.cs   |  22 +++++
 .../Conditions/ConditionCommand.cs.meta            |  11 +++
 .../Conditions/ConditionCommandSeq.cs              |  21 +++++
 .../Conditions/ConditionCommandSeq.cs.meta         |  11 +++
 .../AbilitySystem/Conditions/ConditionInair.cs     |  14 +++
 .../Conditions/ConditionInair.cs.meta              |  11 +++
 16 files changed, 344 insertions(+)
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta

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

diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs
new file mode 100644
index 00000000..b55cacb8
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 记录之前的ability序列满足某个序列
+/// combo的时候根据当前序列决定combo
+/// </summary>
+public class ConditionAbilitySeq : ConditionBase
+{
+    List<int> m_TargetAbilitySeq = new List<int>();
+
+    public ConditionAbilitySeq(List<int> commandSeq)
+        : base()
+    {
+        m_TargetAbilitySeq = commandSeq;
+    }
+
+    public override bool Evaluate()
+    {
+       // 验证记录的abilitySeq是否满足
+
+
+        throw new System.NotImplementedException();
+    }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta
new file mode 100644
index 00000000..5070f1cc
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7bbf0480c45c29843b8ba41229bb29b1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs
new file mode 100644
index 00000000..019c16a9
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs
@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 动画已经播放完毕
+/// </summary>
+public class ConditionAnimAtEnd : ConditionBase
+{
+    Animator m_Animator;
+    int m_AnimationHash;
+
+    public ConditionAnimAtEnd(Animator animator, int animationHash) 
+        : base()
+    {
+        m_Animator = animator;
+        m_AnimationHash = animationHash;
+    }
+
+    public override bool Evaluate()
+    {
+        AnimatorStateInfo info = m_Animator.GetCurrentAnimatorStateInfo(0); 
+        if(info.fullPathHash == m_AnimationHash)
+        {
+            float t = info.normalizedTime;
+            if (t >= 0.99f)
+                return true;
+        }
+        return false; 
+    }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta
new file mode 100644
index 00000000..1688dd68
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f5cbdf2ebe12b5d46afa21a62609d15c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs
new file mode 100644
index 00000000..c41e17e1
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 某个动画是否播放到了某个时间（归一化了的）范围内
+/// </summary>
+public sealed class ConditionAnimRange : ConditionBase
+{
+    Vector2 m_TimeRange = new Vector2();
+
+    public ConditionAnimRange(float start, float end)
+    {
+        m_TimeRange.Set(start, end);
+
+    }
+
+    public override bool Evaluate()
+    {
+        return false;
+    }
+
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta
new file mode 100644
index 00000000..926a8560
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 56b6b5bfaf0d4e147a2f0f1809e7739b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
new file mode 100644
index 00000000..c14624ad
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
@@ -0,0 +1,105 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 触发条件基类
+/// </summary>
+public abstract class ConditionBase
+{
+
+    public ConditionBase()
+    {
+    }
+
+    public abstract bool Evaluate();
+
+}
+
+
+/// <summary>
+/// 总是满足
+/// </summary>
+public sealed class ConditionAlways : ConditionBase
+{
+    public override bool Evaluate()
+    {
+        return true;
+    }
+}
+
+/// <summary>
+/// 总是不满足
+/// </summary>
+public sealed class ConditionAlwaysNot : ConditionBase
+{
+    public override bool Evaluate()
+    {
+        return false;
+    }
+}
+
+/// <summary>
+/// 两个condition都达成才会返回真
+/// </summary>
+public sealed class ConditionAnd : ConditionBase
+{
+    ConditionBase m_FirstCondition, m_LastCondition;
+
+
+    public ConditionAnd(ConditionBase first, ConditionBase last)
+        : base()
+    {
+        m_FirstCondition = first;
+        m_LastCondition = last;
+    }
+
+    public override bool Evaluate()
+    {
+        return m_FirstCondition.Evaluate() && m_LastCondition.Evaluate();
+    }
+}
+
+/// <summary>
+/// 两个condition至少一个达成才会返回真
+/// </summary>
+public sealed class ConditionOr : ConditionBase
+{
+    ConditionBase m_FirstCondition, m_LastCondition;
+
+
+    public ConditionOr(ConditionBase first, ConditionBase last)
+        : base()
+    {
+        m_FirstCondition = first;
+        m_LastCondition = last;
+    }
+
+    public override bool Evaluate()
+    {
+        return m_FirstCondition.Evaluate() || m_LastCondition.Evaluate();
+    }
+}
+
+
+/// <summary>
+/// 两个condition都不达成才会返回真
+/// </summary>
+public sealed class ConditionNone : ConditionBase
+{
+    ConditionBase m_FirstCondition, m_LastCondition;
+
+    public ConditionNone(ConditionBase first, ConditionBase last)
+        : base()
+    {
+        m_FirstCondition = first;
+        m_LastCondition = last;
+    }
+
+    public override bool Evaluate()
+    {
+        return !m_FirstCondition.Evaluate() && !m_LastCondition.Evaluate();
+    }
+}
+
+
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta
new file mode 100644
index 00000000..4c321ffd
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 21029775aaf8cdd4a868a45725313c3a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs
new file mode 100644
index 00000000..7664a891
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs
@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 连击操作，综合ConditionAnimRange和ConditionCommand
+/// </summary>
+public class ConditionCombo : ConditionBase
+{
+    public override bool Evaluate()
+    {
+        throw new System.NotImplementedException();
+    }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta
new file mode 100644
index 00000000..45582943
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 015528a2fbc923f45b1e25c11a6ade2b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs
new file mode 100644
index 00000000..420fecc5
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs
@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 按下某个command
+/// </summary>
+public class ConditionCommand : ConditionBase
+{
+    Command m_TargetCommand;
+
+    public ConditionCommand(Command command)
+    {
+        m_TargetCommand = command;
+    }
+
+    public override bool Evaluate()
+    {
+        return false;
+    }
+
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta
new file mode 100644
index 00000000..100638e6
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6334908b568b7c046bbeb3f526f95841
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs
new file mode 100644
index 00000000..69570487
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs
@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 一个command序列，一般用来触发连击
+/// </summary>
+public class ConditionCommandSeq : ConditionBase
+{
+
+
+    public ConditionCommandSeq()
+    {
+
+    }
+
+    public override bool Evaluate()
+    {
+        throw new System.NotImplementedException();
+    }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta
new file mode 100644
index 00000000..fc77bd3c
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7316354e3f99412419c866e0fc3906c6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs
new file mode 100644
index 00000000..c047b50c
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs
@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 某个角色是否浮空
+/// </summary>
+public class ConditionInair : ConditionBase
+{
+    public override bool Evaluate()
+    {
+        return false;
+    }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta
new file mode 100644
index 00000000..8bbf610f
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8855eebdb67a2cc4baeb2a21e5b40ed4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
-- 
cgit v1.1-26-g67d0