Syntriax/Movement
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switched from UnityEvent to System.Action

Browse Source
This commit is contained in:
Syntriax
2022-11-13 18:07:54 +03:00
parent 8a1fdc6f9e
commit d76675b6f1
22 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Implementations/2D/OneDirectional2DGroundMovement.cs
View File

@@ -12,7 +12,7 @@ namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
{
base.Start();
groundTrigger = GetComponentInChildren<IGroundTrigger>();
groundTrigger.OnTriggered.AddListener(OnGroundTrigger);
groundTrigger.OnTriggered += OnGroundTrigger;
}
private void OnGroundTrigger(bool isGrounded)

2
Implementations/2D/OneWay2DAirMovement.cs
View File

@@ -12,7 +12,7 @@ namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
{
base.Start();
groundTrigger = GetComponentInChildren<IGroundTrigger>();
groundTrigger.OnTriggered.AddListener(OnGroundTrigger);
groundTrigger.OnTriggered += OnGroundTrigger;
}
private void OnGroundTrigger(bool isGrounded)

2
Implementations/2D/OneWay2DGroundMovement.cs
View File

@@ -12,7 +12,7 @@ namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
{
base.Start();
groundTrigger = GetComponentInChildren<IGroundTrigger>();
groundTrigger.OnTriggered.AddListener(OnGroundTrigger);
groundTrigger.OnTriggered += OnGroundTrigger;
}
private void OnGroundTrigger(bool isGrounded)

13
Implementations/2D/TwoDimensionalMovementBase.cs
View File

@@ -1,6 +1,6 @@
using System;
using Syntriax.Modules.Movement.State;
using UnityEngine;
using UnityEngine.Events;
namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
{
@@ -15,7 +15,7 @@ namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
public float BaseSpeed { get; set; } = 1f;
public float MovementMultiplier { get; set; } = 1f;
public UnityEvent<bool> OnTakeOverStateChanged { get; protected set; } = null;
public Action<bool> OnTakeOverStateChanged { get; set; } = null;
public bool CanTakeOver
{
get => _canTakeOver;
@@ -32,19 +32,14 @@ namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
public IToggleState ToggleState { get; protected set; } = null;
protected virtual void Awake()
{
OnTakeOverStateChanged = new UnityEvent<bool>();
}
protected virtual void Start()
{
rigid = GetComponent<Rigidbody2D>();
toggleState = GetComponent<ToggleState>();
movementController = GetComponent<IMovementController>();
movementController.OnMovementActivated.AddListener(OnActivated);
movementController.OnMovementDeactivated.AddListener(OnDeactivated);
movementController.OnMovementActivated += OnActivated;
movementController.OnMovementDeactivated += OnDeactivated;
}
protected abstract void OnDeactivated();