[Fix] 병합 충돌

Assets/LIN/Scripts/UI/InteractionAnimationPanelController.cs

@@ -141,7 +141,19 @@ public class InteractionAnimationPanelController : MonoBehaviour
         _parentCanvas = FindObjectOfType(typeof(Canvas)) as Canvas;
         
         HousingConstants.interactions.TryGetValue(ActionType.Sleep, out var interactionTexts);
-        ShowAnimationPanel(ActionType.Sleep, interactionTexts.AnimationText);
+        
+        // 1) 패널 활성화
+        panel.SetActive(true);
+        // 2) 기존 코루틴 정리
+        if (_textAnimCoroutine != null)    StopCoroutine(_textAnimCoroutine);
+        if (_autoHideCoroutine != null)    StopCoroutine(_autoHideCoroutine);
+
+        // 3) 텍스트 및 애니메이션 세팅
+        doingText.text = interactionTexts.AnimationText;
+        animator.Play("Sleep");
+        
+        _textAnimCoroutine = StartCoroutine(TextDotsAnimation());
+        _autoHideCoroutine = StartCoroutine(AutoHidePanel(ActionType.Sleep));
     }
 }
  

Assets/Prefabs/ReHousing/TutorialManager.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d6becab55ba8d2a4985851dd3e1c4a83
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/GameManager.cs

@@ -26,6 +26,8 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
     private PanelManager panelManager;
     public PanelManager PanelManager => panelManager;
     
+    private TutorialManager tutorialManager;
+    
     private void Start()
     {
         // 오디오 초기화
@@ -91,24 +93,45 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
             TriggerTimeEnding();
         }
     }
+
+    public void ChangeToMainScene()
+    {
+        SceneManager.LoadScene("Main");
+    }
     
     public void ChangeToGameScene()
     {
         tryStageCount++; // 던전 시도 횟수 증가
         InteractionController interactionController = FindObjectOfType<InteractionController>();
         interactionController.ReSetAfterWorkEvent();
-        SceneManager.LoadScene("ReDungeon"); // 던전 Scene
+        var switchingPanel = PanelManager.GetPanel("SwitchingPanel").GetComponent<SwitchingPanelController>();
+        switchingPanel.FadeAndSceneLoad("ReDungeon"); // 던전 Scene
         HandleSceneAudio("Dungeon");
     }
     
-    public void ChangeToHomeScene()
+    public void ChangeToHomeScene(bool isNewStart = false)
     {
-        SceneManager.LoadScene("ReHousing"); // Home Scene
+        var switchingPanel = PanelManager.GetPanel("SwitchingPanel").GetComponent<SwitchingPanelController>();
+        switchingPanel.FadeAndSceneLoad("ReHousing"); // Home Scene
         HandleSceneAudio("Housing");
         
+        if(isNewStart) // 아예 메인에서 시작 시 튜토리얼 출력
+            StartNPCDialogue(GamePhase.Intro); // StartCoroutine(StartTutorialCoroutine());
+        
         if (tryStageCount >= 3) FailEnd(); // 엔딩
     }
     
+    public IEnumerator StartTutorialCoroutine()
+    {
+        yield return new WaitForSeconds(0.5f);
+        
+        if(tutorialManager == null)
+            tutorialManager = FindObjectOfType<TutorialManager>();
+        
+        PlayerStats.Instance.HideBubble();
+        tutorialManager.StartTutorial(() => PlayerStats.Instance.ShowBubble());
+    }
+    
     // TODO: Open Setting Panel 등 Panel 처리
     
     protected override void OnSceneLoaded(Scene scene, LoadSceneMode mode)
@@ -135,6 +158,7 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
         if (save?.dungeonSave != null)
         {
             stageLevel = Mathf.Clamp(save.dungeonSave.stageLevel,1,2);
+            tryStageCount = Mathf.Clamp(save.dungeonSave.tryStageCount,0,3);
         }
          
         if (save?.homeSave != null)
@@ -150,6 +174,7 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
             dungeonSave = new DungeonSave()
             {
                 stageLevel = Mathf.Clamp(this.stageLevel,1,2),
+                tryStageCount = Mathf.Clamp(this.tryStageCount,0,3),
             },
              
             homeSave = new HomeSave

Assets/Scripts/Tutorial/TutorialStep1.asset

@@ -12,8 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b22d834cf5e26e647be215074940d40e, type: 3}
   m_Name: TutorialStep1
   m_EditorClassIdentifier: 
-  message: "\uC9D1\uC5D0\uC11C\uB3C4 \uC2AC\uB77C\uC774\uB354\uB97C \uC870\uC791\uD574
+  message: "\uC2AC\uB77C\uC774\uB354\uB97C \uC870\uC791\uD574 \uCE90\uB9AD\uD130\uB97C
-    \uCE90\uB9AD\uD130\uB97C \uC6C0\uC9C1\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4."
+    \uC6C0\uC9C1\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4."
   timeout: 0
   onStepBegin:
     m_PersistentCalls:

Assets/Scripts/Tutorial/TutorialStep2.asset

@@ -13,8 +13,8 @@ MonoBehaviour:
   m_Name: TutorialStep2
   m_EditorClassIdentifier: 
   message: "\uCE68\uB300, \uB0C9\uC7A5\uACE0, \uD604\uAD00 \uADF8\uB9AC\uACE0 \uC8FC\uBC29\uC5D0
-    \uAC00\uAE4C\uC774 \uAC00\uBA74 \uADF8\uC5D0 \uC5B4\uC6B8\uB9AC\uB294 \uC0C1\uD638\uC791\uC6A9\uC744
+    \uAC00\uAE4C\uC774 \uAC00\uBA74\n\uC0C1\uD638\uC791\uC6A9\uC744 \uD560 \uC218
-    \uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4."
+    \uC788\uC2B5\uB2C8\uB2E4."
   timeout: 0
   onStepBegin:
     m_PersistentCalls: