diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 7ef17752c..ce9a73dec 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -489,7 +489,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 921541686} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2944,7 +2944,7 @@ RectTransform: m_Children: - {fileID: 810916347} m_Father: {fileID: 921541686} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2994,7 +2994,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 107377389} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1423699437} + m_TargetAssemblyTypeName: HeavenStudio.Editor.Editor, Assembly-CSharp + m_MethodName: ShowQuitPopUp + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &107377389 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21231,8 +21243,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 0 - m_Size: 0.9999719 + m_Value: 1 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -21578,6 +21590,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1520666589} - {fileID: 1023579054} - {fileID: 13368644} - {fileID: 2013645875} @@ -23389,7 +23402,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 921541686} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -26002,7 +26015,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 199.0612} + m_AnchoredPosition: {x: 0, y: 199.0604} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 @@ -31033,6 +31046,9 @@ MonoBehaviour: SortFavoritesBTN: {fileID: 1436105795} SortChronologicBTN: {fileID: 345154594} SearchBar: {fileID: 320483642} + _confirmQuitMain: {fileID: 0} + _quitYes: {fileID: 0} + _quitNo: {fileID: 0} EditorThemeBTN: {fileID: 0} EditorSettingsBTN: {fileID: 619618400} DebugHolder: {fileID: 1331943928} @@ -33138,6 +33154,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1516873909} m_CullTransparentMesh: 1 +--- !u!1 &1520666588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1520666589} + - component: {fileID: 1520666591} + - component: {fileID: 1520666590} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1520666589 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520666588} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 921541686} + m_RootOrder: 0 + 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: 700, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1520666590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520666588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.6156863} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1520666591 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520666588} + m_CullTransparentMesh: 1 --- !u!1 &1522319055 GameObject: m_ObjectHideFlags: 0 @@ -35468,7 +35560,7 @@ RectTransform: m_Children: - {fileID: 1993461017} m_Father: {fileID: 921541686} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -35518,7 +35610,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1643615743} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1423699437} + m_TargetAssemblyTypeName: HeavenStudio.Editor.Editor, Assembly-CSharp + m_MethodName: QuitGame + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1643615743 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42074,7 +42178,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 921541686} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} diff --git a/Assets/Scripts/GlobalGameManager.cs b/Assets/Scripts/GlobalGameManager.cs index 544108cf8..faa3d64f9 100644 --- a/Assets/Scripts/GlobalGameManager.cs +++ b/Assets/Scripts/GlobalGameManager.cs @@ -388,17 +388,11 @@ namespace HeavenStudio Jukebox.RiqFileHandler.ClearCache(); } - public static bool ShowQuitPopUp = true; - private static bool WantsToQuit() { - if (ShowQuitPopUp) - { - if (SceneManager.GetActiveScene().name != "Editor") return true; - - - } - return true; + if (SceneManager.GetActiveScene().name != "Editor") return true; + Editor.Editor.instance.ShowQuitPopUp(true); + return false; } } } diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index c98bb8929..7127d31ef 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -55,6 +55,11 @@ namespace HeavenStudio.Editor [SerializeField] private Button SortChronologicBTN; [SerializeField] private TMP_InputField SearchBar; + [Header("Confirm Quit")] + [SerializeField] private GameObject _confirmQuitMain; + [SerializeField] private Button _quitYes; + [SerializeField] private Button _quitNo; + [SerializeField] private Button EditorThemeBTN; [SerializeField] private Button EditorSettingsBTN; @@ -144,6 +149,16 @@ namespace HeavenStudio.Editor (minigame.fxOnly ? ggs.fxActive : ggs.mgsActive).Add(GameIcon_.GetComponent()); } + public void ShowQuitPopUp(bool show) + { + _confirmQuitMain.SetActive(show); + } + + public void QuitGame() + { + Application.Quit(); + } + public void LateUpdate() { if (lastScreenSize != new Vector2(UnityEngine.Screen.width, UnityEngine.Screen.height))