diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index e8c47604..d5d07cfc 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -52227,7 +52227,7 @@ Transform: m_GameObject: {fileID: 1813719263} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2.242, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/TimeLines/NieZi.playable b/Assets/TimeLines/NieZi.playable index a4862f55..d3e2b855 100644 --- a/Assets/TimeLines/NieZi.playable +++ b/Assets/TimeLines/NieZi.playable @@ -132,10 +132,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 6.875000000000002 + m_Start: 6.843333333333334 m_ClipIn: 0 m_Asset: {fileID: 8643713081373007835} - m_Duration: 1.168333333333333 + m_Duration: 1.1983333333333324 m_TimeScale: 1 m_ParentTrack: {fileID: -8698583720022765527} m_EaseInDuration: 0 @@ -627,11 +627,11 @@ MonoBehaviour: - {fileID: 9160873506188089420} - {fileID: 4137722220298942050} - {fileID: -7684003901172775562} - m_FixedDuration: 0 + m_FixedDuration: 8.083333333333334 m_EditorSettings: m_Framerate: 24 m_ScenePreview: 1 - m_DurationMode: 0 + m_DurationMode: 1 m_MarkerTrack: {fileID: 0} --- !u!114 &2164549436353458450 MonoBehaviour: @@ -670,7 +670,7 @@ MonoBehaviour: m_Start: 0.041666666666666664 m_ClipIn: 0 m_Asset: {fileID: 8113265744172699785} - m_Duration: 7.96 + m_Duration: 7.999999999999999 m_TimeScale: 1 m_ParentTrack: {fileID: 2443531051310244690} m_EaseInDuration: 0 @@ -1208,7 +1208,7 @@ MonoBehaviour: m_Start: 6.843333333333334 m_ClipIn: 0 m_Asset: {fileID: -1377512324051618921} - m_Duration: 1.2000000000000002 + m_Duration: 1.1983333333333324 m_TimeScale: 1 m_ParentTrack: {fileID: 5926033148628183196} m_EaseInDuration: 0 @@ -1394,7 +1394,7 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: -6066618728774813646} - m_Duration: 8.125 + m_Duration: 8.041666666666666 m_TimeScale: 1 m_ParentTrack: {fileID: 6761629114487467806} m_EaseInDuration: 0 diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index 0034b70e..5dbc0963 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -1508,6 +1508,7 @@ + @@ -1532,6 +1533,7 @@ + @@ -1560,6 +1562,10 @@ + + + + @@ -1579,8 +1585,8 @@ - - + @@ -1643,18 +1649,7 @@ - - - - - - - - - - - - + @@ -1678,14 +1673,16 @@ - + + + + --> + --> + --> diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml index 77078c75..07b9d3df 100644 --- a/Data/Xml/Study.xml +++ b/Data/Xml/Study.xml @@ -1866,8 +1866,7 @@ - - + @@ -1893,6 +1892,8 @@ + + @@ -1911,6 +1912,7 @@ + @@ -1919,6 +1921,7 @@ + @@ -1941,6 +1944,7 @@ + @@ -2066,7 +2070,7 @@ - + @@ -2108,7 +2112,7 @@ - + @@ -2176,7 +2180,6 @@ - @@ -2305,7 +2308,6 @@ - @@ -3321,6 +3323,7 @@ +