From f325841eff10ae492ce6c634d4b07cf058a068c6 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 16 Nov 2020 08:30:54 +0800
Subject: *state system

---
 Assets/Scripts/Avatar/Actions/ActionJump.cs          | 14 +++++++-------
 Assets/Scripts/Avatar/Actions/ActionJumpForward.cs   | 16 ++++++++--------
 Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs | 16 ++++++++--------
 3 files changed, 23 insertions(+), 23 deletions(-)

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

diff --git a/Assets/Scripts/Avatar/Actions/ActionJump.cs b/Assets/Scripts/Avatar/Actions/ActionJump.cs
index c90e73f4..b281a7b3 100644
--- a/Assets/Scripts/Avatar/Actions/ActionJump.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionJump.cs
@@ -2,20 +2,20 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-// 垂直跳跃，切换到jump ability
-public class ActionJump : ActionSwitchAbility
+// 垂直跳跃，切换到jump state
+public class ActionJump : ActionSwitchState
 {
-    private JumpAbility m_JumpAbility; 
+    private JumpState m_JumpState; 
 
-    public ActionJump(AbilitySystem system, JumpAbility jumpAbility) 
-        : base(system, jumpAbility)
+    public ActionJump(StateSystem system, JumpState jumpState) 
+        : base(system, jumpState)
     {
-        m_JumpAbility = jumpAbility;
+        m_JumpState = jumpState;
     }
 
     public override void Execute()
     {
-        m_JumpAbility.SetDir(JumpAbility.Direction.Neutral);
+        m_JumpState.SetDir(JumpState.Direction.Neutral);
         base.Execute();
     }
 }
diff --git a/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs b/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs
index 4e71dcf6..d130411f 100644
--- a/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs
@@ -2,20 +2,20 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-// 垂直跳跃，切换到jump ability
-public class ActionJumpForward : ActionSwitchAbility
+// 垂直跳跃，切换到jump state
+public class ActionJumpForward : ActionSwitchState
 {
-	private JumpAbility m_JumpAbility;
+	private JumpState m_JumpState;
 
-	public ActionJumpForward(AbilitySystem system, JumpAbility jumpAbility)
-		: base(system, jumpAbility)
+	public ActionJumpForward(StateSystem system, JumpState jumpState)
+		: base(system, jumpState)
 	{
-		m_JumpAbility = jumpAbility;
+		m_JumpState = jumpState;
 	}
 
 	public override void Execute()
 	{
-		m_JumpAbility.SetDir(JumpAbility.Direction.Forward);
-		base.Execute(); // switch to jump ability 
+		m_JumpState.SetDir(JumpState.Direction.Forward);
+		base.Execute(); // switch to jump state 
 	}
 }
diff --git a/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs b/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs
index 1e214d72..89327951 100644
--- a/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs
@@ -2,20 +2,20 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-// 基础的切换 ability
-public class ActionSwitchAbility : ActionBase
+// 基础的切换 state
+public class ActionSwitchState : ActionBase
 {
-	AbilitySystem m_AbilitySystem;
-	AbilityBase m_TargetAbility;
+	StateSystem m_StateSystem;
+	StateBase m_TargetState;
 
-	public ActionSwitchAbility(AbilitySystem abilitySystem, AbilityBase targetAbility)
+	public ActionSwitchState(StateSystem stateSystem, StateBase targetState)
 	{
-		m_AbilitySystem = abilitySystem;
-		m_TargetAbility = targetAbility;
+		m_StateSystem = stateSystem;
+		m_TargetState = targetState;
 	}
 
 	public override void Execute()
 	{
-		m_AbilitySystem.SwitchToAbility(m_TargetAbility);
+		m_StateSystem.SwitchToState(m_TargetState);
 	}
 }
-- 
cgit v1.1-26-g67d0