提交内容

Assets/Scenes/Scene.unity

@@ -5596,7 +5596,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1006628450200583063, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Data/Xml/Pig5.xml

@@ -13,8 +13,11 @@
           <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 type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_JianYaQian1" isShow="false" isDevice="false"></Action>
-
+          <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_JianYaQian2" isShow="false" isDevice="false"></Action>
+          <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan" isShow="false" isDevice="false"></Action>
+          <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoZhu" isShow="false" isDevice="false"></Action>
+          
         </Action>
       </Enter>
     </State>
@@ -72,15 +75,6 @@
 
 
   <Device>
-    <Name>剪牙钳</Name>
-    <HighLight color="255,255,255"/>
-    <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JianYaQian</Path>
-    <Tip>剪牙钳</Tip>
-    <Icon>工具/剪牙钳.png</Icon>
-  </Device>
-  <Device>
-
-
     <Name>医用酒精</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_YiYongJiuJing</Path>
@@ -157,6 +151,12 @@
     <Icon>工具/碘酊.png</Icon>
   </Device>
 
+  <Device>
+    <Name>量杯</Name>
+    <HighLight color="255,255,255"/>
+    <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_LiangBei</Path>
+    <Tip>量杯</Tip>
+  </Device>
 
 
   <Device>
@@ -169,12 +169,6 @@
 
 
 
-  <Device>
-    <Name>量杯</Name>
-    <HighLight color="255,255,255"/>
-    <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_LiangBei</Path>
-    <Tip>量杯</Tip>
-  </Device>
 
 
 
@@ -466,7 +460,12 @@
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/juese" isShow="false"></Action>
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoZhu" isShow="false"></Action>
 
-            
+
+            <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_JianYaQian1" isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_JianYaQian2" isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan" isShow="false" isDevice="false"></Action>
+          
+
             <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_ShouNaDai" isShow="true"></Action>
             
             <!--点击下一步，进行-->
@@ -485,14 +484,14 @@
           </Action>
         </Start>
 
-        <!--<Finished>
+        <Finished>
           <Action type="Sequence">
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/juese" isShow="true"></Action>
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoZhu" isShow="true"></Action>
             <Action type="StrEvent" name="HighLightTrigger" value="true"></Action>
 
           </Action>
-        </Finished>-->
+        </Finished>
         
       </Step>
 
@@ -500,17 +499,17 @@
 
 
       <Step name="人员准备">
-        <!--<Reset>
+        <Reset>
           <Action type="Sequence">
 
 
 
-            <Action type="Parallel">
+            <!--<Action type="Parallel">
               <Action type="Rotate" value="FlyCamera" to="17.27, 183.30, 0.00" time="0"></Action>
 
               <Action type="Move" value="FlyCamera" to="3.97, 3.37, -24.80" time="0"></Action>
 
-            </Action>
+            </Action>-->
 
 
 
@@ -520,12 +519,12 @@
 
 
 
-            --><!--初始化人员准备--><!--
+            <!--初始化人员准备
-            --><!--人物身上衣服隐藏--><!--
+            人物身上衣服隐藏-->
             <Action type="Show" value="ExamPrefab/huanzhuang/ChuanDai/ChuanDai_GongZuoFu" isShow="false"></Action>
             <Action type="Show" value="ExamPrefab/huanzhuang/ChuanDai/ChuanDai_KouZhao" isShow="false"></Action>
             <Action type="Show" value="ExamPrefab/huanzhuang/ChuanDai/ChuanDai_MaoZi" isShow="false"></Action>
-            --><!--物品显示--><!--
+            <!--物品显示-->
             <Action type="Show" value="ExamPrefab/huanzhuang/WuPin/GongZuoFu" isShow="true"></Action>
             <Action type="Show" value="ExamPrefab/huanzhuang/WuPin/MaoZi" isShow="true"></Action>
             <Action type="Show" value="ExamPrefab/huanzhuang/WuPin/KouZhao" isShow="true"></Action>
@@ -539,7 +538,7 @@
 
 
           </Action>
-        </Reset>-->
+        </Reset>
 
         <Start>
           <Action type="Sequence">