From a61a79ff71683180929b2678781dd0b972baa0cd Mon Sep 17 00:00:00 2001 From: Jay <96156114+jaydev00a@users.noreply.github.com> Date: Tue, 13 May 2025 13:23:23 +0900 Subject: [PATCH] =?UTF-8?q?DEG-157=20[HOTFIX]=20=EB=88=84=EB=9D=BD=20?= =?UTF-8?q?=EB=8D=B0=EB=AF=B8=EC=A7=80=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs | 4 ++++ Assets/JAY/Scripts/PlayerController.cs | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs b/Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs index 9256970b..154d9f60 100644 --- a/Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs +++ b/Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs @@ -57,6 +57,8 @@ public class PlayerActionAttack : IPlayerAction { public void EndAction() { if (player == null) return; + player.WeaponController.AttackEnd(); + player.SafeSetBool("Attack", false); IsActive = false; player.OnActionEnded(this); @@ -70,6 +72,8 @@ public class PlayerActionAttack : IPlayerAction { var weapon = player.GetComponentInChildren(); weapon?.SetComboStep(step); + + player.WeaponController.AttackStart(); } public void OnComboInput() { diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs index 2ca2f45b..b3720cfe 100644 --- a/Assets/JAY/Scripts/PlayerController.cs +++ b/Assets/JAY/Scripts/PlayerController.cs @@ -24,7 +24,8 @@ public class PlayerController : CharacterBase, IObserver private bool _isBattle; private GameObject weapon; private WeaponController _weaponController; - + public WeaponController WeaponController => _weaponController; + private IPlayerState _currentStateClass { get; set; } private IPlayerAction _currentAction; public IPlayerAction CurrentAction => _currentAction;