diff --git a/Assets/Resources/UIPrefabs/OperationStepPanel.prefab b/Assets/Resources/UIPrefabs/OperationStepPanel.prefab index a269722..9f2f5f5 100644 --- a/Assets/Resources/UIPrefabs/OperationStepPanel.prefab +++ b/Assets/Resources/UIPrefabs/OperationStepPanel.prefab @@ -1467,7 +1467,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/TimeLine/PTXZTimeLineCtrl.playable b/Assets/TimeLine/PTXZTimeLineCtrl.playable index d5902eb..3463d35 100644 --- a/Assets/TimeLine/PTXZTimeLineCtrl.playable +++ b/Assets/TimeLine/PTXZTimeLineCtrl.playable @@ -2710,10 +2710,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 9 + m_Start: 9.016666666666667 m_ClipIn: 0 m_Asset: {fileID: 662616078605477273} - m_Duration: 5 + m_Duration: 4.9833333333333325 m_TimeScale: 1 m_ParentTrack: {fileID: 2778359960641542741} m_EaseInDuration: 0 diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index 934cbba..a359b9b 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -12402,7 +12402,7 @@ PlayableDirector: m_GameObject: {fileID: 909784101} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 7bff6f14e388dd74dad4e09245b4dc6f, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: d8a0f6f978955544082ec6b5019a22a6, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 571764a..e3da85f 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,10 +18,10 @@ EditorUserSettings: value: 5707515e06045e030e5b0d7615770f44104e1a7c797b75697d781b67e0e3636a flags: 0 RecentlyUsedSceneGuid-4: - value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 RecentlyUsedSceneGuid-5: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index d044be3..b60448f 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: 42785 + controlID: 44936 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 42786 + controlID: 44937 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -639,9 +639,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.7454869, y: -2.565852, z: 1.7403708} + m_Target: {x: 0.7354974, y: -2.6309233, z: 40.052116} speed: 2 - m_Value: {x: -0.7454869, y: -2.565852, z: 1.7403708} + m_Value: {x: 0.7354974, y: -2.6309233, z: 40.052116} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -687,13 +687,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.27092525, y: -0.103713125, z: 0.02937239, w: 0.9565608} + m_Target: {x: 0.28211677, y: 0.056083266, z: -0.016524425, w: 0.95761144} speed: 2 - m_Value: {x: 0.27092144, y: -0.103711665, z: 0.029371977, w: 0.9565473} + m_Value: {x: 0.28211284, y: 0.056082483, z: -0.016524194, w: 0.9575981} m_Size: - m_Target: 0.57943845 + m_Target: 0.3796454 speed: 2 - m_Value: 0.57943845 + m_Value: 0.3796454 m_Ortho: m_Target: 0 speed: 2 @@ -928,7 +928,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 50aa0100 m_LastClickedID: 0 - m_ExpandedIDs: 04eae6ffe651e7ffd892e7fff497e7ffd00ce8ff8e44e8ff0c60e8ff5862e8ff6a62e8ff6c24e9ff0e68e9ffc8ace9ff8af3e9ff3099eaff029aeaffead2eaff0cd3eaffe051eeff2437efff7853efff4078efff569eefff62b8efffc0bdefff4415f0ffe45bf0ffc4d3f0ffee14f1ff4a74f1ff34b5f1ffbc19f2ff2060f2ff18c3f2ffc2fff2ffda04f3fff46df3ffb6b4f3ffd408f4ff7a49f4ffb27ff4fff288f4ffc289f4ff90c2f4ffaac2f4ff306cf5ff00b9f5ff58b9f5ffe8b9f5ff427ff6ff7ab5f6ff8644f7ffce55f7ffa290fbfffec6fbff745ffdffbc95fdffc698fdfff4ffffff32780200527802005ea50300eee503000ee6030010b7040052bc040092c004002ac104008cf5040062f8040024f90400b8f90400d01f050024200500f8220500ba23050090340500e4340500b83705007a380500928805002a8c0500828c050036dc0500c0dc05008ae10500d2e40500e0e505007ae60500a606060088090600fe0906004e0a0600fa0b060050100600705a0600185e060098840600768706003c880600ca8806008a9906002e9d060078be060098be06005cbe0800b2be08003abf08008ec1080056c208004ac7080058c80800f2c8080024fe0800e4010900361309008a1309004a170900 + m_ExpandedIDs: c468e6ff30a6e6ff04eae6ffe651e7ffd892e7fff497e7ffd00ce8ff8e44e8ff0c60e8ff5862e8ff6a62e8ff6c24e9ff0e68e9ffc8ace9ff8af3e9ff3099eaff029aeaffead2eaff0cd3eaffe051eeff2437efff7853efff4078efff569eefff62b8efffc0bdefff4415f0ffe45bf0ffc4d3f0ffee14f1ff4a74f1ff34b5f1ffbc19f2ff2060f2ff18c3f2ffc2fff2ffda04f3fff46df3ffb6b4f3ffd408f4ff7a49f4ffb27ff4fff288f4ffc289f4ff90c2f4ffaac2f4ff306cf5ff00b9f5ff58b9f5ffe8b9f5ff427ff6ff7ab5f6ff8644f7ffce55f7ffa290fbfffec6fbff745ffdffbc95fdffc698fdfff4ffffff32780200527802005ea50300eee503000ee6030010b7040052bc040092c004002ac104008cf5040062f8040024f90400b8f90400d01f050024200500f8220500ba23050090340500e4340500b83705007a380500928805002a8c0500828c050036dc0500c0dc05008ae10500d2e40500e0e505007ae60500a606060088090600fe0906004e0a0600fa0b060050100600705a0600185e060098840600768706003c880600ca8806008a9906002e9d060078be060098be06005cbe0800b2be08003abf08008ec1080056c208004ac7080058c80800f2c8080024fe0800e4010900361309008a1309004a1709005e530900da550900d0580900245d0900 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1068,7 +1068,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 50aa0100 m_LastClickedID: 109136 - m_ExpandedIDs: 8235fbffffffffff000000003c060000040700000808000090080000ac08000060090000dc0a0000740c000054100000a4100000 + m_ExpandedIDs: 8235fbffffffffff000000003c06000004070000380700000808000090080000ac08000060090000dc0a0000740c000054100000a4100000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 77b14de..6cc3197 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 492} m_MaxSize: {x: 10000, y: 10000} @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 133 + controlID: 51 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -146,7 +146,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 28 + controlID: 20 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,15 +165,16 @@ MonoBehaviour: x: 0 y: 0 width: 975 - height: 305 + height: 367 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 13} m_Panes: + - {fileID: 13} - {fileID: 14} - {fileID: 15} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 2 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -190,17 +191,16 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 305 + y: 367 width: 975 - height: 634 + height: 572 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 13} - - {fileID: 16} + - {fileID: 12} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -218,13 +218,13 @@ MonoBehaviour: serializedVersion: 2 x: 975 y: 0 - width: 293 + width: 360 height: 939 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 17} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 --- !u!114 &10 @@ -242,16 +242,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1268 + x: 1335 y: 0 - width: 287 + width: 282 height: 939 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 18} - - {fileID: 12} + - {fileID: 17} m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 @@ -269,53 +268,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1555 + x: 1617 y: 0 - width: 365 + width: 303 height: 939 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 19} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 -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: 0} - m_Name: - m_EditorClassIdentifier: Unity.PlasticSCM.Editor:Unity.PlasticSCM.Editor:PlasticWindow - m_MinSize: {x: 600, y: 350} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Unity Version Control - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1268 - y: 73 - width: 285 - height: 918 - 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 - mForceToReOpen: 0 ---- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -337,9 +301,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 378 + y: 440 width: 974 - height: 613 + height: 551 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -393,28 +357,28 @@ MonoBehaviour: x: 0 y: 21 width: 974 - height: 592 - m_Scale: {x: 0.5072917, y: 0.5072917} - m_Translation: {x: 487, y: 296} + height: 530 + m_Scale: {x: 0.49074075, y: 0.49074075} + m_Translation: {x: 487, y: 265} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -960 - y: -583.4907 - width: 1920 - height: 1166.9814 + x: -992.3773 + y: -540 + width: 1984.7546 + height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.5072917 - m_LastWindowPixelSize: {x: 974, y: 613} + m_defaultScale: 0.49074075 + m_LastWindowPixelSize: {x: 974, y: 551} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &14 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -438,7 +402,7 @@ MonoBehaviour: x: 0 y: 73 width: 974 - height: 284 + height: 346 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -875,9 +839,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 10.434972, y: -2.2629445, z: 39.13682} + m_Target: {x: 1389.8503, y: 311.64468, z: -9.742203} speed: 2 - m_Value: {x: 10.434972, y: -2.2629445, z: 39.13682} + m_Value: {x: 1389.8503, y: 311.64468, z: -9.742203} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -923,17 +887,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.3226844, y: 0.39013365, z: -0.14818634, w: 0.84954745} + m_Target: {x: 0.107165255, y: -0.10716651, z: 0.0116129, w: 0.9884074} speed: 2 - m_Value: {x: 0.32268125, y: 0.39012983, z: -0.1481849, w: 0.84953916} + m_Value: {x: 0.107162416, y: -0.10716367, z: 0.011612592, w: 0.9883812} m_Size: - m_Target: 0.5869539 + m_Target: 276.51495 speed: 2 - m_Value: 0.5869539 + m_Value: 276.51495 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -947,14 +911,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.29916278, y: -0.3015707, z: 0.100279324, w: -0.8997489} + m_LastSceneViewRotation: {x: 0.15092234, y: -0.0029663926, z: 0.00045112488, w: 0.98855543} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &15 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1027,7 +991,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &16 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1049,9 +1013,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 378 + y: 73 width: 974 - height: 613 + height: 346 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1071,7 +1035,7 @@ MonoBehaviour: m_SequencePath: m_SelectionRoot: 0 m_SubElements: [] ---- !u!114 &17 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1094,7 +1058,7 @@ MonoBehaviour: serializedVersion: 2 x: 975 y: 73 - width: 291 + width: 358 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1109,9 +1073,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 46200100 m_LastClickedID: 0 - m_ExpandedIDs: 6490ffff2efbffff + m_ExpandedIDs: 2ab3ffffc8b8ffff22f5ffff2efbffff381c0100222001003420010046200100d2200100c6210100e4230100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1135,7 +1099,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 93c725b8747526f4cb8251ed42340bc3 ---- !u!114 &18 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1156,9 +1120,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1268 + x: 1335 y: 73 - width: 285 + width: 280 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1180,8 +1144,7 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: - - Assets/StreamingAssets/ExcelJson + m_Folders: [] m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1190,14 +1153,14 @@ MonoBehaviour: m_StartGridSize: 16 m_LastFolders: [] m_LastFoldersGridSize: 16 - m_LastProjectPath: E:\Work\LouDiXvMu\LouDiXvMu_PRO\LoudiXvmuNiu + m_LastProjectPath: E:\Work\LouDiXvMu\LouDiXvMu_PRO\GitPro\loudixvmuniu m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} m_SelectedIDs: be940b00 m_LastClickedID: 758974 - m_ExpandedIDs: 000000004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000 + m_ExpandedIDs: 00000000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e740000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1225,7 +1188,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000d0740000d2740000d474000062770000887700008a770000 + m_ExpandedIDs: ffffffff00000000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000000770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1281,7 +1244,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 216 ---- !u!114 &19 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1302,9 +1265,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1555 + x: 1617 y: 73 - width: 364 + width: 302 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1319,7 +1282,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 448 + m_CachedPref: 220 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1