diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index e275038b..65b629d2 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -92929,8 +92929,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 206378383 - m_SortingLayer: 1 + m_SortingLayerID: 1879229885 + m_SortingLayer: 3 m_SortingOrder: 0 m_RenderMode: 0 m_MeshDistribution: 0 @@ -98593,7 +98593,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 18287259178651034, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 18287259178651034, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 609261084099919364, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_SortingLayer @@ -98617,7 +98621,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6873683359812544074, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6873683359812544074, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 8197941668294985647, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_SortingLayer @@ -98713,7 +98721,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9038696898992558422, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9038696898992558422, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -98828,7 +98840,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 1980617973639438117, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1980617973639438117, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 2513308301931425141, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_Pivot.x @@ -98920,7 +98936,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6728479800408145995, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6728479800408145995, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 7402225328633997096, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_SortingLayer @@ -98936,7 +98956,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7731864819806308598, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7731864819806308598, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 8321583542255107972, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_IsActive @@ -98974,7 +98998,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1998574189468406436, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1998574189468406436, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 3347277088054391551, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_Pivot.x @@ -99058,11 +99086,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3836935154338971969, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3836935154338971969, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 5554293446503412760, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5554293446503412760, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 6190022126030603983, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_SortingLayer @@ -99070,7 +99106,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7539937807117521360, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7539937807117521360, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 8876175099796070478, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_SortingLayer @@ -99214,7 +99254,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907619981400184154, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 907619981400184154, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 1404648661188607416, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_SortingLayer @@ -99222,7 +99266,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2223282628049554599, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2223282628049554599, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 4602961601050214702, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_Pivot.x @@ -99446,7 +99494,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 497157564599735893, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 497157564599735893, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 2572823474736715774, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_SortingLayer @@ -99478,7 +99530,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8851828431545859550, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8851828431545859550, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} + propertyPath: m_SortingLayerID + value: 1879229885 objectReference: {fileID: 0} - target: {fileID: 9112713449763400918, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_Pivot.x diff --git a/UnityProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UnityProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 6eda4431..d8667893 100644 --- a/UnityProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UnityProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 96 + controlID: 16560 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -50,7 +50,7 @@ MonoBehaviour: x: 3064 y: 64.8 width: 549.19995 - height: 563 + height: 569.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -104,22 +104,22 @@ MonoBehaviour: x: 0 y: 21 width: 549.19995 - height: 542 - m_Scale: {x: 0.28952992, y: 0.28952992} - m_Translation: {x: 274.59998, y: 271} + height: 548.4 + m_Scale: {x: 0.29294872, y: 0.29294872} + m_Translation: {x: 274.59998, y: 274.2} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -948.43384 + x: -937.36536 y: -936 - width: 1896.8677 + width: 1874.7307 height: 1872 m_MinimalGUI: 1 - m_defaultScale: 0.28952992 - m_LastWindowPixelSize: {x: 686.49994, y: 703.75} + m_defaultScale: 0.29294872 + m_LastWindowPixelSize: {x: 686.49994, y: 711.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -190,21 +190,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 30a6fffff2a6ffff66d0ffff2edcffff3edcffff6eddffff20deffff68defffff8deffff24dfffff34dfffff44dfffff54dfffff64dfffff74dfffff78dfffff88dfffff98dfffffa8dfffffb8dfffffc8dfffffccdfffffd4dfffffdcdfffff78faffff0e7c0000607c0000 + m_ExpandedIDs: 4e2affffac76ffff0e7cffffca91ffffd691ffff909bffff44c0ffffc4c0ffff04c1ffff0ac1ffff10c1ffffdec2ffffe4c2ffffa2c6ffffacf4ffff22f5ffff5cf5ffff68f5ffff7ef8ffff08fbffff7c780000ce780000648e0000b68e00007c990000ce9900000ea30000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: UIGameBattle - m_OriginalName: UIGameBattle + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -6176 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 3} m_SearchString: @@ -238,7 +238,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 37 + controlID: 16504 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -258,8 +258,8 @@ MonoBehaviour: y: 0 width: 664.8 height: 590.4 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} @@ -706,7 +706,7 @@ MonoBehaviour: sizeOverriden: 0 m_OverlaysVisible: 1 m_WindowGUID: 5cf81b6aabd129442882437517fe541b - m_Gizmos: 1 + m_Gizmos: 0 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 @@ -715,9 +715,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 323.77954, y: 157.37003, z: -0.03297081} + m_Target: {x: 325.06223, y: 156.33238, z: 259.95502} speed: 2 - m_Value: {x: 323.77954, y: 157.37003, z: -0.03297081} + m_Value: {x: 325.06223, y: 156.33238, z: 259.95502} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -767,9 +767,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 4.047067 + m_Target: 1.9921849 speed: 2 - m_Value: 4.047067 + m_Value: 1.9921849 m_Ortho: m_Target: 1 speed: 2 @@ -9140,7 +9140,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/AssetRaw/UI + - Assets/AssetRaw/Effects/XNB m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -9148,16 +9148,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/AssetRaw/UI + - Assets/AssetRaw/Effects/XNB m_LastFoldersGridSize: 16 m_LastProjectPath: "D:\\Git\u9879\u76EE\\\u6700\u5F3A\u5927\u8111\\UnityProject" m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 144} - m_SelectedIDs: 127e0000 - m_LastClickedID: 32274 - m_ExpandedIDs: 00000000da7c0000dc7c0000de7c0000e07c0000e27c0000e47c0000e67c0000e87c0000ea7c0000ec7c0000ee7c0000f07c0000f27c0000f47c0000f67c0000f87c0000fa7c0000fc7c0000fe7c0000007d0000027d0000047d0000067d0000087d00000a7d00000c7d00000e7d0000107d0000127d0000147d0000167d0000187d00001a7d00001c7d00001e7d0000207d0000227d0000247d0000267d0000287d0000 + scrollPos: {x: 0, y: 132} + m_SelectedIDs: 727a0000 + m_LastClickedID: 31346 + m_ExpandedIDs: 00000000487900004a7900004c7900004e79000050790000527900005479000056790000587900005a7900005c7900005e79000060790000627900006479000066790000687900006a7900006c7900006e79000070790000727900007479000076790000787900007a7900007c7900007e79000080790000827900008479000086790000887900008a7900008c7900008e79000090790000927900009479000096790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -9185,7 +9185,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000da7c0000dc7c0000de7c0000e07c0000e27c0000e47c0000e67c0000e87c0000ea7c0000ec7c0000ee7c0000f07c0000f27c0000f47c0000f67c0000f87c0000fa7c0000fc7c0000fe7c0000007d0000027d0000047d0000067d0000087d00000a7d00000c7d00000e7d0000107d0000127d0000147d0000167d0000187d00001a7d00001c7d00001e7d0000207d0000227d0000247d0000267d0000287d0000 + m_ExpandedIDs: 00000000487900004a7900004c7900004e79000050790000527900005479000056790000587900005a7900005c7900005e79000060790000627900006479000066790000687900006a7900006c7900006e79000070790000727900007479000076790000787900007a7900007c7900007e79000080790000827900008479000086790000887900008a7900008c7900008e79000090790000927900009479000096790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -9212,8 +9212,8 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: 58d6020022e40200807b000032880100d6ce01002ed602007c14030014f30000dcff000010f20000383001003e7000001c0701005aa70000b2a8000036a800004aa80000b07e0000a07a00000abe00000ebe0000fead010060050100da1f01007c1f0100ceae0000c6c40000d800010094870000bc870000b6d101007e8e0000d87e0000c4ac0000b0af000098a400009aa4000008dd00004e5a010092940000f0910000447b0000800e0100064601008afa0000eab70000dcbd00002e8d000026c40000a897000090b7000056940000949b00009e9a000022b9000092ff000072b50000b6980000a29e00000ea1000042a4000040500100cc4f0100c2ca00005cd4fefdbab3000066ce000026ee0000f6060100484c01002ca20000c6f1000090f20000e8c90100f6a9000046c5000044c500002cf800002c00010030000100e2ff0000bcd900007af00000f88f0000ce8e0000a28e00008a340100b2330100384c01001a4c0100184c0100604b01005c4b01006c9e010090950000a295000050120100ee97010042af0000fec300009eb80000c6b00000cab1000028210100f0220100ae210100b41d0100809200004aec00002a3701002606000078360100d48700006c3401008e36010098ce00009ace00000cbf00001abf0000ae04030094df0000f813010056150100284d0100ce1701005ea10000602501009c4a010092a1020078600100ee900000a0a20000ac43010098b40000b09e000000000000acaa00009abf0000e6c40000d4cb0000d6c7000020c80000c4c60000a4bf0100662f03006e4b010044700000ac7a00008a700000847100000e71000012710000ae700000667a00006c7b0000cc7c0000f07c0000147d000088800000c6360000d036000086210100862201007822010096820000ce820000c282000094820000c8820000b2820000aa8200009a820000b0820000587b0000c8a70000c6a70000f682000036360000e8920000 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: 58d6020022e40200807b000032880100d6ce01002ed602007c14030014f30000dcff000010f20000383001003e7000001c0701005aa70000b2a8000036a800004aa80000b07e0000a07a00000abe00000ebe0000fead010060050100da1f01007c1f0100ceae0000c6c40000d800010094870000bc870000b6d101007e8e0000d87e0000c4ac0000b0af000098a400009aa4000008dd00004e5a010092940000f0910000447b0000800e0100064601008afa0000eab70000dcbd00002e8d000026c40000a897000090b7000056940000949b00009e9a000022b9000092ff000072b50000b6980000a29e00000ea1000042a4000040500100cc4f0100c2ca00005cd4fefdbab3000066ce000026ee0000f6060100484c01002ca20000c6f1000090f20000e8c90100f6a9000046c5000044c500002cf800002c00010030000100e2ff0000bcd900007af00000f88f0000ce8e0000a28e00008a340100b2330100384c01001a4c0100184c0100604b01005c4b01006c9e010090950000a295000050120100ee97010042af0000fec300009eb80000c6b00000cab1000028210100f0220100ae210100b41d0100809200004aec00002a3701002606000078360100d48700006c3401008e36010098ce00009ace00000cbf00001abf0000ae04030094df0000f813010056150100284d0100ce1701005ea10000602501009c4a010092a1020078600100ee900000a0a20000ac43010098b40000b09e000000000000acaa00009abf0000e6c40000d4cb0000d6c7000020c80000c4c60000a4bf0100662f03006e4b010044700000ac7a00008a700000847100000e71000012710000ae700000667a00006c7b0000cc7c0000f07c0000147d000088800000c6360000d036000086210100862201007822010096820000ce820000c282000094820000c8820000b2820000aa8200009a820000b0820000587b0000c8a70000c6a70000f682000036360000e892000044350000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -9265,7 +9265,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 97 + controlID: 16561 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -9284,9 +9284,9 @@ MonoBehaviour: x: 0 y: 0 width: 551.19995 - height: 584 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + height: 590.4 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -9308,9 +9308,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 584 + y: 590.4 width: 551.19995 - height: 451.59998 + height: 445.19995 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} @@ -9340,9 +9340,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 3064 - y: 648.8 + y: 655.2 width: 549.19995 - height: 430.59998 + height: 424.19995 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -9383,9 +9383,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 3064 - y: 648.8 + y: 655.2 width: 549.19995 - height: 430.59998 + height: 424.19995 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -9460,7 +9460,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: -374.40002 + m_CachedPref: -379.20007 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1