diff --git a/Assets/Scripts/HotUpdate/Main/GameStart.cs b/Assets/Scripts/HotUpdate/Main/GameStart.cs index 198b020..ccbf8fe 100644 --- a/Assets/Scripts/HotUpdate/Main/GameStart.cs +++ b/Assets/Scripts/HotUpdate/Main/GameStart.cs @@ -17,7 +17,7 @@ public class GameStart : MonoBehaviour Debug.Log("开始游戏启动流程..."); yield return StartCoroutine(InitializeGameSystems()); - + yield return StartCoroutine(PreloadLoadingWindow()); yield return StartCoroutine(LoadMainScene()); Debug.Log("游戏启动流程完成"); @@ -30,6 +30,19 @@ public class GameStart : MonoBehaviour Debug.Log("游戏系统初始化完成"); yield return null; } + IEnumerator PreloadLoadingWindow() + { + bool preloadComplete = false; + + UIManager.Inst.ShowWindow("LoadingWindow", window => + { + window.Hide(); + preloadComplete = true; + Debug.Log("PreloadLoadingWindow"); + }); + + yield return new WaitUntil(() => preloadComplete); + } IEnumerator LoadMainScene() { SceneHandle sceneHandle = YooAssets.LoadSceneAsync("MirrorRoomOffline"); diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index f3efa5d..e031c80 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -15,9 +15,9 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43 - width: 2560 - height: 1349 + y: 43.2 + width: 2048 + height: 1188.8 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 2} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2560 - height: 1349 + width: 2048 + height: 1188.8 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2560 + width: 2048 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1329 - width: 2560 + y: 1168.8 + width: 2048 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 2560 - height: 1299 + width: 2048 + height: 1138.8 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 42 + controlID: 88 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1877 - height: 1299 + width: 1555.2 + height: 1138.8 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 43 + controlID: 125 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -166,8 +166,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1877 - height: 700 + width: 1555.2 + height: 709.6 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 @@ -190,8 +190,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 407 - height: 700 + width: 361.6 + height: 709.6 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} @@ -209,18 +209,18 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: AssetBundleBuilderWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 407 + x: 361.6 y: 0 - width: 1470 - height: 700 - m_MinSize: {x: 202, y: 221} + width: 1193.6 + height: 709.6 + m_MinSize: {x: 802, y: 621} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 16} - {fileID: 17} @@ -228,8 +228,8 @@ MonoBehaviour: - {fileID: 13} - {fileID: 12} - {fileID: 19} - m_Selected: 0 - m_LastSelected: 5 + m_Selected: 4 + m_LastSelected: 3 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -246,9 +246,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 700 - width: 1877 - height: 599 + y: 709.6 + width: 1555.2 + height: 429.20007 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 20} @@ -275,10 +275,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1877 + x: 1555.2 y: 0 - width: 683 - height: 1299 + width: 492.80005 + height: 1138.8 m_MinSize: {x: 276, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 24} @@ -307,10 +307,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 407 - y: 73 - width: 1468 - height: 562 + x: 361.6 + y: 73.6 + width: 1191.6 + height: 688.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -341,10 +341,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 407 - y: 73 - width: 1468 - height: 562 + x: 361.6 + y: 73.6 + width: 1191.6 + height: 688.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -371,15 +371,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 773 - width: 1876 - height: 578 + y: 783.2 + width: 1554.2 + height: 408.20007 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -406,15 +406,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 406 - height: 679 + y: 73.6 + width: 360.6 + height: 688.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -428,8 +428,8 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 + m_SelectedIDs: c07e0000 + m_LastClickedID: 32448 m_ExpandedIDs: 08fbffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -470,15 +470,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 407 - y: 73 - width: 1468 - height: 679 + x: 361.6 + y: 73.6 + width: 1191.6 + height: 688.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -900,7 +900,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.049595416, y: 0.36881834, z: -0.019750841, w: 0.9279928} speed: 2 - m_Value: {x: -0.04959542, y: -0.36881837, z: 0.019750841, w: -0.9279928} + m_Value: {x: 0.04959424, y: 0.36880958, z: -0.019750372, w: 0.9279708} m_Size: m_Target: 6.4852448 speed: 2 @@ -945,15 +945,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 407 - y: 73 - width: 1468 - height: 562 + x: 361.6 + y: 73.6 + width: 1191.6 + height: 688.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -985,10 +985,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1280 - m_HBaseRangeMax: 1280 - m_VBaseRangeMin: -720 - m_VBaseRangeMax: 720 + m_HBaseRangeMin: -1024 + m_HBaseRangeMax: 1024 + m_VBaseRangeMin: -576 + m_VBaseRangeMax: 576 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -997,7 +997,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1006,23 +1006,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1468 - height: 541 - m_Scale: {x: 0.37569445, y: 0.37569445} - m_Translation: {x: 734, y: 270.5} + width: 1191.6 + height: 667.6 + m_Scale: {x: 0.57951385, y: 0.57951385} + m_Translation: {x: 595.8, y: 333.8} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1953.7153 - y: -720 - width: 3907.4307 - height: 1440 + x: -1028.1031 + y: -576 + width: 2056.2063 + height: 1152 m_MinimalGUI: 1 - m_defaultScale: 0.37569445 - m_LastWindowPixelSize: {x: 1468, y: 562} + m_defaultScale: 0.57951385 + m_LastWindowPixelSize: {x: 1489.5, y: 860.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000000000000 @@ -1045,7 +1045,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Package Manager - m_Image: {fileID: -2824328813065806953, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 5076950121296946556, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1080,7 +1080,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Asset Store - m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -7444545952099596278, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1115,15 +1115,15 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 773 - width: 1876 - height: 578 + y: 783.2 + width: 1554.2 + height: 408.20007 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1155,14 +1155,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scripts/HotUpdate/Main m_LastFoldersGridSize: 16 - m_LastProjectPath: C:\UnityProject\BlueArchiveMiniGame + m_LastProjectPath: D:\UnityProject\BlueArchiveMiniGame m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 79} - m_SelectedIDs: 3a860000 - m_LastClickedID: 34362 - m_ExpandedIDs: 0000000078830000c2850000c88500002886000000ca9a3bffffff7f + m_SelectedIDs: d6830000 + m_LastClickedID: 33750 + m_ExpandedIDs: 000000007683000094830000d4830000d6830000d883000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1190,7 +1190,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000078830000 + m_ExpandedIDs: 0000000076830000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1217,7 +1217,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000068f1200828d00000c8d0000121d050042e40400b2930000c4fa0400ae0e0500f2ef0400682a4200802a42008a17420050a10000ee090500bc130500eccd000032030000bef80000c2a300000000000040f500007a860000647c0600f2b606001cb7060010170100b6290100e8ae00000aae0400447f0000d283000082ae0000d4beffff66c70000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1262,7 +1262,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1386,7 +1386,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animation - m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1424,7 +1424,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Audio Mixer - m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -3283902137440876849, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1607,15 +1607,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1877 - y: 73 - width: 682 - height: 1278 + x: 1555.2001 + y: 73.6 + width: 491.80005 + height: 1117.8 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1655,7 +1655,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Lighting - m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: