diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity
index 4930f164..2ea9a32b 100644
--- a/Assets/Scenes/LouDiXuMuQvan.unity
+++ b/Assets/Scenes/LouDiXuMuQvan.unity
@@ -549,6 +549,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 7412938236490308473, guid: cb7752755a3c5c24f94d8addde046780, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 7925839672736224713, guid: cb7752755a3c5c24f94d8addde046780, type: 3}
propertyPath: m_DirtyAABB
value: 0
@@ -8631,6 +8635,8 @@ PlayableDirector:
value: {fileID: 2052914619}
- key: {fileID: 5637938698038186393, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
value: {fileID: 127292477}
+ - key: {fileID: 5717630058315011877, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ value: {fileID: 0}
m_ExposedReferences:
m_References: []
--- !u!95 &340397423
@@ -10991,6 +10997,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -0.000019515399
objectReference: {fileID: 0}
+ - target: {fileID: 2505708219727062027, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 2529565380187215806, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -0.0000048408174
@@ -17270,6 +17280,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: -5660353031589365734, guid: 624a6a68ef961a945a5f74984231261d, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: -3951107505745390576, guid: 624a6a68ef961a945a5f74984231261d, type: 3}
propertyPath: m_DirtyAABB
value: 0
@@ -20135,6 +20149,7 @@ Transform:
- {fileID: 567002762}
- {fileID: 564553600}
- {fileID: 340397419}
+ - {fileID: 4419455178047328931}
- {fileID: 1884177256}
- {fileID: 1462827463}
- {fileID: 1241056078}
@@ -27027,15 +27042,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 467109946347806311, guid: e1761819aac3ed74682aa8337a23d32e, type: 3}
propertyPath: m_LocalPosition.x
- value: 0
+ value: 10000
objectReference: {fileID: 0}
- target: {fileID: 467109946347806311, guid: e1761819aac3ed74682aa8337a23d32e, type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: 10000
objectReference: {fileID: 0}
- target: {fileID: 467109946347806311, guid: e1761819aac3ed74682aa8337a23d32e, type: 3}
propertyPath: m_LocalPosition.z
- value: 0
+ value: 10000
objectReference: {fileID: 0}
- target: {fileID: 467109946347806311, guid: e1761819aac3ed74682aa8337a23d32e, type: 3}
propertyPath: m_LocalRotation.w
@@ -27079,7 +27094,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5853507596174565926, guid: e1761819aac3ed74682aa8337a23d32e, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 2999783213077156870, guid: e1761819aac3ed74682aa8337a23d32e, type: 3}
@@ -38465,6 +38480,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 738442634}
m_Modifications:
+ - target: {fileID: 680801687641314985, guid: b33b5860bb968144ebe7f752039905b3, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3337227587589085785, guid: b33b5860bb968144ebe7f752039905b3, type: 3}
propertyPath: m_Name
value: CZ_FengXian_Timeline
@@ -38513,6 +38532,14 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 3488875140114452244, guid: b33b5860bb968144ebe7f752039905b3, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 9afb30013efac994dbaa691b16e73d4f, type: 2}
+ - target: {fileID: 3488875140114452244, guid: b33b5860bb968144ebe7f752039905b3, type: 3}
+ propertyPath: m_Materials.Array.data[6]
+ value:
+ objectReference: {fileID: 2100000, guid: 64987e02868b39a45b978c4e74382520, type: 2}
- target: {fileID: 3736996039772153870, guid: b33b5860bb968144ebe7f752039905b3, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
@@ -58309,6 +58336,95 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: efc296152c4417246aa4c113b7620912, type: 3}
m_PrefabInstance: {fileID: 2135085075}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &3899800330979100697
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4419455178047328931}
+ - component: {fileID: 4419455178047328933}
+ - component: {fileID: 4419455178047328932}
+ m_Layer: 0
+ m_Name: 62JieZhaTimeLine
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4419455178047328931
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3899800330979100697}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0.38123316, y: 1.4186081, z: -0.054317735}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 738442634}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &4419455178047328932
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3899800330979100697}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 0}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
+--- !u!320 &4419455178047328933
+PlayableDirector:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3899800330979100697}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_PlayableAsset: {fileID: 11400000, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ m_InitialState: 0
+ m_WrapMode: 2
+ m_DirectorUpdateMode: 1
+ m_InitialTime: 0
+ m_SceneBindings:
+ - key: {fileID: -6726169477075764469, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ value: {fileID: 340397423}
+ - key: {fileID: -6011643036644492985, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ value: {fileID: 425714257}
+ - key: {fileID: -3062024440974558404, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ value: {fileID: 1845315472}
+ - key: {fileID: 49051666895431854, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ value: {fileID: 1766311430}
+ - key: {fileID: 3635627150024222816, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ value: {fileID: 1737058519}
+ - key: {fileID: 7908326029981873502, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ value: {fileID: 2052914620}
+ - key: {fileID: 553740446300955974, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ value: {fileID: 2052914619}
+ - key: {fileID: 5637938698038186393, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ value: {fileID: 127292477}
+ - key: {fileID: 5717630058315011877, guid: efe6fefc19e0d264d8bf9676c1d123c4, type: 2}
+ value: {fileID: 340397420}
+ m_ExposedReferences:
+ m_References: []
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
diff --git a/Assets/TimeLines/JieZha.playable b/Assets/TimeLines/JieZha.playable
index 1341f409..104fb303 100644
--- a/Assets/TimeLines/JieZha.playable
+++ b/Assets/TimeLines/JieZha.playable
@@ -930,6 +930,7 @@ MonoBehaviour:
- {fileID: 553740446300955974}
- {fileID: 7908326029981873502}
- {fileID: 5637938698038186393}
+ - {fileID: 5717630058315011877}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
@@ -1122,6 +1123,18 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
+--- !u!114 &682251542578614079
+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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
--- !u!114 &1440298104858284885
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1472,6 +1485,99 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
+--- !u!114 &5717630058315011877
+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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (3)
+ 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_Version: 1
+ m_Start: 0
+ m_ClipIn: 0
+ m_Asset: {fileID: 682251542578614079}
+ m_Duration: 7.4
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 5717630058315011877}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_MixOutCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3
--- !u!114 &5968956867563139480
MonoBehaviour:
m_ObjectHideFlags: 1
diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml
index ccf9b16e..7a883261 100644
--- a/Data/Xml/Exam.xml
+++ b/Data/Xml/Exam.xml
@@ -1330,7 +1330,7 @@
-
+
@@ -1577,7 +1577,7 @@
-
+
@@ -1986,9 +1986,9 @@
-
+
-
+
@@ -2142,10 +2142,9 @@
-
+
-
diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml
index 19464d19..8a865656 100644
--- a/Data/Xml/Study.xml
+++ b/Data/Xml/Study.xml
@@ -896,7 +896,7 @@
-
+
@@ -1355,7 +1355,7 @@
-
+
@@ -1453,7 +1453,7 @@
-
+
@@ -1473,7 +1473,7 @@
-
+
@@ -1507,8 +1507,8 @@
-
-
+
+
@@ -1517,7 +1517,7 @@
-
+
@@ -1562,7 +1562,7 @@
-
+
@@ -1570,7 +1570,7 @@
-
+
@@ -1586,7 +1586,7 @@
-
+
@@ -1607,11 +1607,11 @@
-
+
-
+
@@ -1666,7 +1666,7 @@
-
+
@@ -1830,7 +1830,7 @@
-
+
@@ -1861,7 +1861,7 @@
-
+
@@ -1890,13 +1890,14 @@
+
+
-
@@ -1972,7 +1973,10 @@
-
+
+
+
+
@@ -2103,7 +2107,7 @@
-
+
@@ -2120,7 +2124,7 @@
-
+
@@ -2137,6 +2141,7 @@
+
@@ -2175,6 +2180,8 @@
+
+
@@ -2329,6 +2336,8 @@
+
+
@@ -2344,16 +2353,17 @@
-
-
+
+
+
-
+
@@ -2366,11 +2376,22 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -2435,9 +2456,8 @@
-
-
+
@@ -2615,8 +2635,8 @@
-
-
+
+
@@ -2660,6 +2680,7 @@
+
@@ -2678,11 +2699,6 @@
-
-
-
-
-
@@ -2702,18 +2718,28 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2728,6 +2754,7 @@
+
@@ -2777,6 +2804,7 @@
+
@@ -2797,7 +2825,6 @@
-
@@ -3100,6 +3127,7 @@
+