diff --git a/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab b/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab index a82871b..8a83baa 100644 --- a/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab +++ b/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 4801502739230327379} - component: {fileID: 1839643559262572090} - component: {fileID: 1590262444720639052} - - component: {fileID: 5106154889864763414} + - component: {fileID: 2636909633397487000} m_Layer: 5 m_Name: UILoadUpdateWindow m_TagString: Untagged @@ -100,7 +100,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: hotButtons: [] ---- !u!114 &5106154889864763414 +--- !u!114 &2636909633397487000 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -115,6 +115,7 @@ MonoBehaviour: mImgBackGround: {fileID: 881789250053677664} mBtnTest: {fileID: 8242433937099588481} mTextTitl: {fileID: 7423448528652229462} + mTextGameTitle: {fileID: 4229038960500937347} mImgTestList: - {fileID: 4753672883913794088} - {fileID: 19703495912376014} @@ -266,7 +267,7 @@ GameObject: - component: {fileID: 4316998201337448832} - component: {fileID: 4229038960500937347} m_Layer: 5 - m_Name: UXTextMeshPro + m_Name: Text@GameTitle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -362,17 +363,15 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 - m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1207,17 +1206,15 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 - m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs index 72f6bf0..f6e927c 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs @@ -23,6 +23,10 @@ namespace Game.UI private TextMeshProUGUI mTextTitl; public TextMeshProUGUI TextTitl => mTextTitl; + [SerializeField] + private UXTextMeshPro mTextGameTitle; + public UXTextMeshPro TextGameTitle => mTextGameTitle; + [SerializeField] private UXImage[] mImgTestList = new UXImage[5]; public UXImage[] ImgTestList => mImgTestList; diff --git a/Client/Assets/Test/GameBase.dll.bytes b/Client/Assets/Test/GameBase.dll.bytes index 6c91d8a..bf79136 100644 Binary files a/Client/Assets/Test/GameBase.dll.bytes and b/Client/Assets/Test/GameBase.dll.bytes differ diff --git a/Client/Assets/Test/GameBase.pdb.bytes b/Client/Assets/Test/GameBase.pdb.bytes index 26835d2..fcb2eb8 100644 Binary files a/Client/Assets/Test/GameBase.pdb.bytes and b/Client/Assets/Test/GameBase.pdb.bytes differ diff --git a/Client/Assets/Test/GameLib.dll.bytes b/Client/Assets/Test/GameLib.dll.bytes index 500082f..4f96000 100644 Binary files a/Client/Assets/Test/GameLib.dll.bytes and b/Client/Assets/Test/GameLib.dll.bytes differ diff --git a/Client/Assets/Test/GameLib.pdb.bytes b/Client/Assets/Test/GameLib.pdb.bytes index b705a07..a4402a2 100644 Binary files a/Client/Assets/Test/GameLib.pdb.bytes and b/Client/Assets/Test/GameLib.pdb.bytes differ diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes index 7df82d3..49be030 100644 Binary files a/Client/Assets/Test/GameLogic.dll.bytes and b/Client/Assets/Test/GameLogic.dll.bytes differ diff --git a/Client/Assets/Test/GameLogic.pdb.bytes b/Client/Assets/Test/GameLogic.pdb.bytes index cc72556..b20ed9d 100644 Binary files a/Client/Assets/Test/GameLogic.pdb.bytes and b/Client/Assets/Test/GameLogic.pdb.bytes differ diff --git a/Client/Assets/Test/GameProto.dll.bytes b/Client/Assets/Test/GameProto.dll.bytes index 5a89a0e..647e06e 100644 Binary files a/Client/Assets/Test/GameProto.dll.bytes and b/Client/Assets/Test/GameProto.dll.bytes differ diff --git a/Client/Assets/Test/GameProto.pdb.bytes b/Client/Assets/Test/GameProto.pdb.bytes index b94f757..b087f88 100644 Binary files a/Client/Assets/Test/GameProto.pdb.bytes and b/Client/Assets/Test/GameProto.pdb.bytes differ diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index 4de5156..110c345 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit 4de5156174588992d1bfd4222256ed54f02e8394 +Subproject commit 110c3451ea718e721ad296a532b0fa4e9feb2664 diff --git a/Client/ProjectSettings/ProjectSettings.asset b/Client/ProjectSettings/ProjectSettings.asset index e640b01..aa3e8b7 100644 --- a/Client/ProjectSettings/ProjectSettings.asset +++ b/Client/ProjectSettings/ProjectSettings.asset @@ -822,7 +822,7 @@ PlayerSettings: webGLPowerPreference: 2 scriptingDefineSymbols: Android: ENABLE_HYBRIDCLR;ENABLE_LOG - Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ENABLE_HYBRIDCLR;FANTASY_UNITY;ENABLE_LOG;Event_StrickCheck;UNITY_WEBGL;WEIXINMINIGAME + Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ENABLE_HYBRIDCLR;FANTASY_UNITY;ENABLE_LOG;Event_StrictCheck WebGL: ENABLE_HYBRIDCLR;ENABLE_LOG;UNITY_WEBGL;WEIXINMINIGAME;FANTASY_UNITY;Event_StrickCheck;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1 Windows Store Apps: ENABLE_HYBRIDCLR;ENABLE_LOG iPhone: ENABLE_HYBRIDCLR;ENABLE_LOG diff --git a/Client/ProjectSettings/UIGenerateConfiguration.asset b/Client/ProjectSettings/UIGenerateConfiguration.asset index 2e5d0d7..04cbca3 100644 --- a/Client/ProjectSettings/UIGenerateConfiguration.asset +++ b/Client/ProjectSettings/UIGenerateConfiguration.asset @@ -71,4 +71,4 @@ MonoBehaviour: GenerateHolderCodePath: Assets/Scripts/Hotfix/GameLogic/UI//Generate UIPrefabRootPath: Assets/Bundles/UI LoadType: 1 - UIScriptGeneratorRuleHelper: AlicizaX.UI.Editor.DefaultIuiGeneratorRuleHelper + UIScriptGeneratorRuleHelper: AlicizaX.UI.Editor.DefaultUIGeneratorRuleHelper diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt index 158231f..9b47776 100644 --- a/Client/UserSettings/Layouts/default-2022.dwlt +++ b/Client/UserSettings/Layouts/default-2022.dwlt @@ -20,11 +20,63 @@ MonoBehaviour: height: 997 m_ShowMode: 4 m_Title: Game - m_RootView: {fileID: 2} + m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 349 + width: 448 + height: 598 + m_MinSize: {x: 51, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 8} + - {fileID: 2} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 448 + height: 947 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 5119 + draggingID: 0 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,9 +89,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - {fileID: 5} - - {fileID: 4} + - {fileID: 7} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 @@ -52,7 +104,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -74,7 +126,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -95,7 +147,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -108,10 +160,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 7} - - {fileID: 10} - - {fileID: 11} + - {fileID: 3} + - {fileID: 9} + - {fileID: 12} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 @@ -121,9 +173,9 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 129 + controlID: 123 draggingID: 0 ---- !u!114 &6 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -140,17 +192,17 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 241 - height: 947 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 14} + width: 448 + height: 349 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 13} - - {fileID: 14} + - {fileID: 15} + - {fileID: 16} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &7 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -163,20 +215,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - - {fileID: 9} + - {fileID: 10} + - {fileID: 11} m_Position: serializedVersion: 2 - x: 241 + x: 448 y: 0 - width: 673 + width: 297 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 41 + controlID: 48 draggingID: 0 ---- !u!114 &8 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -193,16 +245,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 673 - height: 330 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 15} + width: 297 + height: 454 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 15} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -212,24 +264,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 330 - width: 673 - height: 617 - m_MinSize: {x: 52, y: 71} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + y: 454 + width: 297 + height: 493 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 12} - - {fileID: 16} + - {fileID: 18} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &10 + m_LastSelected: 0 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -244,18 +295,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 914 + x: 745 y: 0 - width: 390 + width: 461 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 17} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -270,18 +321,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1304 + x: 1206 y: 0 - width: 616 + width: 714 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 18} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 18} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -301,10 +352,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 241 - y: 403 - width: 671 - height: 596 + x: 0 + y: 422 + width: 447 + height: 577 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -357,10 +408,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 671 - height: 575 - m_Scale: {x: 0.34947917, y: 0.34947917} - m_Translation: {x: 335.5, y: 287.5} + width: 447 + height: 556 + m_Scale: {x: 0.2328125, y: 0.2328125} + m_Translation: {x: 223.5, y: 278} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -368,18 +419,18 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -960 - y: -822.6528 + y: -1194.094 width: 1920 - height: 1645.3055 + height: 2388.188 m_MinimalGUI: 1 - m_defaultScale: 0.34947917 - m_LastWindowPixelSize: {x: 671, y: 596} + m_defaultScale: 0.2328125 + m_LastWindowPixelSize: {x: 447, y: 577} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -449,7 +500,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -471,8 +522,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 240 - height: 926 + width: 447 + height: 328 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -487,8 +538,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -152, y: -26} - snapOffsetDelta: {x: -22, y: 0} + snapOffset: {x: -174, y: -26} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings index: 0 @@ -527,7 +578,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -579,7 +630,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -605,7 +656,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Cloth Constraints index: 1 @@ -618,7 +669,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Cloth Collisions index: 2 @@ -670,7 +721,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Occlusion Culling index: 3 @@ -683,7 +734,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Physics Debugger index: 4 @@ -696,7 +747,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Scene Visibility index: 5 @@ -709,7 +760,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Particles index: 6 @@ -816,7 +867,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay - index: 10 + index: 9 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -979,17 +1030,17 @@ MonoBehaviour: m_OverlaysVisible: 1 m_WindowGUID: f6827acf47ff6e841a7f3bef03f3908f m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 + m_OverrideSceneCullingMask: 0 m_SceneIsLit: 0 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0, y: 0, z: 0} + m_Target: {x: 995.80457, y: 484.69873, z: -7.1010976} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: 995.80457, y: 484.69873, z: -7.1010976} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1017,17 +1068,17 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -1035,17 +1086,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 10 + m_Target: 791.50287 speed: 2 - m_Value: 10 + m_Value: 791.50287 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 2 m_SpeedNormalized: 1 @@ -1066,7 +1117,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1086,10 +1137,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 241 + x: 448 y: 73 - width: 671 - height: 309 + width: 295 + height: 433 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1103,25 +1154,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 9e63ffffa663ffff1e9fffff269fffff64a1ffffbca3ffff06c7ffff14c8ffffb6cbfffffefafffff4ffffff1c9b000048a60000 + m_SelectedIDs: 0aaf0000 + m_LastClickedID: 44810 + m_ExpandedIDs: 2440ffff3440ffff0aaf0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: GameObject - m_OriginalName: GameObject + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -5484 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 4 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 10} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1129,7 +1180,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 85728a346145f5041b41bc3ce2f945c6 ---- !u!114 &16 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1149,10 +1200,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 241 - y: 403 - width: 671 - height: 596 + x: 448 + y: 527 + width: 295 + height: 472 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1163,7 +1214,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &17 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1183,9 +1234,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 914 + x: 745 y: 73 - width: 388 + width: 459 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1207,7 +1258,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets/Bundles/UI m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1223,7 +1275,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 000000002c270000cc3300005c7f00005e7f0000607f0000627f0000647f0000667f0000687f00006a7f00006c7f00006e7f0000707f0000727f0000747f0000767f0000787f00007a7f00007c7f00007e7f0000807f0000827f0000847f0000867f0000887f00008a7f00008c7f00008e7f0000907f0000927f0000947f0000967f0000987f00009a7f00009c7f00009e7f0000a07f0000a27f0000a47f0000a67f0000a87f0000aa7f0000ac7f0000ae7f0000b07f0000b27f0000b47f0000b67f0000b87f0000ba7f0000bc7f0000be7f0000c07f0000c27f0000c47f0000c67f0000c87f0000ca7f0000cc7f0000ce7f0000d07f0000d27f0000d47f0000d67f0000d87f0000da7f0000dc7f0000de7f0000e07f0000e27f0000e47f0000e67f0000e87f0000ea7f0000ec7f0000ee7f0000f07f0000f27f0000f47f0000f67f0000f87f0000fa7f0000fc7f0000fe7f000000800000028000000480000006800000088000000a8000000c8000000e80000010800000128000001480000016800000188000001a8000001c8000001e80000020800000228000002480000026800000288000002a8000002c8000002e80000030800000328000003480000036800000388000003a8000003c8000003e80000040800000428000004480000046800000488000004a8000004c8000004e80000050800000528000005480000056800000588000005a8000005c8000005e80000060800000628000006480000066800000688000006a8000006c8000006e80000070800000728000007480000076800000788000007a8000007c8000007e80000080800000828000008480000086800000888000008a8000008c8000008e80000090800000928000009480000096800000988000009a8000009c8000009e800000a0800000a2800000a4800000a6800000a8800000aa800000ac800000ae800000b0800000b2800000b4800000b6800000b8800000ba800000bc800000be800000c0800000c2800000c4800000c6800000c8800000ca800000cc800000ce800000d0800000d2800000d4800000 + m_ExpandedIDs: 000000002c270000cc330000aa7f0000ac7f0000ae7f0000b07f0000b27f0000b47f0000b67f0000b87f0000ba7f0000bc7f0000be7f0000c07f0000c27f0000c47f0000c67f0000c87f0000ca7f0000cc7f0000ce7f0000d07f0000d27f0000d47f0000d67f0000d87f0000da7f0000dc7f0000de7f0000e07f0000e27f0000e47f0000e67f0000e87f0000ea7f0000ec7f0000ee7f0000f07f0000f27f0000f47f0000f67f0000f87f0000fa7f0000fc7f0000fe7f000000800000028000000480000006800000088000000a8000000c8000000e80000010800000128000001480000016800000188000001a8000001c8000001e80000020800000228000002480000026800000288000002a8000002c8000002e80000030800000328000003480000036800000388000003a8000003c8000003e80000040800000428000004480000046800000488000004a8000004c8000004e80000050800000528000005480000056800000588000005a8000005c8000005e80000060800000628000006480000066800000688000006a8000006c8000006e80000070800000728000007480000076800000788000007a8000007c8000007e80000080800000828000008480000086800000888000008a8000008c8000008e80000090800000928000009480000096800000988000009a8000009c8000009e800000a0800000a2800000a4800000a6800000a8800000aa800000ac800000ae800000b0800000b2800000b4800000b6800000b8800000ba800000bc800000be800000c0800000c2800000c4800000c6800000c8800000ca800000cc800000ce800000d0800000d2800000d4800000d6800000d8800000da800000dc800000de800000e0800000e2800000e4800000e6800000e8800000ea800000ec800000ee800000f0800000f2800000f4800000f6800000f8800000fa800000fc800000fe80000000810000028100000481000006810000088100000a8100000c8100000e81000010810000128100001481000016810000188100001a8100001c8100001e810000208100002281000024810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1248,26 +1300,26 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 340} + scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000002c270000cc3300005c7f00005e7f0000607f0000627f0000647f0000667f0000687f00006a7f00006c7f00006e7f0000707f0000727f0000747f0000767f0000787f00007a7f00007c7f00007e7f0000807f0000827f0000847f0000867f0000887f00008a7f00008c7f00008e7f0000907f0000927f0000947f0000967f0000987f00009a7f00009c7f00009e7f0000a07f0000a27f0000a47f0000a67f0000a87f0000aa7f0000ac7f0000ae7f0000b07f0000b27f0000b47f0000b67f0000b87f0000ba7f0000bc7f0000be7f0000c07f0000c27f0000c47f0000c67f0000c87f0000ca7f0000cc7f0000ce7f0000d07f0000d27f0000d47f0000d67f0000d87f0000da7f0000dc7f0000de7f0000e07f0000e27f0000e47f0000e67f0000e87f0000ea7f0000ec7f0000ee7f0000f07f0000f27f0000f47f0000f67f0000f87f0000fa7f0000fc7f0000fe7f000000800000028000000480000006800000088000000a8000000c8000000e80000010800000128000001480000016800000188000001a8000001c8000001e80000020800000228000002480000026800000288000002a8000002c8000002e80000030800000328000003480000036800000388000003a8000003c8000003e80000040800000428000004480000046800000488000004a8000004c8000004e80000050800000528000005480000056800000588000005a8000005c8000005e80000060800000628000006480000066800000688000006a8000006c8000006e80000070800000728000007480000076800000788000007a8000007c8000007e80000080800000828000008480000086800000888000008a8000008c8000008e80000090800000928000009480000096800000988000009a8000009c8000009e800000a0800000a2800000a6800000a8800000aa800000ac800000ae800000b2800000b4800000b6800000b8800000ba800000bc800000be800000c0800000c2800000c4800000c6800000ca800000cc800000d0800000d48000004a810000588100005e8100004482000028830000b4830000ffffff7f + m_ExpandedIDs: ffffffff000000002c270000cc330000aa7f0000ae7f0000b07f0000b27f0000b47f0000b67f0000b87f0000ba7f0000bc7f0000be7f0000c07f0000c27f0000c47f0000c67f0000c87f0000ca7f0000cc7f0000ce7f0000d07f0000d27f0000d47f0000d67f0000d87f0000da7f0000dc7f0000de7f0000e07f0000e27f0000e47f0000e67f0000e87f0000ea7f0000ec7f0000ee7f0000f07f0000f27f0000f47f0000f67f0000f87f0000fa7f0000fc7f0000fe7f000000800000028000000480000006800000088000000a8000000c8000000e80000010800000128000001480000016800000188000001a8000001c8000001e8000002280000026800000288000002a8000002c8000002e80000030800000328000003480000036800000388000003a8000003c8000003e80000040800000428000004480000046800000488000004a8000004c8000004e80000050800000528000005480000056800000588000005a8000005c8000005e80000060800000628000006480000066800000688000006a8000006c8000006e80000070800000728000007480000076800000788000007a8000007c8000007e80000080800000828000008480000086800000888000008a8000008c8000008e80000090800000928000009480000096800000988000009a8000009c8000009e800000a0800000a2800000a4800000a6800000a8800000aa800000ac800000ae800000b0800000b2800000b4800000b6800000b8800000ba800000bc800000be800000c0800000c2800000c4800000c6800000c8800000ca800000cc800000ce800000d0800000d2800000d4800000d6800000d8800000da800000dc800000de800000e0800000e2800000e4800000e6800000e8800000ea800000ec800000f0800000f2800000f4800000f6800000fc800000fe80000000810000028100000481000006810000088100000a8100000c8100000e810000108100001281000014810000188100001a81000022810000a4810000a8810000e88e0000a4920000a6920000b8920000e0920000f4920000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: UILoadUpdateWindow + m_OriginalName: UILoadUpdateWindow m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 33176 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 12} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1295,7 +1347,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 13} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1307,7 +1359,7 @@ MonoBehaviour: m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115 ---- !u!114 &18 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1327,9 +1379,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1304 + x: 1206 y: 73 - width: 615 + width: 713 height: 926 m_SerializedDataModeController: m_DataMode: 0