提交修改内容

Assets/Scenes/Scene.unity

@@ -19530,7 +19530,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2871732439531400898, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2889164432347002931, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
       propertyPath: m_LocalRotation.y

Assets/Scripts/UI/UIBody3DMenuTree.cs

@@ -3,7 +3,6 @@ using UnityEngine.UI;
 using XMLTool;
 using System.Collections.Generic;
 using TMPro;
-using UnityEditor.Hardware;
 using DG.Tweening;
 
 namespace QFramework.Example

Assets/XiaoDuQiXieTimeLie.playable

@@ -94,7 +94,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.98333335
+        time: 0.5833333
         value: {x: 0, y: 0.22345045, z: -0.2314395}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -103,7 +103,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 1.15
+        time: 0.95
         value: {x: 0.5336969, y: 0.22345045, z: -0.2314395}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -112,19 +112,19 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 1.2
+        time: 1
         value: {x: 0.5336969, y: 0.16345048, z: -0.2314395}
-        inSlope: {x: 0, y: -1.0699997, z: 0}
+        inSlope: {x: 0, y: -1.0700003, z: 0}
-        outSlope: {x: 0, y: -1.0699997, z: 0}
+        outSlope: {x: 0, y: -1.0700003, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 1.25
+        time: 1.05
         value: {x: 0.5336969, y: 0.11645046, z: -0.2314395}
-        inSlope: {x: 0, y: -0.9428572, z: 0}
+        inSlope: {x: 0, y: -0.34736842, z: 0}
-        outSlope: {x: 0, y: -0.9428572, z: 0}
+        outSlope: {x: 0, y: -0.34736842, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@@ -266,7 +266,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.98333335
+        time: 0.5833333
         value: 0
         inSlope: 0
         outSlope: 0
@@ -275,7 +275,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.15
+        time: 0.95
         value: 0.5336969
         inSlope: 0
         outSlope: 0
@@ -284,7 +284,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.2
+        time: 1
         value: 0.5336969
         inSlope: 0
         outSlope: 0
@@ -293,7 +293,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.25
+        time: 1.05
         value: 0.5336969
         inSlope: 0
         outSlope: 0
@@ -341,7 +341,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.98333335
+        time: 0.5833333
         value: 0.22345045
         inSlope: 0
         outSlope: 0
@@ -350,7 +350,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.15
+        time: 0.95
         value: 0.22345045
         inSlope: 0
         outSlope: 0
@@ -359,19 +359,19 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.2
+        time: 1
         value: 0.16345048
-        inSlope: -1.0699997
+        inSlope: -1.0700003
-        outSlope: -1.0699997
+        outSlope: -1.0700003
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.25
+        time: 1.05
         value: 0.11645046
-        inSlope: -0.9428572
+        inSlope: -0.34736842
-        outSlope: -0.9428572
+        outSlope: -0.34736842
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
@@ -416,7 +416,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.98333335
+        time: 0.5833333
         value: -0.2314395
         inSlope: 0
         outSlope: 0
@@ -425,7 +425,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.15
+        time: 0.95
         value: -0.2314395
         inSlope: 0
         outSlope: 0
@@ -434,7 +434,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.2
+        time: 1
         value: -0.2314395
         inSlope: 0
         outSlope: 0
@@ -443,7 +443,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.25
+        time: 1.05
         value: -0.2314395
         inSlope: 0
         outSlope: 0
@@ -697,7 +697,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.2
+        time: 0.33333334
         value: {x: 0, y: 0.23406005, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -706,7 +706,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 1.15
+        time: 0.8333333
         value: {x: 0.32820177, y: 0.23406005, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -791,7 +791,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.2
+        time: 0.33333334
         value: 0
         inSlope: 0
         outSlope: 0
@@ -800,7 +800,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.15
+        time: 0.8333333
         value: 0.32820177
         inSlope: 0
         outSlope: 0
@@ -839,7 +839,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.2
+        time: 0.33333334
         value: 0.23406005
         inSlope: 0
         outSlope: 0
@@ -848,7 +848,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.15
+        time: 0.8333333
         value: 0.23406005
         inSlope: 0
         outSlope: 0
@@ -887,7 +887,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.2
+        time: 0.33333334
         value: 0
         inSlope: 0
         outSlope: 0
@@ -896,7 +896,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.15
+        time: 0.8333333
         value: 0
         inSlope: 0
         outSlope: 0
@@ -1504,7 +1504,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: {x: 0, y: 0.2752999, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -1513,7 +1513,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 1.15
+        time: 0.9166667
         value: {x: 0.00040003285, y: 0.2752999, z: -0.5279}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -1598,7 +1598,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -1607,7 +1607,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.15
+        time: 0.9166667
         value: 0.00040003285
         inSlope: 0
         outSlope: 0
@@ -1646,7 +1646,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 0.2752999
         inSlope: 0
         outSlope: 0
@@ -1655,7 +1655,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.15
+        time: 0.9166667
         value: 0.2752999
         inSlope: 0
         outSlope: 0
@@ -1694,7 +1694,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -1703,7 +1703,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1.15
+        time: 0.9166667
         value: -0.5279
         inSlope: 0
         outSlope: 0

Data/Xml/Pig5.xml

@@ -13,6 +13,8 @@
           <Action type="UIShow" value="UIOperationList"></Action>
           <Action type="NextOperation"></Action>
           <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4 (1)"  isShow="false" ></Action>
+          <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4 (1)"  isShow="false" ></Action>
+
         </Action>
       </Enter>
     </State>
@@ -636,15 +638,15 @@
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoZhu_GangWan_FuZhi" isShow="false" isDevice="false"></Action>
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/juese" isShow="true" isDevice="false"></Action>
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoZhu" isShow="true" isDevice="false"></Action>
-      
-
             <Action type="HighLight" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoTuiChe/SM_XiaoWuJian/SM_WaiKeShouShuDao1/SM_WaiKeShouShuDao" isHigh="false" color="0,255,0,255"></Action>
             <Action type="HighLight" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoTuiChe/SM_XiaoWuJian/SM_DianFu" isHigh="false" color="0,255,0,255"></Action>
-             <!--播放动画-->
+            
+            
+            <!--播放动画-->
+            <Action type="Anim" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6" animName="QS0.1" speed="-10"></Action>
             <Action type="Anim" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6" animName="QS0" speed="-10"></Action>
-            <Action type="Anim" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6" animName="QS0" frame="0"></Action>
+            <!--播放动画-->
-
+            <Action type="Anim" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6" animName="QS0" frame="1"></Action>
-            
 
           </Action>
         </Reset>
@@ -661,8 +663,12 @@
             <Action type="Rotate" value="FlyCamera" to="20.12, 90.55, 0.004" time="0"></Action>
             <Action type="Show" value="UIRoot/RightBottom/UICameraSwitch/Near" isShow="true" ></Action>
             <Action type="Show" value="UIRoot/RightBottom/UICameraSwitch/Far" isShow="true" ></Action>
-            <Action type="CameraSwitch"  nearPos="4.39, 1.75, -0.15" nearRot="39.37, 359.75, 0.00" nearTime="0" normalPos="1.77, 1.84, -0.59" normalRot="20.12, 90.55, 0.00" normalTime="0" isOn="normal"></Action>
 
+            <!--播放动画-->
+            <Action type="Anim" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6" animName="QS0" frame="1"></Action>
+
+
+            <Action type="CameraSwitch"  nearPos="4.39, 1.75, -0.15" nearRot="39.37, 359.75, 0.00" nearTime="0" normalPos="1.77, 1.84, -0.59" normalRot="20.12, 90.55, 0.00" normalTime="0" isOn="normal"></Action>