diff --git a/Assets/JAY/Animator/PlayerController.controller b/Assets/JAY/Animator/PlayerController.controller
index 4c9ad755..a31be584 100644
--- a/Assets/JAY/Animator/PlayerController.controller
+++ b/Assets/JAY/Animator/PlayerController.controller
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c91b275bd31dd5542b32ae3205c9b28e7dd0225cde394431b345bee95a06306
-size 16228
+oid sha256:c3a3ff387918a08ae9e50522f6f0c415cc09baf0f69809f2dee0a28d72a7fd65
+size 22423
diff --git a/Assets/JAY/HousingUI.unity b/Assets/JAY/HousingUI.unity
index 3f604c83..f38c5f0f 100644
--- a/Assets/JAY/HousingUI.unity
+++ b/Assets/JAY/HousingUI.unity
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04d17aad8f57adf668bc3fe3bef9a990ac563a32935d0435a5c934a2e9b8ebda
-size 73969
+oid sha256:a163748df40f56fc751a7544b35dd94db65bf2fd32eb7b6eff20ee4defa31190
+size 74027
diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs
index f1ea7b80..2c841575 100644
--- a/Assets/JAY/Scripts/PlayerController.cs
+++ b/Assets/JAY/Scripts/PlayerController.cs
@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public enum PlayerState { None, Idle, Move, Hit, Dead }
+public enum PlayerState { None, Idle, Move, Win, Hit, Dead }
 
 public class PlayerController : CharacterBase, IObserver<GameObject>
 {
@@ -24,6 +24,8 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
     // 상태 관련
     private PlayerStateIdle _playerStateIdle;
     private PlayerStateMove _playerStateMove;
+    private PlayerStateWin _playerStateWin;
+    private PlayerStateDead _playerStateDead;
     
     // 행동 관련
     private PlayerActionAttack _attackAction;
@@ -53,11 +55,15 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
         // 상태 초기화
         _playerStateIdle = new PlayerStateIdle();
         _playerStateMove = new PlayerStateMove();
+        _playerStateWin = new PlayerStateWin();
+        _playerStateDead = new PlayerStateDead();
         
         _playerStates = new Dictionary<PlayerState, IPlayerState>
         {
             { PlayerState.Idle, _playerStateIdle },
             { PlayerState.Move, _playerStateMove },
+            { PlayerState.Win, _playerStateWin },
+            { PlayerState.Dead, _playerStateDead },
         };
         
         _attackAction = new PlayerActionAttack();
@@ -201,8 +207,6 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
 
     public void OnNext(GameObject value)
     {
-        Debug.Log("무기 타격");
-        float playerAttackPower = _weaponController.AttackPower * attackPower; // 플레이어 공격 데미지(막타는 일반 데미지의 4배)
     }
 
     public void OnError(Exception error)
@@ -215,4 +219,5 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
     }
     
     #endregion
+
 }
diff --git a/Assets/JAY/Scripts/PlayerControllerEditor.cs b/Assets/JAY/Scripts/PlayerControllerEditor.cs
index 2ddbbbe0..ffc4ec76 100644
--- a/Assets/JAY/Scripts/PlayerControllerEditor.cs
+++ b/Assets/JAY/Scripts/PlayerControllerEditor.cs
@@ -39,10 +39,12 @@ public class PlayerControllerEditor : Editor
 
         if (GUILayout.Button("BattleMode"))
             playerController.SwitchBattleMode();
+        if (GUILayout.Button("Win"))
+            playerController.SetState(PlayerState.Win);
         // if (GUILayout.Button("Hit"))
         //     playerController.SetState(PlayerState.Hit);
-        // if (GUILayout.Button("Dead"))
-        //     playerController.SetState(PlayerState.Dead);
+        if (GUILayout.Button("Dead"))
+            playerController.SetState(PlayerState.Dead);
         
         EditorGUILayout.EndHorizontal();
     }