Merge pull request 'DEG-148 [FEAT] 공격 대시 버튼 연동 및 카메라 수정' (!36) from DEG-148-공격-대시-버튼-연동-및-카메라-수정 into main
Reviewed-on: #36 Reviewed-by: Sehyeon <sehyeon1837@gmail.com> Reviewed-by: Lim0_C <dladudcks22@gmail.com>
This commit is contained in:
commit
bac6ec5f34
@ -342,6 +342,16 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
|
||||
}
|
||||
}
|
||||
|
||||
public void OnAttackButtonPressed()
|
||||
{
|
||||
if ((_currentAction == null || !_currentAction.IsActive) &&
|
||||
CurrentState != PlayerState.Win && CurrentState != PlayerState.Dead)
|
||||
{
|
||||
GameManager.Instance.PlayPlayerAttackSound();
|
||||
StartAttackAction();
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 대시 관련
|
||||
@ -352,9 +362,9 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
|
||||
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();
|
||||
}
|
||||
|
BIN
Assets/KSH/ReDungeon.unity
(Stored with Git LFS)
BIN
Assets/KSH/ReDungeon.unity
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/Prefabs/ReDungeon/Canvas.prefab
(Stored with Git LFS)
BIN
Assets/Prefabs/ReDungeon/Canvas.prefab
(Stored with Git LFS)
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user