diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/78-83/CZ_FengZian_Timeline.playable b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/78-83/CZ_FengZian_Timeline.playable index 0155a324..67e9f156 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/78-83/CZ_FengZian_Timeline.playable +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/78-83/CZ_FengZian_Timeline.playable @@ -2716,7 +2716,7 @@ MonoBehaviour: m_Framerate: 24 m_ScenePreview: 1 m_DurationMode: 0 - m_MarkerTrack: {fileID: 0} + m_MarkerTrack: {fileID: 7983595410031648075} --- !u!114 &350463013271141916 MonoBehaviour: m_ObjectHideFlags: 1 @@ -4878,6 +4878,29 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &7983595410031648075 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: 2a16748d9461eae46a725db9776d5390, type: 3} + m_Name: Markers + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: [] --- !u!114 &8279985177299490839 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/78-83/ChiZhenQian/ChiZhenQian.controller b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/78-83/ChiZhenQian/ChiZhenQian.controller index 48bfb7dd..3179cf0b 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/78-83/ChiZhenQian/ChiZhenQian.controller +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/78-83/ChiZhenQian/ChiZhenQian.controller @@ -20,8 +20,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 1827226128182048838, guid: 3152c0af4eda28540b1e18bbbc9d47bd, - type: 3} + m_Motion: {fileID: 1827226128182048838, guid: 3152c0af4eda28540b1e18bbbc9d47bd, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -38,7 +37,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2866060649046638932} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 360, y: 80, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index f7bba759..9baff681 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -3674,7 +3674,7 @@ Transform: - {fileID: 1402651746} - {fileID: 71744107} - {fileID: 476648428} - - {fileID: 1851704361} + - {fileID: 952697412} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &758617108 @@ -4584,6 +4584,76 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -7552124572501246155, guid: e6e79ed73fd24534da72475c045ec1c9, type: 3} +--- !u!1001 &952697411 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 738442634} + m_Modifications: + - target: {fileID: 3337227587589085785, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_Name + value: CZ_FengXian_Timeline + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085785, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3337227587589085787, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + propertyPath: m_PlayableAsset + value: + objectReference: {fileID: 11400000, guid: 55ca6e150830fc24fb9725bb747ad249, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b33b5860bb968144ebe7f752039905b3, type: 3} +--- !u!4 &952697412 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} + m_PrefabInstance: {fileID: 952697411} + m_PrefabAsset: {fileID: 0} --- !u!1 &965358906 GameObject: m_ObjectHideFlags: 0 @@ -24589,76 +24659,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 0} ---- !u!1001 &1851704360 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 738442634} - m_Modifications: - - target: {fileID: 3337227587589085785, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_Name - value: CZ_FengXian_Timeline - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085785, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3337227587589085787, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - propertyPath: m_PlayableAsset - value: - objectReference: {fileID: 11400000, guid: 55ca6e150830fc24fb9725bb747ad249, type: 2} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b33b5860bb968144ebe7f752039905b3, type: 3} ---- !u!4 &1851704361 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3337227587589085786, guid: b33b5860bb968144ebe7f752039905b3, type: 3} - m_PrefabInstance: {fileID: 1851704360} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1932204885 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index 5910bfdc..9c7b1554 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -2182,10 +2182,10 @@ - + - + @@ -2201,8 +2201,7 @@ - - + @@ -2211,6 +2210,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +