From e846c64d6f927879cb8a095e62d773a8d7b3c9f4 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Thu, 15 Oct 2020 07:24:10 +0800
Subject: *ability system

---
 .../AbilitySystem/Actions/ActionAnimCrossFade.cs   | 23 ++++++++++++++++++
 .../Actions/ActionAnimCrossFade.cs.meta            | 11 +++++++++
 Assets/Scripts/AbilitySystem/Actions/ActionBase.cs | 27 +++++++++++++---------
 .../AbilitySystem/Actions/ActionCrossFade.cs       | 18 ---------------
 .../AbilitySystem/Actions/ActionCrossFade.cs.meta  | 11 ---------
 .../AbilitySystem/Actions/ActionFlashEffect.cs     | 14 +++++++++++
 .../Actions/ActionFlashEffect.cs.meta              | 11 +++++++++
 .../Scripts/AbilitySystem/Actions/ActionFreeze.cs  | 18 +++++++++++++++
 .../AbilitySystem/Actions/ActionFreeze.cs.meta     | 11 +++++++++
 .../Scripts/AbilitySystem/Actions/ActionFreze.cs   | 18 ---------------
 .../AbilitySystem/Actions/ActionFreze.cs.meta      | 11 ---------
 .../Scripts/AbilitySystem/Actions/ActionPlaySfx.cs | 25 ++++++++++----------
 .../AbilitySystem/Actions/ActionPlaySound.cs       | 18 +++++++++++++++
 .../AbilitySystem/Actions/ActionPlaySound.cs.meta  | 11 +++++++++
 14 files changed, 146 insertions(+), 81 deletions(-)
 create mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs.meta
 delete mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs
 delete mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs.meta
 delete mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs
 delete mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs.meta
 create mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs
 create mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs.meta

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

diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs b/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs
new file mode 100644
index 00000000..6f2252d7
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ActionAnimCrossFade : ActionBase
+{
+	Animator m_Animator;
+	int m_TargetAnimation;
+	float m_Duration;
+
+	public ActionAnimCrossFade(Animator animator, int toAnim, float duration = 0)
+	{
+		m_Animator = animator;
+		m_TargetAnimation = toAnim;
+		m_Duration = duration;
+	}
+
+	public override void Execute()
+	{
+		m_Animator.CrossFade(m_TargetAnimation, m_Duration);
+	}
+
+}
\ No newline at end of file
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs.meta
new file mode 100644
index 00000000..6eed1575
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 86ec4b9e82965164ba7d950129542f85
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionBase.cs b/Assets/Scripts/AbilitySystem/Actions/ActionBase.cs
index f3d67fff..1458e340 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionBase.cs
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionBase.cs
@@ -2,17 +2,22 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class ActionBase : MonoBehaviour
+public abstract class ActionBase
 {
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
+	private int m_ID;
+	public int ID
+	{
+		get
+		{
+			return m_ID;
+		}
+	}
+
+	protected ActionBase()
+	{
+		m_ID = UIDManager.Acquire();
+	}
+
+	public abstract void Execute();
 
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs b/Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs
deleted file mode 100644
index 57b1bd2b..00000000
--- a/Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ActionCrossFade : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs.meta
deleted file mode 100644
index 6eed1575..00000000
--- a/Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 86ec4b9e82965164ba7d950129542f85
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs b/Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs
new file mode 100644
index 00000000..c411c3fa
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs
@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 创建角色残影
+/// </summary>
+public class ActionFlashEffect : ActionBase
+{
+	public override void Execute()
+	{
+
+	}
+}
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs.meta
new file mode 100644
index 00000000..ea99c96b
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9a193a2045f759e4abaff6bfef12658f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs b/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs
new file mode 100644
index 00000000..7f26f35a
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ActionFreze : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs.meta
new file mode 100644
index 00000000..eb9fe77a
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 32c173c981e85414c83ec9b0fc7d9722
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs b/Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs
deleted file mode 100644
index 7f26f35a..00000000
--- a/Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ActionFreze : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs.meta
deleted file mode 100644
index eb9fe77a..00000000
--- a/Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 32c173c981e85414c83ec9b0fc7d9722
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySfx.cs b/Assets/Scripts/AbilitySystem/Actions/ActionPlaySfx.cs
index 73319e9e..442ce999 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySfx.cs
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionPlaySfx.cs
@@ -2,17 +2,18 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class ActionPlaySfx : MonoBehaviour
+public class ActionPlaySfx : ActionBase
 {
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
+	GameObject m_Sfx;
+	Vector3 m_TargetPos;
 
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
+	public ActionPlaySfx(GameObject sfx, Vector3 position)
+	{
+		m_Sfx = sfx;
+		m_TargetPos = position;
+	}
+
+	public override void Execute()
+	{
+	}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs b/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs
new file mode 100644
index 00000000..237b7455
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ActionPlaySound : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs.meta
new file mode 100644
index 00000000..a9bbf014
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c43194c5e437d5d4fb02a7b0618a7b0e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
-- 
cgit v1.1-26-g67d0