From 02c2390d83cfc744fb5a9459f00c491d36fccaa4 Mon Sep 17 00:00:00 2001
From: ngtuanz1 <nguyenanhtuan4643@gmail.com>
Date: Wed, 15 Apr 2026 10:45:47 +0700
Subject: [PATCH] update hehehe

---
 .idea/.idea.HALLUCINATE/.idea/workspace.xml   | 11 ++-
 Assets/Prefabs/Player.prefab                  | 19 +++++
 Assets/Scove/Player Movement.unity            | 50 +++++++++--
 .../Scripts/Interactables/LampInteractable.cs | 10 +++
 Assets/Scripts/UI/MyUIDisplay.cs              | 84 ++++++++++++-------
 5 files changed, 137 insertions(+), 37 deletions(-)

diff --git a/.idea/.idea.HALLUCINATE/.idea/workspace.xml b/.idea/.idea.HALLUCINATE/.idea/workspace.xml
index dc27f1de..ba05eaad 100644
--- a/.idea/.idea.HALLUCINATE/.idea/workspace.xml
+++ b/.idea/.idea.HALLUCINATE/.idea/workspace.xml
@@ -4,7 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f9183c68-daf0-43b8-be4c-fad79983f91b" name="Changes" comment="" />
+    <list default="true" id="f9183c68-daf0-43b8-be4c-fad79983f91b" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Prefabs/Player.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Player.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scove/Player Movement.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scove/Player Movement.unity" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Interactables/LampInteractable.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Interactables/LampInteractable.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MyUIDisplay.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/MyUIDisplay.cs" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -43,7 +49,7 @@
     &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
     &quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
     &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
@@ -126,6 +132,7 @@
       <workItem from="1775100366425" duration="2192000" />
       <workItem from="1775106342316" duration="15040000" />
       <workItem from="1775313757656" duration="8722000" />
+      <workItem from="1776130728673" duration="7161000" />
     </task>
     <servers />
   </component>
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index 464d70c3..12a362c5 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -20,6 +20,7 @@ GameObject:
   - component: {fileID: 5773292363125757170}
   - component: {fileID: 504047695906043424}
   - component: {fileID: -5076913349690967641}
+  - component: {fileID: 591040529181574494}
   m_Layer: 0
   m_Name: Player
   m_TagString: Player
@@ -399,6 +400,7 @@ MonoBehaviour:
   _NetworkedCameraRotation: {x: 0, y: 0, z: 0, w: 0}
   _NetworkedMoveInput: {x: 0, y: 0}
   _NetworkedSpeed: 0
+  _NetworkedPosition: {x: 0, y: 0, z: 0}
 --- !u!114 &3043298118541876184
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -497,6 +499,23 @@ MonoBehaviour:
   - {fileID: 830356296960548640}
   - {fileID: 504047695906043424}
   ForceRemoteRenderTimeframe: 0
+--- !u!114 &591040529181574494
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1054594849095937263}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bf6aff0b7e11d41439ac80f4963a0795, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::OnlyScove.Scripts.PlayerDebugProvider
+  stateMachine: {fileID: 830356296960548640}
+  debugCanvas: {fileID: 0}
+  followOffset: {x: 1.5, y: 2, z: 0}
+  smoothTime: 0.15
+  lookAtCamera: 1
 --- !u!1 &3751838835891881608
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scove/Player Movement.unity b/Assets/Scove/Player Movement.unity
index cc046699..4bd287c0 100644
--- a/Assets/Scove/Player Movement.unity	
+++ b/Assets/Scove/Player Movement.unity	
@@ -987,13 +987,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1222728863}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1880766867}
-  m_Father: {fileID: 1579856156}
+  m_Father: {fileID: 1493821250}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1186,6 +1186,42 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1493821249
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1493821250}
+  m_Layer: 5
+  m_Name: PromptGroup
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1493821250
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1493821249}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1222728864}
+  m_Father: {fileID: 1579856156}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1579856151
 GameObject:
   m_ObjectHideFlags: 0
@@ -1219,8 +1255,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::UI.MyUIDisplay
   playerDebugProvider: {fileID: 0}
-  interactionPromptContainer: {fileID: 1222728863}
-  interactionPromptText: {fileID: 0}
+  interactionPromptContainer: {fileID: 1493821249}
+  interactionPromptText: {fileID: 1222728865}
 --- !u!114 &1579856153
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1296,7 +1332,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1222728864}
+  - {fileID: 1493821250}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1337,7 +1373,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::OnlyScove.Scripts.DoorInteractable
   interactionData: {fileID: 11400000, guid: d3011be1ae644ac4e8430e89705cf443, type: 2}
-  woodDoorScript: {fileID: 0}
+  woodDoorScript: {fileID: 1771364118}
   animator: {fileID: 0}
   boolParameterName: IsOpen
 --- !u!65 &1667007659
@@ -1682,7 +1718,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::OnlyScove.Scripts.DoorInteractable
   interactionData: {fileID: 11400000, guid: d3011be1ae644ac4e8430e89705cf443, type: 2}
-  woodDoorScript: {fileID: 0}
+  woodDoorScript: {fileID: 1771364118}
   animator: {fileID: 0}
   boolParameterName: IsOpen
 --- !u!4 &1907283845
diff --git a/Assets/Scripts/Interactables/LampInteractable.cs b/Assets/Scripts/Interactables/LampInteractable.cs
index 87833747..560f87e6 100644
--- a/Assets/Scripts/Interactables/LampInteractable.cs
+++ b/Assets/Scripts/Interactables/LampInteractable.cs
@@ -19,6 +19,16 @@ namespace OnlyScove.Scripts
         private Material lampMaterial;
         private Color originalEmissionColor;
 
+        public override string InteractionPrompt
+        {
+            get
+            {
+                string action = isOn ?  "Tắt " : "Bật ";
+                string name = interactionData != null ? interactionData.promptText : "Đèn";
+                return action + name;
+            }
+        }
+
         private void Start()
         {
             // Khởi tạo Material (tạo bản thực thi riêng để không lỗi Shader)
diff --git a/Assets/Scripts/UI/MyUIDisplay.cs b/Assets/Scripts/UI/MyUIDisplay.cs
index e5efc748..6a7effed 100644
--- a/Assets/Scripts/UI/MyUIDisplay.cs
+++ b/Assets/Scripts/UI/MyUIDisplay.cs
@@ -1,47 +1,75 @@
 using OnlyScove.Scripts;
 using UnityEngine;
+using UnityEngine.UI;
 using TMPro;
 
 namespace UI
 {
-    public class MyUIDisplay : MonoBehaviour
+public class MyUIDisplay : MonoBehaviour
+{
+    [Header("References")]
+    public PlayerDebugProvider playerDebugProvider;
+    
+    [Header("UI Prompt")]
+    public GameObject interactionPromptContainer;
+
+    public UnityEngine.UI.Text interactionPromptText;
+
+    private void Start()
     {
-        public PlayerDebugProvider playerDebugProvider;
-        
-        [Header("UI Prompt")]
-        public GameObject interactionPromptContainer;
-        public TextMeshProUGUI interactionPromptText;
+        //if (playerDebugProvider == null)
+            //playerDebugProvider = FindFirstObjectByType<PlayerDebugProvider>();
 
-        private void Start()
+        // Luôn ẩn lúc bắt đầu
+        if (interactionPromptContainer != null)
+            interactionPromptContainer.SetActive(false);
+
+        TryFindPlayer();
+    }
+
+    private void Update()
+    {
+        if (playerDebugProvider == null)
         {
-            if (playerDebugProvider == null)
-                playerDebugProvider = FindFirstObjectByType<PlayerDebugProvider>();
-
-            // Luôn ẩn lúc bắt đầu
-            if (interactionPromptContainer != null)
-                interactionPromptContainer.SetActive(false);
+            TryFindPlayer();
+            if (playerDebugProvider == null) return;
         }
+        if (interactionPromptContainer == null) return;
 
-        private void Update()
+        IInteractable interactable = playerDebugProvider.GetActiveInteractable();
+        
+        if (interactable != null)
         {
-            if (playerDebugProvider == null || interactionPromptContainer == null) return;
+            // Hiện UI tại vị trí cố định bạn đã đặt trong Canvas
+            interactionPromptContainer.SetActive(true);
 
-            IInteractable interactable = playerDebugProvider.GetActiveInteractable();
-            
-            if (interactable != null)
+            if (!interactionPromptContainer.activeSelf)
             {
-                // Hiện UI tại vị trí cố định bạn đã đặt trong Canvas
                 interactionPromptContainer.SetActive(true);
+            }
 
-                if (interactionPromptText != null)
-                {
-                    interactionPromptText.text = interactable.InteractionPrompt;
-                }
-            }
-            else
-            {
+            if (interactionPromptText != null)
+                interactionPromptText.text = interactable.InteractionPrompt;
+        }
+        else
+        {
+            if (interactionPromptContainer.activeSelf)
                 interactionPromptContainer.SetActive(false);
-            }
         }
     }
-}
\ No newline at end of file
+
+    private void TryFindPlayer()
+    {
+        if (PlayerStateMachine.Local != null)
+        {
+            playerDebugProvider = PlayerStateMachine.Local.GetComponent<PlayerDebugProvider>();
+        }
+
+        if (playerDebugProvider == null)
+        {
+            playerDebugProvider = Object.FindFirstObjectByType<PlayerDebugProvider>();
+        }
+        
+    }
+}
+}