Degulleo/Degulleo3D
7
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

DEG-108 [Fix] 공격 제한

Browse Source
This commit is contained in:
Sehyeon 2025-04-25 15:59:57 +09:00
parent 59625fa8ff
commit d3948bc577
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/JAY/Scripts/PlayerController.cs
View File

@ -89,7 +89,8 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
} }
// 공격 입력 처리 // 공격 입력 처리
if (Input.GetKeyDown(KeyCode.X) && (_currentAction == null || !_currentAction.IsActive)) { if (Input.GetKeyDown(KeyCode.X) && (_currentAction == null || !_currentAction.IsActive)
&& (CurrentState != PlayerState.Win && CurrentState != PlayerState.Dead)) {
Debug.Log("X 버튼 Down 됨"); Debug.Log("X 버튼 Down 됨");
StartAttackAction(); StartAttackAction();
} }

4
Assets/KSH/DungeonLogic.cs
View File

@ -41,6 +41,8 @@ public class DungeonLogic : MonoBehaviour
{ {
if (isFailed || isCompleted) return; // 어느 한 쪽 사망시 더이상 피격 X if (isFailed || isCompleted) return; // 어느 한 쪽 사망시 더이상 피격 X
// TODO: 플레이어 피격 효과음
var result = _dungeonPanelController.SetPlayerHealth(); var result = _dungeonPanelController.SetPlayerHealth();
if (!result) // 하트 모두 소모 if (!result) // 하트 모두 소모
{ {
@ -52,6 +54,8 @@ public class DungeonLogic : MonoBehaviour
{ {
if (isFailed || isCompleted) return; if (isFailed || isCompleted) return;
// TODO: 에너미 피격 효과음
_dungeonPanelController.SetBossHealthBar(enemy.currentHP); _dungeonPanelController.SetBossHealthBar(enemy.currentHP);
} }

3
Assets/Scripts/Character/CharacterBase.cs
View File

@ -28,6 +28,8 @@ public abstract class CharacterBase : MonoBehaviour
public virtual void TakeDamage(float damage) public virtual void TakeDamage(float damage)
{ {
if (currentHP <= 0) return;
float actualDamage = Mathf.Max(0, damage - defensePower); float actualDamage = Mathf.Max(0, damage - defensePower);
currentHP -= Mathf.RoundToInt(actualDamage); currentHP -= Mathf.RoundToInt(actualDamage);
Debug.Log($"{characterName}이 {actualDamage}의 피해를 입었습니다. 현재 체력: {currentHP}"); Debug.Log($"{characterName}이 {actualDamage}의 피해를 입었습니다. 현재 체력: {currentHP}");
@ -35,6 +37,7 @@ public abstract class CharacterBase : MonoBehaviour
if (currentHP <= 0) if (currentHP <= 0)
{ {
Die(); Die();
return;
} }
OnGetHit?.Invoke(this); OnGetHit?.Invoke(this);