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