diff --git a/Client/Assets/Scripts/Startup/Procedure/ProcedureGetAppVersionInfoState.cs b/Client/Assets/Scripts/Startup/Procedure/ProcedureGetAppVersionInfoState.cs index 078d4b9..3bbc8d0 100644 --- a/Client/Assets/Scripts/Startup/Procedure/ProcedureGetAppVersionInfoState.cs +++ b/Client/Assets/Scripts/Startup/Procedure/ProcedureGetAppVersionInfoState.cs @@ -29,11 +29,9 @@ namespace Unity.Startup.Procedure if (StartupSetting.Version != AppVersion.GameVersion) { Log.Warning($"Version inconsistency : {AppVersion.GameVersion}->{StartupSetting.Version} "); -#if UNITY_EDITOR - UnityEditor.EditorApplication.isPlaying = false; -#else - Utility.Platform.OpenURL(StartupSetting.AppDownloadUrl); Utility.Platform.Quit(); +#if !UNITY_EDITOR + Utility.Platform.OpenURL(StartupSetting.AppDownloadUrl); #endif return; } diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index e3d136a..eed63f4 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit e3d136a6112e15bb9cf87c9198af926ad24c2f0f +Subproject commit eed63f46da127f037251e852ac3bd0531dc219fd diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt index dc14d11..4b83955 100644 --- a/Client/UserSettings/Layouts/default-2022.dwlt +++ b/Client/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Project m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -41,7 +41,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 267 - width: 743 + width: 482 height: 680 m_MinSize: {x: 51, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -70,7 +70,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 743 + width: 482 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} @@ -174,7 +174,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 159 + controlID: 24 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -193,7 +193,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 743 + width: 482 height: 267 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -219,9 +219,9 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 743 + x: 482 y: 0 - width: 172 + width: 367 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} @@ -245,7 +245,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 172 + width: 367 height: 415 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -271,7 +271,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 415 - width: 172 + width: 367 height: 532 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -295,9 +295,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 915 + x: 849 y: 0 - width: 596 + width: 450 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -321,12 +321,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1511 + x: 1299 y: 0 - width: 409 + width: 621 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -354,7 +354,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 340 - width: 742 + width: 481 height: 659 m_SerializedDataModeController: m_DataMode: 0 @@ -408,10 +408,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 742 + width: 481 height: 638 - m_Scale: {x: 0.38645834, y: 0.38645834} - m_Translation: {x: 371, y: 319} + m_Scale: {x: 0.25052083, y: 0.25052083} + m_Translation: {x: 240.5, y: 319} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -419,12 +419,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -960 - y: -825.44476 + y: -1273.3473 width: 1920 - height: 1650.8895 + height: 2546.6946 m_MinimalGUI: 1 - m_defaultScale: 0.38645834 - m_LastWindowPixelSize: {x: 742, y: 659} + m_defaultScale: 0.25052083 + m_LastWindowPixelSize: {x: 481, y: 659} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -522,7 +522,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 742 + width: 481 height: 246 m_SerializedDataModeController: m_DataMode: 0 @@ -1163,9 +1163,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 743 + x: 482 y: 73 - width: 170 + width: 365 height: 394 m_SerializedDataModeController: m_DataMode: 0 @@ -1180,9 +1180,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: b0690000 - m_LastClickedID: 27056 - m_ExpandedIDs: 28fbffff + m_SelectedIDs: 606c0000 + m_LastClickedID: 0 + m_ExpandedIDs: 1cfbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1226,9 +1226,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 743 + x: 482 y: 488 - width: 170 + width: 365 height: 511 m_SerializedDataModeController: m_DataMode: 0 @@ -1260,9 +1260,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 915 + x: 849 y: 73 - width: 594 + width: 448 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1285,7 +1285,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 2 m_Folders: - - Assets/Bundles/UI + - Assets/Scripts/Startup/UI/Generate m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1301,7 +1301,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 000000007e020000886a00008a6a00008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b00002c6b00002e6b0000306b0000326b0000346b0000366b0000386b00003a6b00003c6b00003e6b0000406b0000426b0000446b0000466b0000486b00004a6b00004c6b00004e6b0000506b0000526b0000546b0000566b0000586b00005a6b00005c6b0000 + m_ExpandedIDs: 000000007e0200008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b00002c6b00002e6b0000306b0000326b0000346b0000366b0000386b00003a6b00003c6b00003e6b0000406b0000426b0000446b0000466b0000486b00004a6b00004c6b00004e6b0000506b0000526b0000546b0000566b0000586b00005a6b00005c6b00005e6b0000606b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1329,21 +1329,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000007e020000886a00008a6a00008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b00002c6b00002e6b0000306b0000326b0000346b0000366b0000386b00003a6b00003c6b00003e6b0000406b0000426b0000446b0000466b0000486b00004a6b00004c6b00004e6b0000506b0000526b0000546b0000566b0000586b00005a6b00005c6b0000 + m_ExpandedIDs: ffffffff000000007e0200008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000da6a0000dc6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b00002c6b00002e6b0000306b0000326b0000346b0000366b0000386b00003a6b00003c6b00003e6b0000406b0000426b0000446b0000466b0000486b00004a6b00004c6b00004e6b0000506b0000526b0000546b0000566b0000586b00005c6b00005e6b0000606b00007c6d0000826d0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: ui_UIGameLaunchWindow + m_OriginalName: ui_UIGameLaunchWindow m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 8286 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 12} m_SearchString: @@ -1405,9 +1405,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1511 + x: 1299 y: 73 - width: 408 + width: 620 height: 926 m_SerializedDataModeController: m_DataMode: 0