summaryrefslogtreecommitdiff
path: root/Assets/Scripts/AbilitySystem/Actions
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scripts/AbilitySystem/Actions')
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs23
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs.meta (renamed from Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs.meta)0
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionBase.cs27
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs14
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionFlashEffect.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs (renamed from Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs)0
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs.meta (renamed from Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs.meta)0
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionPlaySfx.cs25
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs (renamed from Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs)2
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs.meta11
10 files changed, 89 insertions, 24 deletions
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/ActionCrossFade.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs.meta
index 6eed1575..6eed1575 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs.meta
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionAnimCrossFade.cs.meta
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/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/ActionFreze.cs b/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs
index 7f26f35a..7f26f35a 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs.meta
index eb9fe77a..eb9fe77a 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionFreze.cs.meta
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionFreeze.cs.meta
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/ActionCrossFade.cs b/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs
index 57b1bd2b..237b7455 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionCrossFade.cs
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionPlaySound.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
-public class ActionCrossFade : MonoBehaviour
+public class ActionPlaySound : MonoBehaviour
{
// Start is called before the first frame update
void Start()
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: