From d88698a454fbfe306bd0142660172bdd6e93ecf3 Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 29 Aug 2021 13:22:23 +0800 Subject: *misc --- .../Unit/PC/Erika/AnimationData/Air_Dash.asset | 2 +- Assets/Scripts/Input/InputManager.cs | 3 ++- Assets/Scripts/Unit/Component/UnitState.cs | 24 +++++++++++++++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) (limited to 'Assets') diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset index 416c2c91..2cc3269d 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset @@ -132,7 +132,7 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.5 + - from: 0.3 to: 1 parameters: m_keys: diff --git a/Assets/Scripts/Input/InputManager.cs b/Assets/Scripts/Input/InputManager.cs index 62fd5f91..72f5cba2 100644 --- a/Assets/Scripts/Input/InputManager.cs +++ b/Assets/Scripts/Input/InputManager.cs @@ -108,7 +108,8 @@ public class InputManager : SingletonMB return false; } } - m_CommandQueue.RemoveRange(count - keys.Length, keys.Length); + //m_CommandQueue.RemoveRange(count - keys.Length, keys.Length); + m_CommandQueue.Clear(); return true; } diff --git a/Assets/Scripts/Unit/Component/UnitState.cs b/Assets/Scripts/Unit/Component/UnitState.cs index bc934f43..1de97901 100644 --- a/Assets/Scripts/Unit/Component/UnitState.cs +++ b/Assets/Scripts/Unit/Component/UnitState.cs @@ -342,6 +342,16 @@ public class UnitState : UnitComponent yield return new WaitForTransitionDone(unitAnimation); while (true) { + if (InputManager.Instance.TryCommand(0.5f, KeyCode.A, KeyCode.A)) + { + TurnLeft(); + ChangeState(EUnitState.AirDash, new AirDashParam()); + } + if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D)) + { + TurnRight(); + ChangeState(EUnitState.AirDash, new AirDashParam()); + } if (unitAnimation.layers[0].playbackNomralizedTime >= 1) ChangeState(EUnitState.Idle, new IdleParam()); bool canAttack = m_Owner.unitAnimation.layers[0].IsToggleOpen(EAnimationToogle.Combo); @@ -398,7 +408,19 @@ public class UnitState : UnitComponent m_Owner.transform.position = pos; ChangeState(EUnitState.Idle, new IdleParam()); } - yield return null; + + if (InputManager.Instance.TryCommand(0.5f, KeyCode.A, KeyCode.A)) + { + TurnLeft(); + ChangeState(EUnitState.AirDash, new AirDashParam()); + } + if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D)) + { + TurnRight(); + ChangeState(EUnitState.AirDash, new AirDashParam()); + } + + yield return null; } } -- cgit v1.1-26-g67d0