From 8834c57999ce2e9d88262d5e7d2f31b65eaf3477 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 27 Oct 2020 09:08:54 +0800
Subject: =?UTF-8?q?*=E8=B7=B3=E8=B7=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/AbilitySystem/Conditions/Camera.meta    |  8 ++++++++
 .../Scripts/AbilitySystem/Conditions/ConditionBase.cs  |  2 +-
 .../AbilitySystem/Conditions/ConditionJumpOnGround.cs  | 18 ++++++++++++++++++
 .../Conditions/ConditionJumpOnGround.cs.meta           | 11 +++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/Camera.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs.meta

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

diff --git a/Assets/Scripts/AbilitySystem/Conditions/Camera.meta b/Assets/Scripts/AbilitySystem/Conditions/Camera.meta
new file mode 100644
index 00000000..bfa55719
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/Camera.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8d7f28027add89c448243fbe5ea14144
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
index 73b9b380..8dff29da 100644
--- a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
@@ -127,7 +127,7 @@ public sealed class ConditionNone : ConditionBase
 /// </summary>
 public sealed class ConditionMultiAnd : ConditionBase
 {
-    List<ConditionBase> m_Conditions;
+    List<ConditionBase> m_Conditions = new List<ConditionBase>();
 
     public ConditionMultiAnd(List<ConditionBase>  conditions)
         : base()
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs
new file mode 100644
index 00000000..47f74cab
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ConditionJumpOnGround : ConditionBase
+{
+	JumpAbility m_Jump;
+
+	public ConditionJumpOnGround(JumpAbility jump)
+	{
+		m_Jump = jump;
+	}
+
+	public override bool Evaluate()
+	{
+		return m_Jump.IsJumpGround();
+	}
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs.meta
new file mode 100644
index 00000000..33f0341b
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionJumpOnGround.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1a04452218ec0b849bbed3d0ba35cd12
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
-- 
cgit v1.1-26-g67d0