From 3e2a6f3a816d5178cbcfe883b88205ddbaa7c95f Mon Sep 17 00:00:00 2001 From: xiaohaiwudi <35631295+xiaohaiwudi@users.noreply.github.com> Date: Wed, 22 Apr 2026 00:31:07 +0800 Subject: [PATCH] 02 --- .../Layouts/CurrentMaximizeLayout.dwlt | 408 +++++++++++++- UserSettings/Layouts/default-2022.dwlt | 509 +++++++++--------- 2 files changed, 651 insertions(+), 266 deletions(-) diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 1423a97ed..3baa10586 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,11 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 +<<<<<<< Updated upstream controlID: 56 +======= + controlID: 180 +>>>>>>> Stashed changes draggingID: 0 --- !u!114 &2 MonoBehaviour: @@ -35,22 +39,29 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 13974, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Simulator - m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< Updated upstream x: 1323 y: 73 width: 751 height: 674 +======= + x: 768 + y: 73 + width: 1383 + height: 709 +>>>>>>> Stashed changes m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -62,19 +73,29 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 m_SerializedViewNames: - - UnityEditor.GameView + - UnityEditor.DeviceSimulation.SimulatorWindow m_SerializedViewValues: +<<<<<<< Updated upstream - D:\Unity\UnityProjects\Buyu_Script\Library\PlayModeViewStates\581cdfc6fe496c34d96bcd15dcbc02ec m_PlayModeViewName: Device Simulator m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 1} m_TargetSize: {x: 2340, y: 1080} +======= + - E:\UnityProject\5_24BuYu\Library\PlayModeViewStates\de2d86dcef8c8db4da23f8fa968d70c6 + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1624, y: 750} +>>>>>>> Stashed changes m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 +<<<<<<< Updated upstream m_SimulatorState: controlPanelVisible: 0 controlPanelWidth: 0 @@ -95,6 +116,61 @@ MonoBehaviour: screenIndex: 0 networkReachability: 1 systemLanguage: 10 +======= + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 0e000000000000000000000011000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -812 + m_HBaseRangeMax: 812 + m_VBaseRangeMin: -375 + m_VBaseRangeMax: 375 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1383 + height: 688 + m_Scale: {x: 0.851601, y: 0.851601} + m_Translation: {x: 691.5, y: 344} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -812 + y: -403.94504 + width: 1624 + height: 807.8901 + m_MinimalGUI: 1 + m_defaultScale: 0.851601 + m_LastWindowPixelSize: {x: 1383, y: 709} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000001000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} + m_showToolbar: 1 +>>>>>>> Stashed changes --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -114,12 +190,20 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 +<<<<<<< Updated upstream width: 2076 +======= + width: 2153 +>>>>>>> Stashed changes height: 1347 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 +<<<<<<< Updated upstream controlID: 57 +======= + controlID: 181 +>>>>>>> Stashed changes draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -141,12 +225,21 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 +<<<<<<< Updated upstream width: 2076 height: 695 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 controlID: 58 +======= + width: 2153 + height: 730 + m_MinSize: {x: 300, y: 50} + m_MaxSize: {x: 24288, y: 8096} + vertical: 0 + controlID: 182 +>>>>>>> Stashed changes draggingID: 0 --- !u!114 &5 MonoBehaviour: @@ -165,10 +258,17 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 +<<<<<<< Updated upstream width: 465 height: 695 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} +======= + width: 668 + height: 730 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} +>>>>>>> Stashed changes m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -197,8 +297,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 +<<<<<<< Updated upstream width: 464 height: 674 +======= + width: 667 + height: 709 +>>>>>>> Stashed changes m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -212,9 +317,15 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} +<<<<<<< Updated upstream m_SelectedIDs: 46efffff m_LastClickedID: -4282 m_ExpandedIDs: a4e5ffff7eecffff46efffff56f1ffff0cfbffff68c10000 +======= + m_SelectedIDs: 80e20000 + m_LastClickedID: 0 + m_ExpandedIDs: 7af2ffff +>>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -253,12 +364,21 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 +<<<<<<< Updated upstream x: 465 y: 0 width: 858 height: 695 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} +======= + x: 668 + y: 0 + width: 100 + height: 730 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} +>>>>>>> Stashed changes m_ActualView: {fileID: 9} m_Panes: - {fileID: 8} @@ -286,10 +406,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< Updated upstream x: 465 y: 73 width: 942 height: 590 +======= + x: 2958 + y: 73 + width: 716 + height: 372 +>>>>>>> Stashed changes m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -444,10 +571,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< Updated upstream x: 465 y: 73 width: 856 height: 674 +======= + x: 668 + y: 73 + width: 98 + height: 709 +>>>>>>> Stashed changes m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -476,7 +610,11 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -299, y: 25} +<<<<<<< Updated upstream snapOffsetDelta: {x: 0, y: 0} +======= + snapOffsetDelta: {x: 201, y: 0} +>>>>>>> Stashed changes snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 @@ -671,7 +809,11 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: -231, y: -197} +<<<<<<< Updated upstream snapOffsetDelta: {x: 0, y: 0} +======= + snapOffsetDelta: {x: 133, y: 0} +>>>>>>> Stashed changes snapCorner: 3 id: Scene View/Particles index: 9 @@ -784,11 +926,16 @@ MonoBehaviour: sizeOverriden: 0 m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 +<<<<<<< Updated upstream m_Gizmos: 0 +======= + m_Gizmos: 1 +>>>>>>> Stashed changes m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 0 +<<<<<<< Updated upstream m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 @@ -796,6 +943,15 @@ MonoBehaviour: m_Target: {x: -37.89288, y: -20.422186, z: 187.96222} speed: 2 m_Value: {x: -37.892887, y: -20.422186, z: 187.96222} +======= + m_isRotationLocked: 1 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 5.488319, y: 4.714727, z: 55.443623} + speed: 2 + m_Value: {x: 5.488319, y: 4.714727, z: 55.443623} +>>>>>>> Stashed changes m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -823,9 +979,9 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: 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} @@ -841,6 +997,7 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: +<<<<<<< Updated upstream m_Target: {x: -0.20664823, y: 0.32390124, z: -0.072652265, w: -0.9205168} speed: 2 m_Value: {x: -0.20673166, y: 0.32248062, z: -0.07233335, w: -0.92088884} @@ -848,6 +1005,15 @@ MonoBehaviour: m_Target: 38.83254 speed: 2 m_Value: 38.83254 +======= + m_Target: {x: 0.1285996, y: 0.2211512, z: -0.029432513, w: 0.9662797} + speed: 2 + m_Value: {x: 0.12859906, y: 0.22115028, z: -0.02943239, w: 0.96627563} + m_Size: + m_Target: 66.0695 + speed: 2 + m_Value: 66.0695 +>>>>>>> Stashed changes m_Ortho: m_Target: 0 speed: 2 @@ -865,7 +1031,11 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 +<<<<<<< Updated upstream m_LastSceneViewRotation: {x: 0.15078953, y: 0.1571077, z: -0.024197912, w: 0.97576267} +======= + m_LastSceneViewRotation: {x: 0.045295198, y: 0.0018074726, z: -0.00008029741, w: 0.99898016} +>>>>>>> Stashed changes m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -882,16 +1052,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SimulatorWindow + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 +<<<<<<< Updated upstream x: 1323 y: 0 width: 753 height: 695 m_MinSize: {x: 202, y: 221} +======= + x: 768 + y: 0 + width: 1385 + height: 730 + m_MinSize: {x: 102, y: 121} +>>>>>>> Stashed changes m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: @@ -917,6 +1095,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 +<<<<<<< Updated upstream y: 695 width: 2076 height: 652 @@ -924,6 +1103,15 @@ MonoBehaviour: m_MaxSize: {x: 24288, y: 8096} vertical: 0 controlID: 64 +======= + y: 730 + width: 2153 + height: 617 + m_MinSize: {x: 300, y: 50} + m_MaxSize: {x: 24288, y: 8096} + vertical: 0 + controlID: 206 +>>>>>>> Stashed changes draggingID: 0 --- !u!114 &12 MonoBehaviour: @@ -942,8 +1130,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 +<<<<<<< Updated upstream width: 341 height: 652 +======= + width: 587 + height: 617 +>>>>>>> Stashed changes m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -976,9 +1169,15 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 +<<<<<<< Updated upstream y: 768 width: 340 height: 631 +======= + y: 803 + width: 586 + height: 596 +>>>>>>> Stashed changes m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1009,10 +1208,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< Updated upstream x: 0 y: 627 width: 985 height: 772 +======= + x: 2560 + y: 586 + width: 654 + height: 413 +>>>>>>> Stashed changes m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1045,10 +1251,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< Updated upstream x: 0 y: 731 width: 394 height: 668 +======= + x: 2560 + y: 586 + width: 654 + height: 413 +>>>>>>> Stashed changes m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1069,7 +1282,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - "Assets/UIResources/Home/\u80CC\u5305" m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1085,7 +1299,11 @@ MonoBehaviour: scrollPos: {x: 0, y: 523} m_SelectedIDs: 30b90200 m_LastClickedID: 178480 +<<<<<<< Updated upstream m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100 +======= + m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100 +>>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1110,10 +1328,17 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: +<<<<<<< Updated upstream scrollPos: {x: 0, y: 0} m_SelectedIDs: 5ecb0000 m_LastClickedID: 0 m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100 +======= + scrollPos: {x: 0, y: 3508} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100 +>>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1138,8 +1363,13 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: +<<<<<<< Updated upstream m_SelectedInstanceIDs: 5ecb0000 m_LastClickedInstanceID: 52062 +======= + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 +>>>>>>> Stashed changes m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000467d0000c67e00009874000024c5fdff647400009274000016a500003aa500002ed3020028d3020078e003007e76000088760000247a0000e67e0000487b0000 m_RenameOverlay: @@ -1367,10 +1597,17 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 +<<<<<<< Updated upstream x: 341 y: 0 width: 769 height: 652 +======= + x: 587 + y: 0 + width: 1068 + height: 617 +>>>>>>> Stashed changes m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 18} @@ -1399,10 +1636,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< Updated upstream x: 341 y: 768 width: 767 height: 631 +======= + x: 587 + y: 803 + width: 1066 + height: 596 +>>>>>>> Stashed changes m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1424,7 +1668,11 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: +<<<<<<< Updated upstream - Assets/MyGame/aa/Game/HHWK/Boss/YuXI +======= + - Assets +>>>>>>> Stashed changes m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1432,16 +1680,27 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: +<<<<<<< Updated upstream - Assets/MyGame/aa/Game/HHWK/Boss/YuXI +======= + - Assets +>>>>>>> Stashed changes m_LastFoldersGridSize: 96 m_LastProjectPath: D:\Unity\UnityProjects\Buyu_Script m_LockTracker: m_IsLocked: 1 m_FolderTreeState: +<<<<<<< Updated upstream scrollPos: {x: 0, y: 445} m_SelectedIDs: a00f0100 m_LastClickedID: 69536 m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100 +======= + scrollPos: {x: 0, y: 31} + m_SelectedIDs: b05d0100 + m_LastClickedID: 89520 + m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100 +>>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1469,7 +1728,11 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 +<<<<<<< Updated upstream m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100 +======= + m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100 +>>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1494,9 +1757,15 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: +<<<<<<< Updated upstream m_SelectedInstanceIDs: 46efffff m_LastClickedInstanceID: -4282 m_HadKeyboardFocusLastEvent: 1 +======= + m_SelectedInstanceIDs: 80e20000 + m_LastClickedInstanceID: 57984 + m_HadKeyboardFocusLastEvent: 0 +>>>>>>> Stashed changes m_ExpandedInstanceIDs: 4675000052970000469700008696000074960000987e0000c8630100c4ec0000e2ef0000dcef0000beef000098da00009cda000020a30000c6a200000eab000036c10000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1524,7 +1793,11 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 96 m_SkipHiddenPackages: 0 +<<<<<<< Updated upstream m_DirectoriesAreaWidth: 254 +======= + m_DirectoriesAreaWidth: 76 +>>>>>>> Stashed changes --- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1540,10 +1813,17 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 +<<<<<<< Updated upstream x: 1110 y: 0 width: 966 height: 652 +======= + x: 1655 + y: 0 + width: 498 + height: 617 +>>>>>>> Stashed changes m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 20} @@ -1572,10 +1852,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< Updated upstream x: 1110 y: 768 width: 964 height: 631 +======= + x: 1655 + y: 803 + width: 496 + height: 596 +>>>>>>> Stashed changes m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1597,7 +1884,11 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: +<<<<<<< Updated upstream - Assets/Art/HHWK/res/model/wukong +======= + - Assets +>>>>>>> Stashed changes m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1605,16 +1896,28 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: +<<<<<<< Updated upstream - Assets/Art/HHWK/res/model/wukong m_LastFoldersGridSize: 16 +======= + - Assets + m_LastFoldersGridSize: 96 +>>>>>>> Stashed changes m_LastProjectPath: D:\Unity\UnityProjects\Buyu_Script m_LockTracker: m_IsLocked: 0 m_FolderTreeState: +<<<<<<< Updated upstream scrollPos: {x: 0, y: 429} m_SelectedIDs: 0acf0100 m_LastClickedID: 118538 m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100780f0100f60f0100fe0f0100 +======= + scrollPos: {x: 0, y: 31} + m_SelectedIDs: b05d0100 + m_LastClickedID: 89520 + m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100 +>>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1642,7 +1945,11 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 +<<<<<<< Updated upstream m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100 +======= + m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100 +>>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1667,10 +1974,17 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: +<<<<<<< Updated upstream m_SelectedInstanceIDs: 46efffff m_LastClickedInstanceID: -4282 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c0b000000eab00006ce3f5ff98250100ce220100663101008a21010016d0000072d000003eca000046ca00007c74020082740200e026020028950200 +======= + m_SelectedInstanceIDs: 80e20000 + m_LastClickedInstanceID: 57984 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c0b000000eab00006ce3f5ff98250100ce220100663101008a21010016d0000072d000003eca000046ca00007c74020082740200 +>>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1694,8 +2008,13 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 +<<<<<<< Updated upstream m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 +======= + m_ScrollPosition: {x: 0, y: 1472} + m_GridSize: 96 +>>>>>>> Stashed changes m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 195 --- !u!114 &21 @@ -1713,6 +2032,7 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 +<<<<<<< Updated upstream x: 2076 y: 0 width: 484 @@ -1720,6 +2040,15 @@ MonoBehaviour: m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 22} +======= + x: 2153 + y: 0 + width: 407 + height: 1347 + m_MinSize: {x: 275, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 23} +>>>>>>> Stashed changes m_Panes: - {fileID: 22} - {fileID: 23} @@ -1746,10 +2075,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< Updated upstream x: 2076 y: 73 width: 483 - height: 1326 +======= + x: 3911 + y: 73 + width: 568 + height: 926 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1766,6 +2100,60 @@ MonoBehaviour: m_CachedPref: 368 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: 57984 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &23 +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: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2153 + y: 73 + width: 406 +>>>>>>> Stashed changes + height: 1326 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: +<<<<<<< Updated upstream + m_CachedPref: 368 + m_ControlHash: -371814159 +======= + m_CachedPref: -379 + m_ControlHash: 1412526313 +>>>>>>> Stashed changes + m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 m_GlobalObjectId: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 921feb6ed..e2c42b673 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 8 - y: 51 - width: 2544 - height: 1381 + x: 0 + y: 43 + width: 2560 + height: 1397 m_ShowMode: 4 - m_Title: Project + m_Title: Simulator m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2544 - height: 1381 + width: 2560 + height: 1397 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: 2544 + width: 2560 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: 1361 - width: 2544 + y: 1377 + width: 2560 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: 2544 - height: 1331 + width: 2560 + height: 1347 m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 248 + controlID: 240 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2063 - height: 1331 + width: 2153 + height: 1347 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 62 + controlID: 63 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -167,12 +167,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2063 - height: 598 + width: 2153 + height: 730 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 63 + controlID: 64 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -191,13 +191,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 332 - height: 598 + width: 629 + height: 730 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 16} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -215,16 +215,16 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 332 + x: 629 y: 0 - width: 368 - height: 598 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 18} + width: 324 + height: 730 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 17} - {fileID: 18} + - {fileID: 19} m_Selected: 1 m_LastSelected: 0 --- !u!114 &10 @@ -242,15 +242,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 700 + x: 953 y: 0 - width: 1363 - height: 598 + width: 1200 + height: 730 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 27} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 27} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 --- !u!114 &11 @@ -272,13 +272,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 598 - width: 2063 - height: 733 + y: 730 + width: 2153 + height: 617 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 106 + controlID: 70 draggingID: 0 --- !u!114 &12 MonoBehaviour: @@ -297,16 +297,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 642 - height: 733 + width: 587 + height: 617 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 19} - {fileID: 20} - {fileID: 21} - {fileID: 22} + - {fileID: 23} m_Selected: 0 m_LastSelected: 2 --- !u!114 &13 @@ -324,15 +324,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 642 + x: 587 y: 0 - width: 461 - height: 733 + width: 1068 + height: 617 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 23} + m_ActualView: {fileID: 24} m_Panes: - - {fileID: 23} + - {fileID: 24} m_Selected: 0 m_LastSelected: 0 --- !u!114 &14 @@ -350,15 +350,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1103 + x: 1655 y: 0 - width: 960 - height: 733 + width: 498 + height: 617 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 25} m_Panes: - - {fileID: 24} + - {fileID: 25} m_Selected: 0 m_LastSelected: 0 --- !u!114 &15 @@ -376,19 +376,88 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 2063 + x: 2153 y: 0 - width: 481 - height: 1331 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 25} + width: 407 + height: 1347 + m_MinSize: {x: 275, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 27} m_Panes: - - {fileID: 25} - {fileID: 26} - m_Selected: 0 - m_LastSelected: 1 + - {fileID: 27} + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &16 +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: 13974, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Simulator + m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 953 + y: 73 + width: 1198 + height: 709 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: + - UnityEditor.GameView + m_SerializedViewValues: + - D:\Unity\UnityProjects\Buyu_Script\Library\PlayModeViewStates\4cde99c8c96c00e4f8413afeaf858528 + m_PlayModeViewName: Device Simulator + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 1} + m_TargetSize: {x: 2532, y: 1170} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 2 + m_UseMipMap: 0 + m_SimulatorState: + controlPanelVisible: 0 + controlPanelWidth: 0 + controlPanelFoldoutKeys: + - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin + controlPanelFoldoutValues: 00 + pluginNames: + - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin + - UnityEngine.InputSystem.Editor.InputSystemPlugin + pluginStates: + - '{}' + - '{}' + scale: 45 + fitToScreenEnabled: 1 + rotationDegree: 270 + highlightSafeAreaEnabled: 0 + friendlyName: Apple iPhone 12 Pro + screenIndex: 0 + networkReachability: 1 + systemLanguage: 10 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -409,10 +478,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 81 - width: 331 - height: 577 + x: 0 + y: 73 + width: 628 + height: 709 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -426,23 +495,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 248b0000 + m_SelectedIDs: 08e80000 m_LastClickedID: 0 - m_ExpandedIDs: 2a6cfffff68bffff068cffff168cffff2e8cffff0cfbffff5ac100007cf90300bef90300 + m_ExpandedIDs: 78ecffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Coin - m_OriginalName: Coin + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -29696 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -452,7 +521,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &17 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -473,10 +542,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 340 - y: 81 - width: 971 - height: 547 + x: 2958 + y: 73 + width: 716 + height: 372 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -494,7 +563,6 @@ MonoBehaviour: - {fileID: 1107599295331701163, guid: ecbe945a0a4c53c41bb947387a2bafa6, type: 2} - {fileID: 1107709254077376921, guid: 918d4fef7030da04fb05730e9d1bb2b0, type: 2} - {fileID: 1107709254077376921, guid: e0e82f1a4270fcc42a5e02c099176fa3, type: 2} - - {fileID: 1107709254077376921, guid: fe9437d12f43b434b9c165b98ae3551d, type: 2} m_ValueSerializationHelper: - e00: 0.45927763 e01: 0 @@ -560,30 +628,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.88775307 + - e00: 0.50757575 e01: 0 e02: 0 - e03: 44.34408 + e03: 15 e10: 0 - e11: 0.88775307 + e11: 0.50757575 e12: 0 - e13: 259.48044 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.9129922 - e01: 0 - e02: 0 - e03: 127.487274 - e10: 0 - e11: 0.9129922 - e12: 0 - e13: 85.03546 + e13: 288.48105 e20: 0 e21: 0 e22: 1 @@ -593,10 +645,10 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: fe9437d12f43b434b9c165b98ae3551d, + m_AnimatorController: {fileID: 9100000, guid: e0e82f1a4270fcc42a5e02c099176fa3, type: 2} m_BreadCrumbs: - - m_Target: {fileID: 1107709254077376921, guid: fe9437d12f43b434b9c165b98ae3551d, + - m_Target: {fileID: 1107709254077376921, guid: e0e82f1a4270fcc42a5e02c099176fa3, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} @@ -610,7 +662,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &18 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -631,10 +683,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 340 - y: 81 - width: 366 - height: 577 + x: 629 + y: 73 + width: 322 + height: 709 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -714,9 +766,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -111, y: 26} + snapOffset: {x: -111, y: -123} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 3 id: Orientation index: 0 layout: 4 @@ -948,7 +1000,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 10} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay @@ -976,13 +1028,13 @@ MonoBehaviour: m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 0 - m_isRotationLocked: 0 + m_isRotationLocked: 1 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 5.488319, y: 4.714727, z: 55.443623} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: 5.488319, y: 4.714727, z: 55.443623} + m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1010,9 +1062,9 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: 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} @@ -1024,24 +1076,24 @@ MonoBehaviour: 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} - m_ShowGrid: 0 + m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.1285996, y: 0.2211512, z: -0.029432513, w: 0.9662797} + m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} speed: 2 - m_Value: {x: 0.12859906, y: 0.22115028, z: -0.02943239, w: 0.96627563} + m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_Size: - m_Target: 66.0695 + m_Target: 10 speed: 2 - m_Value: 66.0695 + m_Value: 10 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 1.9000491 - m_SpeedNormalized: 0.9499996 + m_Speed: 1 + m_SpeedNormalized: 0.5 m_SpeedMin: 0.001 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -1052,14 +1104,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.103331074, y: 0.07911574, z: -0.007985452, w: 0.9915876} + m_LastSceneViewRotation: {x: 0.045295198, y: 0.0018074726, z: -0.00008029741, w: 0.99898016} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &19 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1080,10 +1132,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 679 - width: 641 - height: 712 + x: 0 + y: 803 + width: 586 + height: 596 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1094,7 +1146,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &20 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1114,10 +1166,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 649 - width: 641 - height: 742 + x: 2560 + y: 586 + width: 654 + height: 413 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1129,7 +1181,7 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 mForceToReOpen: 0 ---- !u!114 &21 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1150,10 +1202,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 649 - width: 641 - height: 742 + x: 2560 + y: 586 + width: 654 + height: 413 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1175,23 +1227,24 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - "Assets/UIResources/Home/\u80CC\u5305" m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 m_FilterByTypeIntersection: 0 m_ViewMode: 0 m_StartGridSize: 16 - m_LastFolders: [] + m_LastFolders: + - "Assets/UIResources/Home/Spine/\u661F\u9645\u8FF7\u822A\u673A\u573A\u5927\u5385" m_LastFoldersGridSize: 96 - m_LastProjectPath: D:\Unity\UnityProjects\Buyu_Script + m_LastProjectPath: E:\UnityProject\5_24BuYu m_LockTracker: m_IsLocked: 1 m_FolderTreeState: scrollPos: {x: 0, y: 523} m_SelectedIDs: 30b90200 m_LastClickedID: 178480 - m_ExpandedIDs: 000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100 + m_ExpandedIDs: 00000000c4630100c6630100c8630100ca630100cc630100ce630100d0630100d2630100d4630100d6630100d8630100da630100dc630100de630100e0630100e2630100e4630100e6630100e8630100ea630100ec630100ee630100f0630100f2630100f4630100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1216,10 +1269,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: f08bffff + scrollPos: {x: 0, y: 3508} + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100 + m_ExpandedIDs: 00000000c4630100c6630100c8630100ca630100cc630100ce630100d0630100d2630100d4630100d6630100d8630100da630100dc630100de630100e0630100e2630100e4630100e6630100e8630100ea630100ec630100ee630100f0630100f2630100f4630100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1244,8 +1297,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: f08bffff - m_LastClickedInstanceID: -29712 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000467d0000c67e00009874000024c5fdff647400009274000016a500003aa500002ed3020028d3020078e003007e76000088760000247a0000e67e0000487b0000 m_RenameOverlay: @@ -1275,7 +1328,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &22 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1458,7 +1511,7 @@ MonoBehaviour: m_ShowReferencedBuses: 1 m_ShowBusConnections: 0 m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &23 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1479,10 +1532,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 650 - y: 679 - width: 459 - height: 712 + x: 587 + y: 803 + width: 1066 + height: 596 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1504,7 +1557,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/MyGame/aa/Game/HHWK/Boss/YuXI + - Assets m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1512,16 +1565,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/MyGame/aa/Game/HHWK/Boss/YuXI + - Assets m_LastFoldersGridSize: 96 m_LastProjectPath: D:\Unity\UnityProjects\Buyu_Script m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 302} - m_SelectedIDs: 965e0100 - m_LastClickedID: 89750 - m_ExpandedIDs: 000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100 + scrollPos: {x: 0, y: 31} + m_SelectedIDs: c4630100 + m_LastClickedID: 91076 + m_ExpandedIDs: 00000000c4630100c6630100c8630100ca630100cc630100ce630100d0630100d2630100d4630100d6630100d8630100da630100dc630100de630100e0630100e2630100e4630100e6630100e8630100ea630100ec630100ee630100f0630100f2630100f4630100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1549,7 +1602,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100 + m_ExpandedIDs: 00000000c4630100c6630100c8630100ca630100cc630100ce630100d0630100d2630100d4630100d6630100d8630100da630100dc630100de630100e0630100e2630100e4630100e6630100e8630100ea630100ec630100ee630100f0630100f2630100f4630100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1604,8 +1657,8 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 96 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 138 ---- !u!114 &24 + m_DirectoriesAreaWidth: 76 +--- !u!114 &25 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1626,10 +1679,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1111 - y: 679 - width: 958 - height: 712 + x: 1655 + y: 803 + width: 496 + height: 596 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1651,7 +1704,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/MyGame + - Assets m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1659,16 +1712,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/MyGame + - Assets m_LastFoldersGridSize: 96 m_LastProjectPath: D:\Unity\UnityProjects\Buyu_Script m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 258} - m_SelectedIDs: 505b0100 - m_LastClickedID: 88912 - m_ExpandedIDs: 000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100c25e0100 + scrollPos: {x: 0, y: 31} + m_SelectedIDs: c4630100 + m_LastClickedID: 91076 + m_ExpandedIDs: 00000000c4630100c6630100c8630100ca630100cc630100ce630100d0630100d2630100d4630100d6630100d8630100da630100dc630100de630100e0630100e2630100e4630100e6630100e8630100ea630100ec630100ee630100f0630100f2630100f4630100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1696,7 +1749,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100 + m_ExpandedIDs: 00000000c4630100c6630100c8630100ca630100cc630100ce630100d0630100d2630100d4630100d6630100d8630100da630100dc630100de630100e0630100e2630100e4630100e6630100e8630100ea630100ec630100ee630100f0630100f2630100f4630100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1724,7 +1777,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c0b000000eab00006ce3f5ff98250100ce220100663101008a21010016d0000072d000003eca000046ca00007c74020082740200e026020028950200 + m_ExpandedInstanceIDs: c0b000000eab00006ce3f5ff98250100ce220100663101008a21010016d0000072d000003eca000046ca00007c74020082740200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1748,11 +1801,11 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 1548.5} m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 195 ---- !u!114 &25 +--- !u!114 &26 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1773,10 +1826,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2071 - y: 81 - width: 480 - height: 1310 + x: 3911 + y: 73 + width: 568 + height: 926 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1793,14 +1846,14 @@ MonoBehaviour: m_CachedPref: 368 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 59400 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &26 +--- !u!114 &27 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1809,21 +1862,21 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 12079, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 390, y: 390} + m_MinSize: {x: 275, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Lighting - m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2076 + x: 2153 y: 73 - width: 483 + width: 406 height: 1326 m_SerializedDataModeController: m_DataMode: 0 @@ -1835,72 +1888,16 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &27 -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: 13974, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Simulator - m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 708 - y: 81 - width: 1361 - height: 577 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SerializedViewNames: - - UnityEditor.GameView - m_SerializedViewValues: - - D:\Unity\UnityProjects\Buyu_Script\Library\PlayModeViewStates\ae19ed70ebe973e4ab6341a62c58271c - m_PlayModeViewName: Device Simulator - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 1} - m_TargetSize: {x: 2340, y: 1080} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_SimulatorState: - controlPanelVisible: 0 - controlPanelWidth: 0 - controlPanelFoldoutKeys: - - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin - controlPanelFoldoutValues: 00 - pluginNames: - - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin - - UnityEngine.InputSystem.Editor.InputSystemPlugin - pluginStates: - - '{}' - - '{}' - scale: 46 - fitToScreenEnabled: 1 - rotationDegree: 270 - highlightSafeAreaEnabled: 0 - friendlyName: Google Pixel 5 - screenIndex: 0 - networkReachability: 1 - systemLanguage: 10 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: -379 + m_ControlHash: 1412526313 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0}