diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index efa08f7..71ef003 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -12913,6 +12913,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: -4298402075460836617, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: bda0a2a3812d5394e818de604eca4089, type: 2} - target: {fileID: -2614580431881444022, guid: 46b5b7b8f95cd3347bb66010d3a428f8, type: 3} propertyPath: m_IsActive @@ -12943,6 +12948,26 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4428083411317959166, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 3af1d8c2a979d3445a262e389f3d5e2a, type: 2} + - target: {fileID: 4428083411317959166, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: b93528fe62c1ba8409aa06dc60c00d33, type: 2} + - target: {fileID: 4428083411317959166, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: db9e1c2dbde3db042ab439dceaee890a, type: 2} + - target: {fileID: 4428083411317959166, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: c9db9f0399d5280488f4fffa5b3df89b, type: 2} - target: {fileID: 6645210989930172904, guid: 46b5b7b8f95cd3347bb66010d3a428f8, type: 3} propertyPath: m_DirtyAABB diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 2097435..09278b1 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -21,10 +21,10 @@ EditorUserSettings: value: 5a070c555353580f0c5a097041200844464f4b7c792c2464797f4f61e1b96c3a flags: 0 RecentlyUsedSceneGuid-5: - value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 RecentlyUsedSceneGuid-6: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c968797a7cf diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 84a404c..8c7c935 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 73777 + controlID: 76076 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -49,9 +49,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 472 + y: 589 width: 805 - height: 519 + height: 402 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -105,22 +105,22 @@ MonoBehaviour: x: 0 y: 21 width: 805 - height: 498 - m_Scale: {x: 0.41927084, y: 0.41927084} - m_Translation: {x: 402.5, y: 249} + height: 381 + m_Scale: {x: 0.3527778, y: 0.35277778} + m_Translation: {x: 402.5, y: 190.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -960 - y: -593.8882 - width: 1920 - height: 1187.7764 + x: -1140.9448 + y: -540 + width: 2281.8896 + height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.41927084 - m_LastWindowPixelSize: {x: 805, y: 519} + m_defaultScale: 0.35277778 + m_LastWindowPixelSize: {x: 805, y: 402} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 73778 + controlID: 76077 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: x: 0 y: 0 width: 806 - height: 399 + height: 516 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 5} @@ -201,7 +201,7 @@ MonoBehaviour: x: 0 y: 73 width: 805 - height: 378 + height: 495 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -638,9 +638,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.8987515, y: -2.0288723, z: 2.2176988} + m_Target: {x: 7.429, y: -3.721, z: 2.595} speed: 2 - m_Value: {x: 1.8987515, y: -2.0288723, z: 2.2176988} + m_Value: {x: 7.429, y: -3.721, z: 2.595} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -686,13 +686,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.102677666, y: -0.19943577, z: -0.021023579, w: -0.97430146} + m_Target: {x: -0.191416, y: 0.8085479, z: -0.3890785, w: -0.39778206} speed: 2 - m_Value: {x: 0.104105726, y: -0.20086272, z: -0.021478662, w: -0.9738352} + m_Value: {x: -0.19141577, y: 0.80854696, z: -0.38907802, w: -0.39778158} m_Size: - m_Target: 0.5660845 + m_Target: 10 speed: 2 - m_Value: 0.5660845 + m_Value: 10 m_Ortho: m_Target: 0 speed: 2 @@ -733,9 +733,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 399 + y: 516 width: 806 - height: 540 + height: 423 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} @@ -766,9 +766,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 523 - width: 808 - height: 468 + y: 589 + width: 805 + height: 402 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -851,10 +851,10 @@ MonoBehaviour: m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 375} - m_SelectedIDs: fc95fcff + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 687b0000 m_LastClickedID: 0 - m_ExpandedIDs: bcc7e7ffc0c7e7ff34cae7ff28ebe7ff02f0e7ff3a45e8fff445e8ff2a56e9ff5657e9ffb657e9ff6c5ae9ff74aee9ff78aee9ff36bae9ffced1e9ff5ae6e9ff46a5eaffd40bebfff00bebff521febff7479ebff267eebff58cdebff5421ecff3c5becff347aecfffc7eecff08deecff2838edfff03cedff649bedff8af8edffdabbeeffc2e0efffc6e0efffe2e0efff64e2efff68f4efff122af0ff6287f0ff44d4f0ff689ef1ffac0df2ff920df3ff960df3ffac37f3ff2640f3ff3e4bf3ffae4bf3ff6a4cf3ff7cb0f4ff38d5f4ff88fdf4ff6c45f5ffc65cf5ff76a2f5ff7aa2f5ffeea4f5fff8b8f5fffa10f6fffe10f6ff7213f6ff4418f6ff5cbcf6ff60bcf6ffd4bef6ff12c7f6ff3c23f7ff90a8f7ff94a8f7fffca9f7ffe0c8f7ffe8ddf7ff7e17f8ffa018f8ff0019f8ff0419f8ff781bf8ffc024f8ff9c3ef8ffe03ef8ffe243f8ff6892f8ffb2e8f8ff7cedf8ffce0df9fff00ef9ffd419f9ff7e4ff9ffae02faff7807faffc663faffa2befaff6e0ffbfffe6cfbff3072fcff5473fcff847dffffbc7dffffc8e8ffffeae9ffff66f3ffff76f5ffff2efbffff64800000e8810000b28500009e88000090890000928a0000628e0000b08e000078910000409b0100e69c0100b4a30100c0ea01007cf3010082f30100a0f7010038f80100a81e0200642702006a270200882b0200202c02006e51020014530200885302009453020050590200e259020018060300be07030030080300320803003c080300fa0d03008c0e0300bc130300b22003005822030026290300cca1030072a30300e6a3030040aa03005cbc030002be030076be0300d0c4030026d803009ad8030018ec03007eed030014f20300d6fa0300f4fe03008cff0300b00a0400560c0400c611040024130400a0690400466b040014720400363b0500d43b0500963f0500684005009a41050004420500b4480500c2490500ecdc05008add050028e20500c4e30500765e0600145f0600b06306004e650600122e0700ae2e07004c330700e834070012950700ba96070038970700fe9c0700829f0700a4a307003c1d0800b01d0800581f080026260800 + m_ExpandedIDs: 703ae6ff925ce6ff5090e6ffd8f3e6ff1656e7ffbcc7e7ffc0c7e7ff34cae7ff28ebe7ff02f0e7ff3a45e8fff445e8ff2a56e9ff5657e9ffb657e9ff6c5ae9ff74aee9ff78aee9ff36bae9ffced1e9ff5ae6e9ff46a5eaffd40bebfff00bebff521febff7479ebff267eebff58cdebff5421ecff3c5becff347aecfffc7eecff08deecff2838edfff03cedff649bedff8af8edffdabbeeffc2e0efffc6e0efffe2e0efff64e2efff68f4efff122af0ff6287f0ff44d4f0ff689ef1ffac0df2ff920df3ff960df3ffac37f3ff2640f3ff3e4bf3ffae4bf3ff6a4cf3ff7cb0f4ff38d5f4ff88fdf4ff6c45f5ffc65cf5ff76a2f5ff7aa2f5ffeea4f5fff8b8f5fffa10f6fffe10f6ff7213f6ff4418f6ff5cbcf6ff60bcf6ffd4bef6ff12c7f6ff3c23f7ff90a8f7ff94a8f7fffca9f7ffe0c8f7ffe8ddf7ff7e17f8ffa018f8ff0019f8ff0419f8ff781bf8ffc024f8ff9c3ef8ffe03ef8ffe243f8ff6892f8ffb2e8f8ff7cedf8ffce0df9fff00ef9ffd419f9ff7e4ff9ffae02faff7807faffc663faffa2befaff6e0ffbfffe6cfbff3072fcff5473fcff847dffffbc7dffffc8e8ffffeae9ffff66f3ffff76f5ffff2efbffff64800000e8810000b28500009e88000090890000928a0000628e0000b08e000078910000409b0100e69c0100b4a30100c0ea01007cf3010082f30100a0f7010038f80100a81e0200642702006a270200882b0200202c02006e51020014530200885302009453020050590200e259020018060300be07030030080300320803003c080300fa0d03008c0e0300bc130300b22003005822030026290300cca1030072a30300e6a3030040aa03005cbc030002be030076be0300d0c4030026d803009ad8030018ec03007eed030014f20300d6fa0300f4fe03008cff0300b00a0400560c0400c611040024130400a0690400466b040014720400363b0500d43b0500963f0500684005009a41050004420500b4480500c2490500ecdc05008add050028e20500c4e30500765e0600145f0600b06306004e650600122e0700ae2e07004c330700e834070012950700ba96070038970700fe9c0700829f0700a4a307003c1d0800b01d0800581f08002626080002380800aa39080078400800909f080004a0080048a00800aca10800 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -895,7 +895,7 @@ MonoBehaviour: serializedVersion: 2 x: 1126 y: 0 - width: 142 + width: 412 height: 939 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -927,7 +927,7 @@ MonoBehaviour: serializedVersion: 2 x: 1126 y: 73 - width: 140 + width: 410 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -950,7 +950,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_RenGongSouJing/Materials + - Assets/_Scenes m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -966,7 +966,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: be940b00 m_LastClickedID: 758974 - m_ExpandedIDs: ffffffff00000000f2770000f4770000f6770000f8770000fa770000fc770000fe770000007800000278000004780000067800000878000010780000127800001478000016780000187800001a7800001c7800001e78000020780000247800002a7800002c7800002e780000307800002c7b0000307b00004a7b00003ee2000044e2000046e200008ae2000058e30000 + m_ExpandedIDs: ffffffff00000000f2770000f4770000f6770000f8770000fa770000fc770000fe770000007800000278000004780000067800000878000010780000127800001478000016780000187800001a7800001c7800001e780000207800002a7800002c7800002e780000307800008ae2000058e30000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -991,10 +991,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 676} - m_SelectedIDs: fc95fcff - m_LastClickedID: -223748 - m_ExpandedIDs: ffffffff00000000f2770000f4770000f6770000f8770000fa770000fc770000fe770000007800000278000004780000067800000878000010780000127800001478000016780000187800001a7800001c7800001e78000020780000247800002a7800002c7800002e780000307800002c7b0000307b00004a7b00003ee2000044e2000046e200008ae2000058e3000090300100 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 687b0000 + m_LastClickedID: 31592 + m_ExpandedIDs: ffffffff00000000f2770000f4770000f6770000f8770000fa770000fc770000fe770000007800000278000004780000067800000878000010780000127800001478000016780000187800001a7800001c7800001e780000207800002a7800002c7800002e780000307800002c7b00008ae2000058e30000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1019,8 +1019,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: fc95fcff - m_LastClickedInstanceID: -223748 + m_SelectedInstanceIDs: 687b0000 + m_LastClickedInstanceID: 31592 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -1065,9 +1065,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1268 + x: 1538 y: 0 - width: 652 + width: 382 height: 939 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -1097,9 +1097,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1269 - y: 19 - width: 651 + x: 1538 + y: 73 + width: 381 height: 918 m_SerializedDataModeController: m_DataMode: 0