From 59625fa8ff8463514c7f762cf29ad1236712cdca Mon Sep 17 00:00:00 2001
From: Sehyeon <ksh1837@naver.com>
Date: Fri, 25 Apr 2025 15:48:11 +0900
Subject: [PATCH] =?UTF-8?q?DEG-108=20[Fix]=20OnNext=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EA=B3=B5=EA=B2=A9=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/JAY/Scripts/PlayerController.cs | 12 ++++++++++++
 Assets/JAY/Scripts/WeaponController.cs | 10 ----------
 Assets/KSH/DungeonPanelController.cs   |  7 ++-----
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs
index 902a4a36..0dd9e277 100644
--- a/Assets/JAY/Scripts/PlayerController.cs
+++ b/Assets/JAY/Scripts/PlayerController.cs
@@ -70,6 +70,8 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
         _actionDash = new PlayerActionDash();
         
         PlayerInit();
+
+        SwitchBattleMode();
     }
     
     private void Update()
@@ -211,6 +213,16 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
 
     public void OnNext(GameObject value)
     {
+        float playerAttackPower = _weaponController.AttackPower * attackPower;
+        
+        if (value.CompareTag("Enemy")) // 적이 Enemy일 때만 공격 처리
+        {
+            var enemyController = value.transform.GetComponent<EnemyController>();
+            if (enemyController != null)
+            {
+                enemyController.TakeDamage(playerAttackPower);
+            }
+        }
     }
 
     public void OnError(Exception error)
diff --git a/Assets/JAY/Scripts/WeaponController.cs b/Assets/JAY/Scripts/WeaponController.cs
index e8803f2f..6a86b8d6 100644
--- a/Assets/JAY/Scripts/WeaponController.cs
+++ b/Assets/JAY/Scripts/WeaponController.cs
@@ -105,16 +105,6 @@ public class WeaponController : MonoBehaviour, IObservable<GameObject>
                     if (!_hitColliders.Contains(hit.collider))
                     {
                         _hitColliders.Add(hit.collider);
-
-                        if (hit.collider.gameObject.CompareTag("Enemy"))
-                        {
-                            var enemyController = hit.transform.GetComponent<EnemyController>();
-                            if (enemyController != null && _playerController != null)
-                            {
-                                enemyController.TakeDamage(AttackPower * _playerController.attackPower);
-                            }
-                        }
-                        
                         Notify(hit.collider.gameObject);
                     }
                 }
diff --git a/Assets/KSH/DungeonPanelController.cs b/Assets/KSH/DungeonPanelController.cs
index 6614ec03..952bad9e 100644
--- a/Assets/KSH/DungeonPanelController.cs
+++ b/Assets/KSH/DungeonPanelController.cs
@@ -20,11 +20,8 @@ public class DungeonPanelController : MonoBehaviour
     public bool SetPlayerHealth()
     {
         StartCoroutine(WaitForOneSecond());
-        
-        if (_countHealth > _playerHealthImages.Length - 1) // out of index error 방지
-        {
-            return false;
-        }
+        // out of index error 방지
+        if (_countHealth > _playerHealthImages.Length - 1) return false;
         
         _playerHealthImages[_countHealth].color = Color.black;
         _countHealth++;