root/BITFALL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
CortexCore
2024-04-19 21:43:30 +08:00
parent e12a6e5a46
commit 3cc6491973
46 changed files with 6792 additions and 23887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterState.cs
View File

@@ -1,4 +1,5 @@
using BITFALL.Player.Movement;
using BITKit;
using BITKit.Entities;
using BITKit.StateMachine;
using Lightbug.CharacterControllerPro.Core;
@@ -8,13 +9,13 @@ namespace BITFALL.Entities.Player.Movement.States
{
public abstract class PlayerCharacterState : IEntityMovementState
{
[SerializeField] protected PlayerCharacterController characterController;
[Inject] public PlayerCharacterController self;
[SerializeField] protected CharacterActor actor;
private IEntityMovementState entryState;
public bool Enabled { get; set; }
public virtual void Initialize()
{
characterController.UnityEntity.Inject(this);
}
public virtual void OnStateEntry(IState old)
@@ -53,24 +54,24 @@ namespace BITFALL.Entities.Player.Movement.States
{
if ( entryState is not null)
{
if ( entryState is IPlayerWalkState or IPlayerRunState or IPlayerSprintState && characterController.topBlocked )
if ( entryState is IPlayerWalkState or IPlayerRunState or IPlayerSprintState && self.topBlocked )
{
characterController.TransitionState<Crouch>();
self.TransitionState<Crouch>();
}
else
{
characterController.TransitionState(entryState);
self.TransitionState(entryState);
}
}
else
{
if (characterController.topBlocked)
if (self.topBlocked)
{
characterController.TransitionState<Crouch>();
self.TransitionState<Crouch>();
}
else
{
characterController.TransitionState<Walk>();
self.TransitionState<Walk>();
}
}
}