From e95462af00206651dbf013de3ade4906484bb0a0 Mon Sep 17 00:00:00 2001 From: Syntriax Date: Sat, 17 Dec 2022 11:59:08 +0300 Subject: [PATCH] Changed Some Fields --- Runtime/IMovementController.cs | 4 ++-- Runtime/Implementations/AirMovement1D.cs | 2 +- Runtime/Implementations/GroundMovement1D.cs | 2 +- Runtime/MovementController.cs | 6 +++--- package.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Runtime/IMovementController.cs b/Runtime/IMovementController.cs index 28bf228..d72295b 100644 --- a/Runtime/IMovementController.cs +++ b/Runtime/IMovementController.cs @@ -7,9 +7,9 @@ namespace Syntriax.Modules.Movement public interface IMovementController { /// - /// Member Toggle State + /// Member to switch on or off /// - IToggleState ToggleState { get; } + IToggleState ToggleStateMember { get; } /// /// Currently active diff --git a/Runtime/Implementations/AirMovement1D.cs b/Runtime/Implementations/AirMovement1D.cs index 155e6b5..cde4d06 100644 --- a/Runtime/Implementations/AirMovement1D.cs +++ b/Runtime/Implementations/AirMovement1D.cs @@ -19,7 +19,7 @@ namespace Syntriax.Modules.Movement.Implementations if (groundTrigger != null) { - groundTrigger.OnTriggered += OnGroundTrigger; + groundTrigger.OnTriggerStateChanged += OnGroundTrigger; CanTakeOver = false; } } diff --git a/Runtime/Implementations/GroundMovement1D.cs b/Runtime/Implementations/GroundMovement1D.cs index 5271430..776d983 100644 --- a/Runtime/Implementations/GroundMovement1D.cs +++ b/Runtime/Implementations/GroundMovement1D.cs @@ -21,7 +21,7 @@ namespace Syntriax.Modules.Movement.Implementations if (groundTrigger != null) { - groundTrigger.OnTriggered += OnGroundTrigger; + groundTrigger.OnTriggerStateChanged += OnGroundTrigger; CanTakeOver = false; } } diff --git a/Runtime/MovementController.cs b/Runtime/MovementController.cs index f2c4cae..6ab402d 100644 --- a/Runtime/MovementController.cs +++ b/Runtime/MovementController.cs @@ -31,11 +31,11 @@ namespace Syntriax.Modules.Movement } } - private bool areBothToggleStatesToggled => ToggleState.IsToggledNullChecked() && toggleStateOnGameObject.IsToggledNullChecked(); + private bool areBothToggleStatesToggled => ToggleStateMember.IsToggledNullChecked() && toggleStateOnGameObject.IsToggledNullChecked(); public List Movements { get; protected set; } = new List(32); - public IToggleState ToggleState { get; protected set; } = new ToggleStateMember(true); + public IToggleState ToggleStateMember { get; protected set; } = new ToggleStateMember(true); protected IToggleState toggleStateOnGameObject = null; @@ -48,7 +48,7 @@ namespace Syntriax.Modules.Movement toggleStateOnGameObject = GetComponent(); toggleStateOnGameObject.OnToggleStateChanged += (_) => InvokeOnMoveAction(); - ToggleState.OnToggleStateChanged += (_) => InvokeOnMoveAction(); + ToggleStateMember.OnToggleStateChanged += (_) => InvokeOnMoveAction(); } protected virtual void FixedUpdate() diff --git a/package.json b/package.json index a01f5ba..d13f671 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.syntriax.movement", - "version": "0.1.2", + "version": "0.1.3", "displayName": "Movement Module", "description": "Dependends On:\nhttps://git.syntriax.com/Syntriax/ToggleState.git\nhttps://git.syntriax.com/Syntriax/Trigger.git\nhttps://git.syntriax.com/Syntriax/Factory.git", "unity": "2019.1",