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

---
 .../AbilitySystem/Actions/ActionEffects.meta       |  8 -------
 .../AbilitySystem/Actions/ActionJumpForward.cs     | 25 ++++++++++++----------
 .../AbilitySystem/Actions/ActionSetPosition.cs     | 19 +++++++---------
 3 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 Assets/Scripts/AbilitySystem/Actions/ActionEffects.meta

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

diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionEffects.meta b/Assets/Scripts/AbilitySystem/Actions/ActionEffects.meta
deleted file mode 100644
index 17a426dd..00000000
--- a/Assets/Scripts/AbilitySystem/Actions/ActionEffects.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0b5ccfefc2e6b104a8566f4da9a16c5f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionJumpForward.cs b/Assets/Scripts/AbilitySystem/Actions/ActionJumpForward.cs
index 3b1de41d..4e71dcf6 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionJumpForward.cs
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionJumpForward.cs
@@ -2,17 +2,20 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class ActionJumpForward : MonoBehaviour
+// 垂直跳跃，切换到jump ability
+public class ActionJumpForward : ActionSwitchAbility
 {
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
+	private JumpAbility m_JumpAbility;
 
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
+	public ActionJumpForward(AbilitySystem system, JumpAbility jumpAbility)
+		: base(system, jumpAbility)
+	{
+		m_JumpAbility = jumpAbility;
+	}
+
+	public override void Execute()
+	{
+		m_JumpAbility.SetDir(JumpAbility.Direction.Forward);
+		base.Execute(); // switch to jump ability 
+	}
 }
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionSetPosition.cs b/Assets/Scripts/AbilitySystem/Actions/ActionSetPosition.cs
index 913eb3d2..a4e62294 100644
--- a/Assets/Scripts/AbilitySystem/Actions/ActionSetPosition.cs
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionSetPosition.cs
@@ -2,17 +2,14 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class ActionSetPosition : MonoBehaviour
+public class ActionSetPosition : ActionBase
 {
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
+	public ActionSetPosition()
+	{
+	}
 
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
+	public override void Execute()
+	{
+		throw new System.NotImplementedException();
+	}
 }
-- 
cgit v1.1-26-g67d0