diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index a597e1f..e54d214 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit a597e1fd83493ea59dcf4e7d77ebba5c24049eec +Subproject commit e54d2144df7ca75705a1a75eab8b423de9a28859 diff --git a/Client/ProjectSettings/LocalizationConfiguration.asset b/Client/ProjectSettings/LocalizationConfiguration.asset index e461fc5..3b48765 100644 --- a/Client/ProjectSettings/LocalizationConfiguration.asset +++ b/Client/ProjectSettings/LocalizationConfiguration.asset @@ -13,6 +13,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: generateScriptCodeFirstConfig: ChineseSimplified + generateLanguageTypesNamespace: + generateLanguageTypesTemplate: "using System.Collections.Generic;\n\n{NAMESPACE_START}/// + \n/// AutoGenerate\n/// \npublic static class LanguageTypes\n{\n{LANGUAGE_CONSTANTS}\n\n + public static readonly IReadOnlyList Languages = new List\n + {\n{LANGUAGE_LIST}\n };\n\n public static string IndexToString(int index)\n + {\n if (index < 0 || index >= Languages.Count) return \"Unknown\";\n + return Languages[index];\n }\n\n public static int StringToIndex(string + s)\n {\n int index = -1;\n for (int i = 0; i < Languages.Count; + i++)\n {\n if (Languages[i] == s)\n {\n + index = i;\n break;\n }\n }\n\n return + index;\n }\n}\n{NAMESPACE_END}" LanguageTypes: - ChineseSimplified - English diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt index 4b83955..8444e16 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: Project + m_Title: Hierarchy m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -40,11 +40,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 267 - width: 482 - height: 680 - m_MinSize: {x: 51, y: 71} - m_MaxSize: {x: 4001, y: 4021} + y: 549 + width: 519 + height: 398 + m_MinSize: {x: 50, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -70,12 +70,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 482 + width: 519 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 25 + controlID: 17 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -174,7 +174,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 24 + controlID: 48 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -193,8 +193,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 482 - height: 267 + width: 519 + height: 549 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} @@ -219,14 +219,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 482 + x: 519 y: 0 - width: 367 + width: 373 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 70 + controlID: 49 draggingID: 0 --- !u!114 &10 MonoBehaviour: @@ -245,7 +245,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 367 + width: 373 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: 367 + width: 373 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: 849 + x: 892 y: 0 - width: 450 + width: 407 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -325,8 +325,8 @@ MonoBehaviour: y: 0 width: 621 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -353,9 +353,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 340 - width: 481 - height: 659 + y: 622 + width: 518 + height: 377 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -408,10 +408,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 481 - height: 638 - m_Scale: {x: 0.25052083, y: 0.25052083} - m_Translation: {x: 240.5, y: 319} + width: 518 + height: 356 + m_Scale: {x: 0.26979166, y: 0.26979166} + m_Translation: {x: 259, y: 178} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -419,12 +419,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -960 - y: -1273.3473 + y: -659.7684 width: 1920 - height: 2546.6946 + height: 1319.5367 m_MinimalGUI: 1 - m_defaultScale: 0.25052083 - m_LastWindowPixelSize: {x: 481, y: 659} + m_defaultScale: 0.26979166 + m_LastWindowPixelSize: {x: 518, y: 377} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -522,8 +522,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 481 - height: 246 + width: 518 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1163,9 +1163,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 482 - y: 73 - width: 365 + x: -31481 + y: -31970 + width: 371 height: 394 m_SerializedDataModeController: m_DataMode: 0 @@ -1180,9 +1180,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 606c0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 1cfbffff + m_ExpandedIDs: 9e34ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1226,9 +1226,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 482 + x: 519 y: 488 - width: 365 + width: 371 height: 511 m_SerializedDataModeController: m_DataMode: 0 @@ -1260,9 +1260,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 849 + x: 892 y: 73 - width: 448 + width: 405 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1285,7 +1285,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 2 m_Folders: - - Assets/Scripts/Startup/UI/Generate + - Assets/Bundles/UI 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: 000000007e0200008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b00002c6b00002e6b0000306b0000326b0000346b0000366b0000386b00003a6b00003c6b00003e6b0000406b0000426b0000446b0000466b0000486b00004a6b00004c6b00004e6b0000506b0000526b0000546b0000566b0000586b00005a6b00005c6b00005e6b0000606b0000 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1326,21 +1326,21 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} + scrollPos: {x: 0, y: 60} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000007e0200008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000da6a0000dc6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b00002c6b00002e6b0000306b0000326b0000346b0000366b0000386b00003a6b00003c6b00003e6b0000406b0000426b0000446b0000466b0000486b00004a6b00004c6b00004e6b0000506b0000526b0000546b0000566b0000586b00005c6b00005e6b0000606b00007c6d0000826d0000 + m_ExpandedIDs: ffffffff0a0600006e060000920600009a070000b2070000560900009a0e0000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: ui_UIGameLaunchWindow - m_OriginalName: ui_UIGameLaunchWindow + m_Name: UILoadUpdateWindow + m_OriginalName: UILoadUpdateWindow m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 8286 + m_UserData: 34468 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0