Compare commits

..

No commits in common. "d4cdc1ef4340b90dca1c76104609ef9d00fa36ca" and "940d967b4f0aeb2f505192a8f2d2095410cbd540" have entirely different histories.

2 changed files with 1 additions and 6 deletions

View File

@ -57,8 +57,6 @@ public class PlayerActionAttack : IPlayerAction {
public void EndAction() { public void EndAction() {
if (player == null) return; if (player == null) return;
player.WeaponController.AttackEnd();
player.SafeSetBool("Attack", false); player.SafeSetBool("Attack", false);
IsActive = false; IsActive = false;
player.OnActionEnded(this); player.OnActionEnded(this);
@ -72,8 +70,6 @@ public class PlayerActionAttack : IPlayerAction {
var weapon = player.GetComponentInChildren<WeaponController>(); var weapon = player.GetComponentInChildren<WeaponController>();
weapon?.SetComboStep(step); weapon?.SetComboStep(step);
player.WeaponController.AttackStart();
} }
public void OnComboInput() { public void OnComboInput() {

View File

@ -24,8 +24,7 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
private bool _isBattle; private bool _isBattle;
private GameObject weapon; private GameObject weapon;
private WeaponController _weaponController; private WeaponController _weaponController;
public WeaponController WeaponController => _weaponController;
private IPlayerState _currentStateClass { get; set; } private IPlayerState _currentStateClass { get; set; }
private IPlayerAction _currentAction; private IPlayerAction _currentAction;
public IPlayerAction CurrentAction => _currentAction; public IPlayerAction CurrentAction => _currentAction;