From 3a74806d8c1e3fdefcea301e1016d3919936e4e5 Mon Sep 17 00:00:00 2001
From: Eicy <im@crash.work>
Date: Mon, 14 Oct 2024 15:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E7=89=A9=E5=93=81=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=9A=84=E6=89=93=E5=BC=80=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E4=BB=A5=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=20=E5=85=B3=E9=97=AD=E5=90=8E=E5=9B=A0=E4=B8=BA=E6=8C=89?=
 =?UTF-8?q?=E4=B8=8BE=E9=87=8D=E6=96=B0=E6=89=93=E5=BC=80=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E5=9C=A8=E5=85=B3=E9=97=AD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8B=E6=97=A0=E6=B3=95=E5=86=8D=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Eicy <im@crash.work>
---
 Assets/Scenes/GamePlay.unity                              | 2 +-
 .../{SampleScene_Profiles.meta => GamePlay_Profiles.meta} | 0
 .../Post-Prosscing Profile.asset                          | 0
 .../Post-Prosscing Profile.asset.meta                     | 0
 Assets/Scripts/Dialog/ItemDialog.cs                       | 8 +++-----
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename Assets/Scenes/{SampleScene_Profiles.meta => GamePlay_Profiles.meta} (100%)
 rename Assets/Scenes/{SampleScene_Profiles => GamePlay_Profiles}/Post-Prosscing Profile.asset (100%)
 rename Assets/Scenes/{SampleScene_Profiles => GamePlay_Profiles}/Post-Prosscing Profile.asset.meta (100%)

diff --git a/Assets/Scenes/GamePlay.unity b/Assets/Scenes/GamePlay.unity
index 24c5975..c7c627d 100644
--- a/Assets/Scenes/GamePlay.unity
+++ b/Assets/Scenes/GamePlay.unity
@@ -492,7 +492,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &143509930
 RectTransform:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/SampleScene_Profiles.meta b/Assets/Scenes/GamePlay_Profiles.meta
similarity index 100%
rename from Assets/Scenes/SampleScene_Profiles.meta
rename to Assets/Scenes/GamePlay_Profiles.meta
diff --git a/Assets/Scenes/SampleScene_Profiles/Post-Prosscing Profile.asset b/Assets/Scenes/GamePlay_Profiles/Post-Prosscing Profile.asset
similarity index 100%
rename from Assets/Scenes/SampleScene_Profiles/Post-Prosscing Profile.asset
rename to Assets/Scenes/GamePlay_Profiles/Post-Prosscing Profile.asset
diff --git a/Assets/Scenes/SampleScene_Profiles/Post-Prosscing Profile.asset.meta b/Assets/Scenes/GamePlay_Profiles/Post-Prosscing Profile.asset.meta
similarity index 100%
rename from Assets/Scenes/SampleScene_Profiles/Post-Prosscing Profile.asset.meta
rename to Assets/Scenes/GamePlay_Profiles/Post-Prosscing Profile.asset.meta
diff --git a/Assets/Scripts/Dialog/ItemDialog.cs b/Assets/Scripts/Dialog/ItemDialog.cs
index ddbd8ff..b549a3f 100644
--- a/Assets/Scripts/Dialog/ItemDialog.cs
+++ b/Assets/Scripts/Dialog/ItemDialog.cs
@@ -1,6 +1,5 @@
 using Event;
 using Event.EventArgs;
-using Keyboard;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
@@ -37,12 +36,11 @@ namespace Dialog
         }
         
         //todo 
-        /*private void Update()
+        private void Update()
         {
-            if ((!panel.activeSelf || !Input.GetKeyDown(KeyCode.Escape)) &&
-                !Input.GetKeyDown(KeySettingManager.Instance.GetKey("InterAct"))) return;
+            if ((!panel.activeSelf || !Input.GetKeyDown(KeyCode.Escape)) && Time.timeScale == 0 ) return;
             Time.timeScale = 1;
             panel.SetActive(false);
-        }*/
+        }
     }
 }
\ No newline at end of file