From 791e4b901c1eb5be271de0f5c73939ef5062df29 Mon Sep 17 00:00:00 2001 From: Jay <96156114+jaydev00a@users.noreply.github.com> Date: Mon, 12 May 2025 15:31:43 +0900 Subject: [PATCH] =?UTF-8?q?DEG-148=20[FEAT]=20=EA=B3=B5=EA=B2=A9=20?= =?UTF-8?q?=EB=8C=80=EC=8B=9C=20=EB=B2=84=ED=8A=BC=20=EC=97=B0=EB=8F=99=20?= =?UTF-8?q?=EB=B0=8F=20=EC=B9=B4=EB=A9=94=EB=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/JAY/Scripts/PlayerController.cs | 14 ++++++++++++-- Assets/KSH/ReDungeon.unity | 4 ++-- Assets/Prefabs/ReDungeon/Canvas.prefab | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs index 1d3e3503..153d20b3 100644 --- a/Assets/JAY/Scripts/PlayerController.cs +++ b/Assets/JAY/Scripts/PlayerController.cs @@ -341,6 +341,16 @@ public class PlayerController : CharacterBase, IObserver effect.transform.localScale = scale; } } + + public void OnAttackButtonPressed() + { + if ((_currentAction == null || !_currentAction.IsActive) && + CurrentState != PlayerState.Win && CurrentState != PlayerState.Dead) + { + GameManager.Instance.PlayPlayerAttackSound(); + StartAttackAction(); + } + } #endregion @@ -352,9 +362,9 @@ public class PlayerController : CharacterBase, IObserver return dir.sqrMagnitude > 0.01f ? dir.normalized : transform.forward; } - public void DashButtonPressed() + public void OnDashButtonPressed() { - if (!_actionDash.IsActive) + if (!_actionDash.IsActive && CurrentState != PlayerState.Win && CurrentState != PlayerState.Dead) { StartDashAction(); } diff --git a/Assets/KSH/ReDungeon.unity b/Assets/KSH/ReDungeon.unity index d4a47891..2eff2973 100644 --- a/Assets/KSH/ReDungeon.unity +++ b/Assets/KSH/ReDungeon.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36eba19153a403f6666854d9d71b189d7648999e5d6693fbf6c28bb26546afd6 -size 34157 +oid sha256:908889f0158f1e1ef86cf9a7ddeb607c5fab7b4afebf4418be91f18329a97003 +size 35082 diff --git a/Assets/Prefabs/ReDungeon/Canvas.prefab b/Assets/Prefabs/ReDungeon/Canvas.prefab index 3431fddc..488a7f4d 100644 --- a/Assets/Prefabs/ReDungeon/Canvas.prefab +++ b/Assets/Prefabs/ReDungeon/Canvas.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42173771d56005c30152a38b3d31d920167c2b1c57d65e84426dee2aa70b256c -size 61822 +oid sha256:4252d2a903fd33a7e0f6e7429f3f88e0d10430b3e96fe69f6347b4817cf59995 +size 61776