diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index cfd333c96..11e271c42 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.62f1c1 -m_EditorVersionWithRevision: 2022.3.62f1c1 (b0109b07edb8) +m_EditorVersion: 2022.3.62f3c1 +m_EditorVersionWithRevision: 2022.3.62f3c1 (1623fc0bbb97) diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 2a0cd5808..12e5b2dca 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Project + m_Title: Inspector m_RootView: {fileID: 10} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,12 +39,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1159 + x: 816 y: 0 - width: 330 - height: 500 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 673 + height: 573 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 25} m_Panes: - {fileID: 25} @@ -65,10 +65,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 472 + x: 527 y: 0 - width: 482 - height: 447 + width: 415 + height: 374 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 17} @@ -91,10 +91,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 954 + x: 942 y: 0 - width: 535 - height: 447 + width: 547 + height: 374 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 18} @@ -121,13 +121,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 500 + y: 573 width: 1489 - height: 447 + height: 374 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 173 + controlID: 201 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -153,7 +153,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 50 + controlID: 265 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -174,8 +174,8 @@ MonoBehaviour: y: 0 width: 431 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: 21} m_Panes: - {fileID: 21} @@ -199,9 +199,9 @@ MonoBehaviour: x: 0 y: 0 width: 493 - height: 500 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + height: 573 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 22} m_Panes: - {fileID: 22} @@ -217,24 +217,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 472 - height: 447 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 20} + width: 527 + height: 374 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 24} m_Panes: - {fileID: 20} - {fileID: 24} - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -330,7 +330,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 51 + controlID: 79 draggingID: 0 --- !u!114 &14 MonoBehaviour: @@ -353,11 +353,11 @@ MonoBehaviour: x: 0 y: 0 width: 1489 - height: 500 + height: 573 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 52 + controlID: 80 draggingID: 0 --- !u!114 &15 MonoBehaviour: @@ -376,10 +376,10 @@ MonoBehaviour: serializedVersion: 2 x: 493 y: 0 - width: 666 - height: 500 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 323 + height: 573 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 23} m_Panes: - {fileID: 23} @@ -442,10 +442,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 472 - y: 573 - width: 480 - height: 426 + x: 527 + y: 646 + width: 413 + height: 353 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -467,7 +467,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/MyGame/Scripts/Characters/Player + - Assets/Framework m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -475,16 +475,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/MyGame/Scripts/Characters/Player + - Assets/Framework m_LastFoldersGridSize: 16 m_LastProjectPath: E:\UnityProject\5_24BuYu m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 490} - m_SelectedIDs: 38830000 - m_LastClickedID: 33592 - m_ExpandedIDs: 000000001a7a00002c8200002e82000030820000328200003482000036820000388200003a8200003c8200003e82000040820000428200004482000046820000488200004a8200004c8200004e82000050820000528200005482000056820000588200005a8200005c8200005e82000060820000628200006482000066820000688200006a8200006c8200006e82000070820000728200007482000076820000788200007a8200007c8200007e82000080820000828200008482000086820000888200008a8200008c8200008e82000090820000928200009482000096820000988200009a8200009c8200009e820000a2820000a8820000aa82000000ca9a3bffffff7f + scrollPos: {x: 0, y: 0} + m_SelectedIDs: dc810000 + m_LastClickedID: 33244 + m_ExpandedIDs: 00000000187d00006e81000070810000728100007481000076810000788100007a8100007c8100007e81000080810000828100008481000086810000888100008a8100008c8100008e81000090810000928100009481000096810000988100009a8100009c8100009e810000a0810000a2810000a4810000a6810000a8810000aa810000ac810000ae810000b0810000b2810000b4810000b6810000b8810000ba810000bc810000be810000c0810000c2810000c4810000c6810000c8810000ca810000cc810000ce810000d0810000d2810000d4810000d6810000d8810000da810000dc810000de810000e0810000e2810000e4810000e681000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -512,7 +512,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000001a7a00002c8200002e82000030820000328200003482000036820000388200003a8200003c8200003e82000040820000428200004482000046820000488200004a8200004c8200004e82000050820000528200005482000056820000588200005a8200005c8200005e82000060820000628200006482000066820000688200006a8200006c8200006e82000070820000728200007482000076820000788200007a8200007c8200007e82000080820000828200008482000086820000888200008a8200008c8200008e82000090820000928200009482000096820000988200009a8200009c8200009e820000a0820000a2820000a4820000a6820000a8820000aa820000ac820000ae820000 + m_ExpandedIDs: 00000000187d00006e81000070810000728100007481000076810000788100007a8100007c8100007e81000080810000828100008481000086810000888100008a8100008c8100008e81000090810000928100009481000096810000988100009a8100009c8100009e810000a0810000a2810000a4810000a6810000a8810000aa810000ac810000ae810000b0810000b2810000b4810000b6810000b8810000ba810000bc810000be810000c0810000c2810000c4810000c6810000c8810000ca810000cc810000ce810000d0810000d2810000d4810000d6810000d8810000da810000dc810000de810000e0810000e2810000e4810000e6810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -589,10 +589,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 954 - y: 573 - width: 533 - height: 426 + x: 942 + y: 646 + width: 545 + height: 353 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -628,10 +628,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 534} - m_SelectedIDs: 269f0000 - m_LastClickedID: 40742 - m_ExpandedIDs: 000000001a7a00002c8200002e82000030820000328200003482000036820000388200003a8200003c8200003e82000040820000428200004482000046820000488200004a8200004c8200004e82000050820000528200005482000056820000588200005a8200005c8200005e82000060820000628200006482000066820000688200006a8200006c8200006e82000070820000728200007482000076820000788200007a8200007c8200007e82000080820000828200008482000086820000888200008a8200008c8200008e82000090820000928200009482000096820000988200009a8200009c8200009e820000a2820000a8820000aa82000028830000229f000000ca9a3bffffff7f + scrollPos: {x: 0, y: 387} + m_SelectedIDs: ae840000 + m_LastClickedID: 33966 + m_ExpandedIDs: 00000000187d00006e81000070810000728100007481000076810000788100007a8100007c8100007e81000080810000828100008481000086810000888100008a8100008c8100008e81000090810000928100009481000096810000988100009a8100009c8100009e810000a0810000a2810000a4810000a6810000a8810000aa810000ac810000ae810000b0810000b2810000b4810000b6810000b8810000ba810000bc810000be810000c0810000c2810000c4810000c6810000c8810000ca810000cc810000ce810000d0810000d2810000d4810000d6810000d8810000da810000dc810000de810000e0810000e2810000e4810000e6810000d8830000b084000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -659,7 +659,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000001a7a00002c8200002e82000030820000328200003482000036820000388200003a8200003c8200003e82000040820000428200004482000046820000488200004a8200004c8200004e82000050820000528200005482000056820000588200005a8200005c8200005e82000060820000628200006482000066820000688200006a8200006c8200006e82000070820000728200007482000076820000788200007a8200007c8200007e82000080820000828200008482000086820000888200008a8200008c8200008e82000090820000928200009482000096820000988200009a8200009c8200009e820000a0820000a2820000a4820000a6820000a8820000aa820000ac820000ae820000 + m_ExpandedIDs: 00000000187d00006e81000070810000728100007481000076810000788100007a8100007c8100007e81000080810000828100008481000086810000888100008a8100008c8100008e81000090810000928100009481000096810000988100009a8100009c8100009e810000a0810000a2810000a4810000a6810000a8810000aa810000ac810000ae810000b0810000b2810000b4810000b6810000b8810000ba810000bc810000be810000c0810000c2810000c4810000c6810000c8810000ca810000cc810000ce810000d0810000d2810000d4810000d6810000d8810000da810000dc810000de810000e0810000e2810000e4810000e6810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -811,7 +811,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 573 - width: 471 + width: 526 height: 426 m_SerializedDataModeController: m_DataMode: 0 @@ -834,7 +834,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - "Assets/UIResources/Home/Spine/\u673A\u573A\u6218\u6597\u754C\u9762/spine/fish/1_jixielong" + - "Assets/UIResources/Home/Spine/\u673A\u573A\u6218\u6597\u754C\u9762" m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -851,7 +851,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 523} m_SelectedIDs: 30b90200 m_LastClickedID: 178480 - m_ExpandedIDs: 000000001a7a00002c8200002e82000030820000328200003482000036820000388200003a8200003c8200003e82000040820000428200004482000046820000488200004a8200004c8200004e82000050820000528200005482000056820000588200005a8200005c8200005e82000060820000628200006482000066820000688200006a8200006c8200006e82000070820000728200007482000076820000788200007a8200007c8200007e82000080820000828200008482000086820000888200008a8200008c8200008e82000090820000928200009482000096820000988200009a8200009c8200009e820000a0820000a2820000a4820000a6820000a8820000aa820000ac820000ae820000 + m_ExpandedIDs: 00000000187d00006e81000070810000728100007481000076810000788100007a8100007c8100007e81000080810000828100008481000086810000888100008a8100008c8100008e81000090810000928100009481000096810000988100009a8100009c8100009e810000a0810000a2810000a4810000a6810000a8810000aa810000ac810000ae810000b0810000b2810000b4810000b6810000b8810000ba810000bc810000be810000c0810000c2810000c4810000c6810000c8810000ca810000cc810000ce810000d0810000d2810000d4810000d6810000d8810000da810000dc810000de810000e0810000e2810000e4810000e6810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -876,10 +876,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 1520} - m_SelectedIDs: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: fcbfffff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000001a7a00002c8200002e82000030820000328200003482000036820000388200003a8200003c8200003e82000040820000428200004482000046820000488200004a8200004c8200004e82000050820000528200005482000056820000588200005a8200005c8200005e82000060820000628200006482000066820000688200006a8200006c8200006e82000070820000728200007482000076820000788200007a8200007c8200007e82000080820000828200008482000086820000888200008a8200008c8200008e82000090820000928200009482000096820000988200009a8200009c8200009e820000a0820000a2820000a4820000a6820000a8820000aa820000ac820000ae820000 + m_ExpandedIDs: ffffffff00000000187d00006e8100007081000076810000788100007a8100007c8100007e81000080810000828100008481000086810000888100008a8100008c8100008e81000090810000928100009481000096810000988100009a8100009c8100009e810000a0810000a2810000a4810000a6810000a8810000aa810000ac810000ae810000b0810000b2810000b4810000b6810000b8810000ba810000bc810000be810000c0810000c2810000c4810000c6810000c8810000ca810000cc810000ce810000d2810000d6810000d8810000de810000e0810000e4810000e6810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -904,8 +904,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: fcbfffff + m_LastClickedInstanceID: -16388 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000467d0000c67e00009874000024c5fdff647400009274000016a500003aa500002ed3020028d3020078e003007e76000088760000247a0000e67e0000487b0000 m_RenameOverlay: @@ -977,7 +977,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 108 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -1007,7 +1007,7 @@ MonoBehaviour: x: 0 y: 73 width: 492 - height: 479 + height: 552 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1021,9 +1021,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 387f0000 - m_LastClickedID: 0 - m_ExpandedIDs: 9cfafffffefafffff07e0000 + m_SelectedIDs: e687ffff + m_LastClickedID: -30746 + m_ExpandedIDs: 10fbffff327e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1070,8 +1070,8 @@ MonoBehaviour: serializedVersion: 2 x: 493 y: 73 - width: 664 - height: 479 + width: 321 + height: 552 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1404,9 +1404,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.90213066, y: -4.2552094, z: -0.34200203} + m_Target: {x: 47.010765, y: 36.7156, z: -1.2164774} speed: 2 - m_Value: {x: 0.90213066, y: -4.2552094, z: -0.34200203} + m_Value: {x: 47.010765, y: 36.7156, z: -1.2164774} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1456,9 +1456,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 39.227932 + m_Target: 126.67548 speed: 2 - m_Value: 39.227932 + m_Value: 126.67548 m_Ortho: m_Target: 1 speed: 2 @@ -1505,9 +1505,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 573 - width: 547 - height: 426 + y: 646 + width: 526 + height: 353 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1539,10 +1539,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1159 + x: 816 y: 73 - width: 328 - height: 479 + width: 671 + height: 552 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1579,7 +1579,7 @@ MonoBehaviour: pluginStates: - '{}' - '{}' - scale: 12 + scale: 25 fitToScreenEnabled: 1 rotationDegree: 270 highlightSafeAreaEnabled: 0