From d2d474a84bd68c400fdc4d1b1c84a1a600d0d436 Mon Sep 17 00:00:00 2001
From: HaeinLEE <heyin0122@korea.ac.kr~>
Date: Wed, 23 Apr 2025 23:15:11 +0900
Subject: [PATCH] =?UTF-8?q?[Style]=20=EC=A3=BC=EC=84=9D=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LIN/DailyRoutine/InteractionController.cs | 11 ++---
 Assets/LIN/HousingCanvasController.cs         | 48 +++++++++++--------
 Assets/LIN/HousingConstants.cs                |  5 --
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/Assets/LIN/DailyRoutine/InteractionController.cs b/Assets/LIN/DailyRoutine/InteractionController.cs
index 36b8e8b0..6f27f3e3 100644
--- a/Assets/LIN/DailyRoutine/InteractionController.cs
+++ b/Assets/LIN/DailyRoutine/InteractionController.cs
@@ -12,13 +12,8 @@ public class InteractionController : MonoBehaviour
     [FormerlySerializedAs("housingCanvasManager")]
     [Header("UI 연동")]
     [SerializeField] HousingCanvasController housingCanvasController;
-
-
-    #region 돌발 이벤트
-    private SuddenEventController _suddenEventController = new SuddenEventController();
-
-    #endregion
     
+    private SuddenEventController _suddenEventController = new SuddenEventController();
     
     // 상호작용 가능한 사물 범위에 들어올 때
     private void OnTriggerEnter(Collider other)
@@ -51,7 +46,7 @@ public class InteractionController : MonoBehaviour
             if (playerStats.CanPerformByHealth(interactionType))
             {
                 playerStats.PerformAction(interactionType);
-                // 출근에 해당하는 돌발 이벤트 호출
+                // 출퇴근에 해당하는 돌발 이벤트 호출
                 if (interactionType != ActionType.Work) return;
                 playerStats.OnWorked += SuddenAfterWorkEventHappen();
             }
@@ -83,7 +78,7 @@ public class InteractionController : MonoBehaviour
                 });
                 break;
             case AfterWorkEvent.TeamGathering:
-                housingCanvasController.ShowSuddenEventPanel("갑자기 팀 회식이 잡혔다. 참석 해야 겠지?", () =>
+                housingCanvasController.ShowSuddenEventPanel("갑자기 팀 회식이 잡혔다. 참석 하러 가자", () =>
                 {
                     housingCanvasController.HideSuddenEventPanel();
                 });
diff --git a/Assets/LIN/HousingCanvasController.cs b/Assets/LIN/HousingCanvasController.cs
index 3d45d624..53848740 100644
--- a/Assets/LIN/HousingCanvasController.cs
+++ b/Assets/LIN/HousingCanvasController.cs
@@ -6,6 +6,7 @@ using UnityEngine;
 
 public class HousingCanvasController : MonoBehaviour
 {
+    [Header("일상행동 상호작용")] 
     [SerializeField] GameObject interactionButton;
     [SerializeField] TMP_Text actionText;
     [SerializeField] TMP_Text descriptionText;
@@ -13,16 +14,18 @@ public class HousingCanvasController : MonoBehaviour
     [Header("돌발 이벤트")] 
     [SerializeField] private GameObject suddenPanel;
     [SerializeField] private TMP_Text suddenText;
-    
+
     public Action OnInteractionButtonPressed;
     public Action OnSuddenButtonPressed;
     
     void Awake()
     {
-        InitTexts();
+        InitInteractionTexts();
         interactionButton.SetActive(false);
+        suddenPanel.SetActive(false);
     }
     
+    #region 상호작용 일상 행동
     //사물 이름 세팅
     public void SetActionText(string text = "")
     {
@@ -34,7 +37,7 @@ public class HousingCanvasController : MonoBehaviour
         descriptionText.text = text;
     }
 
-    private void InitTexts()
+    private void InitInteractionTexts()
     {
         SetActionText();
         SetDescriptionText();
@@ -50,24 +53,6 @@ public class HousingCanvasController : MonoBehaviour
         //각 행동 별로 실행되어야 할 이벤트 구독
         OnInteractionButtonPressed = onInteractionButtonPressed;
     }
-
-    public void ShowSuddenEventPanel(string actText, Action onSuddenButtonPressed)
-    {
-        suddenPanel.SetActive(true);
-        suddenText.text = actText;
-        OnSuddenButtonPressed += onSuddenButtonPressed;
-    }
-
-    public void HideSuddenEventPanel()
-    {
-        suddenPanel.SetActive(false);
-        suddenText.text = "";
-        OnSuddenButtonPressed -= OnSuddenButtonPressed;
-    }
-    public void OnSuddenConfirmButton()
-    {
-        OnSuddenButtonPressed?.Invoke();
-    }
     //범위에서 벗어나면 상호작용 버튼 off
     public void HideInteractionButton()
     {
@@ -85,4 +70,25 @@ public class HousingCanvasController : MonoBehaviour
         OnInteractionButtonPressed?.Invoke();
         HideInteractionButton();
     }
+    #endregion
+    
+    #region 돌발 이벤트
+    public void ShowSuddenEventPanel(string actText, Action onSuddenButtonPressed)
+    {
+        suddenPanel.SetActive(true);
+        suddenText.text = actText;
+        OnSuddenButtonPressed += onSuddenButtonPressed;
+    }
+    public void HideSuddenEventPanel()
+    {
+        suddenPanel.SetActive(false);
+        suddenText.text = "";
+        OnSuddenButtonPressed -= OnSuddenButtonPressed;
+    }
+    public void OnSuddenConfirmButton()
+    {
+        OnSuddenButtonPressed?.Invoke();
+    }
+    #endregion
+    
 }
diff --git a/Assets/LIN/HousingConstants.cs b/Assets/LIN/HousingConstants.cs
index 8f783a43..e00ff3c2 100644
--- a/Assets/LIN/HousingConstants.cs
+++ b/Assets/LIN/HousingConstants.cs
@@ -25,12 +25,7 @@ public static class HousingConstants
             { ActionType.Housework, new InteractionTexts("밀린 집안일을 처리할까?","체력 1을 사용하고 좋은일이 일어날지도 모른다","힘들어서 못해..")},
             { ActionType.Dungeon, new InteractionTexts("던전에 입장할까?","체력 3을 사용하고 3시간이 흐른다.","던전에 갈 체력이 되지 않아..")},
             { ActionType.Work, new InteractionTexts("출근한다.","체력 3을 사용하고 저녁 6시에나 돌아오겠지..", "도저히 출근할 체력이 안되는걸..?")}
-            
-            
-            
         };
-    
-
     #endregion
 
     public struct InteractionTexts