Merge branch 'master' of http://8.134.150.210:3000/xgan/2025TapTapGameJam

Assets/Script/Gameplay/Player/PlayerDialogueController.cs

@@ -19,6 +19,12 @@ namespace Script.Gameplay.Player
         public event Action OnPlayerEndDialogue;
         public event Action<GameObject> OnGazeEnterDialogue;
         public event Action<GameObject> OnGazeExitDialogue;
+<<<<<<< HEAD
+=======
+        
+        private InputManager inputManager;
+        
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
         private Queue<string> dialogueQueue = new Queue<string>();
         private PlayerDialogueViewer playerDialogueViewer;
 
@@ -55,7 +61,12 @@ namespace Script.Gameplay.Player
             if (firstPersonRaycaster == null)
                 Debug.LogWarning("FirstPersonRaycaster not found! Please assign or add it to the player.");
 
+<<<<<<< HEAD
             var input = InputManager.Instance.Input;
+=======
+            inputManager = InputManager.Instance;
+            var input = inputManager.Input;
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
             input.Player.Read.performed += ctx =>
             {
                 if (!isEnablePlayerDialogue) return;
@@ -95,6 +106,11 @@ namespace Script.Gameplay.Player
                 OnPlayerBeginDialogue?.Invoke();
                 CurrentDialogueTarget.OnBeginDialogue?.Invoke(true);
                 dialogueQueue = SplitDialogue(CurrentDialogueTarget.DialogueContent);
+<<<<<<< HEAD
+=======
+                inputManager.SetInputForLook(false);
+                inputManager.SetInputForMove(false);
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
                 PassNextDialogue();
             }
         }
@@ -124,6 +140,11 @@ namespace Script.Gameplay.Player
                 isReadingDialogue = false;
                 OnPlayerEndDialogue?.Invoke();
                 CurrentDialogueTarget.OnEndDialogue?.Invoke(true);
+<<<<<<< HEAD
+=======
+                inputManager.SetInputForLook(true);
+                inputManager.SetInputForMove(true);
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
                 if (playerDialogueViewer != null)
                 {
                     playerDialogueViewer.ClosePanel();