提交，模块1，考核，道具选择界面

Assets/Scripts/UI/UITools.cs

@@ -45,6 +45,7 @@ namespace QFramework.Example
             {
                 var item = DeviceController.Instance.GetDevice(device);
                 GameObject obj = GameObject.Instantiate(ItemPrefab.gameObject, Content);
+                Debug.Log(item.Name + "[???]");
                 obj.name = item.Name;
                 obj.transform.Find("Name").GetComponent<TextMeshProUGUI>().text = item.Name;
                 Image icon = obj.transform.Find("Icon").GetComponent<Image>();

Data/App.xml

@@ -4,11 +4,15 @@
 
   <PreLoad>
     <Action type="Parallel">
-      <Action type="LoadRes" value="Pig1.xml" resType="xml"></Action><!--模块1，假死-->
+      <!--模块1，假死-->
-      <Action type="LoadRes" value="Pig2.xml" resType="xml"></Action><!--模块2，打耳牌-->
+      <Action type="LoadRes" value="Pig1.xml" resType="xml"></Action>
-      <Action type="LoadRes" value="Pig3.xml" resType="xml"></Action> <!--模块3，断尾虚拟实训-->
+      <!--模块2，打耳牌-->
+      <Action type="LoadRes" value="Pig2.xml" resType="xml"></Action>
+      <!--模块3，断尾虚拟实训-->
+      <Action type="LoadRes" value="Pig3.xml" resType="xml"></Action>
+      <!--模块4，剪牙虚拟实训-->
       <Action type="LoadRes" value="Pig4.xml" resType="xml"></Action>
-      <!--模块3，剪牙虚拟实训-->
+
 
 
 

Data/Xml/Pig1.xml

@@ -43,7 +43,7 @@
     <Item step="实际操作" name="术后护理" sum="0" bind=""/>
   </Score>
   <Device>
-    <Name>剪牙钳1_教学物品展示</Name>
+    <Name>剪牙钳1</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JianYaQian</Path>
     <Tip>剪牙钳</Tip>
@@ -52,7 +52,7 @@
     <Icon>工具/骨刀.png</Icon>
   </Device>
   <Device>
-    <Name>剪牙钳2_教学物品展示</Name>
+    <Name>剪牙钳2</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JianYaQian2</Path>
     <Tip>剪牙钳</Tip>
@@ -63,7 +63,7 @@
 
 
   <Device>
-    <Name>电热断尾刀_教学物品展示</Name>
+    <Name>电热断尾刀</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianReDuanWeiQian</Path>
     <Tip>电热断尾刀</Tip>
@@ -72,7 +72,7 @@
     <Icon>工具/骨刀.png</Icon>
   </Device>
   <Device>
-    <Name>连续注射器_教学物品展示</Name>
+    <Name>连续注射器</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_LianXuZhuSheQi</Path>
     <Tip>连续注射器</Tip>
@@ -82,7 +82,7 @@
   </Device>
 
   <Device>
-    <Name>单过硫酸氢钾复合物消毒粉_教学物品展示</Name>
+    <Name>单过硫酸氢钾复合物消毒粉</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_LiuSuanQingJia</Path>
     <Tip>单过硫酸氢钾复合物消毒粉</Tip>
@@ -92,7 +92,7 @@
   </Device>
 
   <Device>
-    <Name>耳牌_教学物品展示</Name>
+    <Name>耳牌</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ErPaiZuHe1/SM_ErPaiZuHe/SM_ErPai</Path>
     <Tip>耳牌</Tip>
@@ -103,7 +103,7 @@
 
 
   <Device>
-    <Name>耳牌钳子_教学物品展示</Name>
+    <Name>耳牌钳子</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ErPaiZuHe1/SM_ErPaiZuHe/SM_ErPaiQian</Path>
     <Tip>耳牌钳</Tip>
@@ -112,7 +112,7 @@
     <Icon>工具/骨刀.png</Icon>
   </Device>
   <Device>
-    <Name>碘酊_教学物品展示</Name>
+    <Name>碘酊</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianDing</Path>
     <Tip>碘酊</Tip>
@@ -123,7 +123,7 @@
 
 
   <Device>
-    <Name>碘伏_教学物品展示</Name>
+    <Name>碘伏</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianFu</Path>
     <Tip>碘伏</Tip>
@@ -133,7 +133,7 @@
   </Device>
 
   <Device>
-    <Name>酒精托盘_教学物品展示</Name>
+    <Name>酒精托盘</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JiuJing</Path>
     <Tip>酒精</Tip>
@@ -144,7 +144,7 @@
 
 
   <Device>
-    <Name>量杯_教学物品展示</Name>
+    <Name>量杯</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_LiangBei</Path>
     <Tip>量杯</Tip>
@@ -154,7 +154,7 @@
   </Device>
 
   <Device>
-    <Name>棉花_教学物品展示</Name>
+    <Name>棉花</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_MianHua</Path>
     <Tip>棉花</Tip>
@@ -167,7 +167,7 @@
 
 
   <Device>
-    <Name>喷壶1_教学物品展示</Name>
+    <Name>喷壶1</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_PenHu</Path>
     <Tip>喷壶1</Tip>
@@ -178,7 +178,7 @@
   </Device>
 
   <Device>
-    <Name>喷壶2_教学物品展示</Name>
+    <Name>喷壶2</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_PenHu6</Path>
     <Tip>喷壶2</Tip>
@@ -189,7 +189,7 @@
   </Device>
 
   <Device>
-    <Name>喷壶(碘酊)_教学物品展示</Name>
+    <Name>喷壶(碘酊)</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_PenHu_DianDing</Path>
     <Tip>喷壶(碘酊)</Tip>
@@ -200,7 +200,7 @@
   </Device>
 
   <Device>
-    <Name>手术钳1_教学物品展示</Name>
+    <Name>手术钳1</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuQian</Path>
     <Tip>手术钳</Tip>
@@ -211,7 +211,7 @@
   </Device
     >
   <Device>
-    <Name>手术钳4_教学物品展示</Name>
+    <Name>手术钳4</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuQian4</Path>
     <Tip>手术钳</Tip>
@@ -222,7 +222,7 @@
   </Device>
 
   <Device>
-    <Name>手术托盘_教学物品展示</Name>
+    <Name>手术托盘</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan</Path>
     <Tip>手术托盘</Tip>
@@ -233,7 +233,7 @@
   </Device>
 
   <Device>
-    <Name>手术托盘2号_教学物品展示</Name>
+    <Name>手术托盘2号</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan1</Path>
     <Tip>手术托盘</Tip>
@@ -245,7 +245,7 @@
 
 
   <Device>
-    <Name>铁血龙_教学物品展示</Name>
+    <Name>铁血龙</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_TieJi</Path>
     <Tip>铁血龙</Tip>
@@ -256,7 +256,7 @@
   </Device>
 
   <Device>
-    <Name>外科手术刀_教学物品展示</Name>
+    <Name>外科手术刀</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_WaiKeShouShuDao</Path>
     <Tip>外科手术刀</Tip>
@@ -278,7 +278,7 @@
   </Device>
 
   <Device>
-    <Name>一次性酒精消毒手套_教学物品展示</Name>
+    <Name>一次性酒精消毒手套</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_YiCiXingRuJiaoShouTao</Path>
     <Tip>一次性酒精消毒手套</Tip>
@@ -290,7 +290,7 @@
 
 
   <Device>
-    <Name>75%乙醇消毒酒精_教学物品展示</Name>
+    <Name>75%乙醇消毒酒精</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_YiYongJiuJing</Path>
     <Tip>75%乙醇消毒酒精</Tip>
@@ -302,7 +302,7 @@
 
 
   <Device>
-    <Name>针头1_教学物品展示</Name>
+    <Name>针头1</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ZhenTou/SM_ZhenTou1</Path>
     <Tip>针头1</Tip>
@@ -313,7 +313,7 @@
   </Device>
 
   <Device>
-    <Name>针头2_教学物品展示</Name>
+    <Name>针头2</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ZhenTou/SM_ZhenTou2</Path>
     <Tip>针头2</Tip>
@@ -326,7 +326,7 @@
 
 
   <Device>
-    <Name>针头3_教学物品展示</Name>
+    <Name>针头3</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ZhenTou/SM_ZhenTou3</Path>
     <Tip>针头3</Tip>
@@ -338,7 +338,7 @@
 
 
   <Device>
-    <Name>针头4_教学物品展示</Name>
+    <Name>针头4</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ZhenTou/SM_ZhenTou4</Path>
     <Tip>针头4</Tip>
@@ -350,7 +350,7 @@
 
 
   <Device>
-    <Name>针头5_教学物品展示</Name>
+    <Name>针头5</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ZhenTou/SM_ZhenTou5</Path>
     <Tip>针头5</Tip>
@@ -364,7 +364,7 @@
 
 
   <Device>
-    <Name>针头6_教学物品展示</Name>
+    <Name>针头6</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ZhenTou/SM_ZhenTou6</Path>
     <Tip>针头6</Tip>
@@ -377,7 +377,7 @@
 
 
   <Device>
-    <Name>接产纸_教学物品展示</Name>
+    <Name>接产纸</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JieChanZhi</Path>
     <Tip>接产纸</Tip>
@@ -389,7 +389,7 @@
 
 
   <Device>
-    <Name>针头7_教学物品展示</Name>
+    <Name>针头7</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ZhenTou/SM_ZhenTou7</Path>
     <Tip>针头7</Tip>
@@ -399,7 +399,7 @@
   </Device>
 
   <Device>
-    <Name>收纳袋_教学物品展示</Name>
+    <Name>收纳袋</Name>
     <HighLight color="255,255,255"/>
     <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_ShouNaDai</Path>
     <Tip>收纳袋</Tip>
@@ -414,7 +414,7 @@
   <Name>假死仔猪急救虚拟实训</Name>
 
   <!--教学模式-->
-  <Operation moduleType="Study">
+  <Operation moduleType="Study"  freeStep="true">
     <!--一级步骤-->
 
     <Step name="内容介绍">
@@ -528,7 +528,7 @@
             <Action type="CameraSwitch" nearPos="2.894144,1.835608,-0.6305628" nearRot="17.192,90,0" nearTime="1" normalPos="2.894144,1.835608,-0.6305628" normalRot="17.192,90,0" farTime="0" isNear="false"></Action>
 
             <!--隐藏物体-->
-        
+            <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an2" isShow="true"></Action>
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an2/SM_XiaoZhu/group4/SM_XiaoZhu_qiege2:geo" isShow="false"></Action>
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an2/SM_JieChanZhi1" isShow="false"></Action>
             <!--//点击仔猪-->
@@ -555,7 +555,7 @@
             <Action type="CameraSwitch" nearPos="2.894144,1.835608,-0.6305628" nearRot="17.192,90,0" nearTime="1" normalPos="2.894144,1.835608,-0.6305628" normalRot="17.192,90,0" farTime="0" isNear="false"></Action>
 
             <!--隐藏物体-->
-            <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an2" isShow="true"></Action>
+
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an2/SM_XiaoZhu/group4/SM_XiaoZhu_qiege2:geo" isShow="false"></Action>
             <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an2/SM_JieChanZhi1" isShow="false"></Action>
             <!--点击接产纸-->
@@ -825,7 +825,7 @@
 
 
   <!--考核模式-->
-  <Operation moduleType="Exam">
+  <Operation moduleType="Exam"  freeStep="false">
 
     <Step name="内容介绍">
       <!--二级步骤-->
@@ -875,21 +875,61 @@
             <Action type="Show" value="ExamPrefab/Teach_ToolsChose" isShow="true"></Action>
             <Action type="CameraSwitch" nearPos="4.361163,1.881783,-0.3311594" nearRot="27.598,-0.109,0" nearTime="1" normalPos="4.361163,1.881783,-0.3311594" normalRot="27.598,-0.109,0" farTime="0" isNear="false"></Action>
 
+            <!--隐藏物体-->
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_LiangBei" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianDing" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianReDuanWeiQian" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ErPaiZuHe1" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JianYaQian" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JianYaQian2" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JieChanZhi" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JiuJing" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_LianXuZhuSheQi" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_LiuSuanQingJia" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_MianHua" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_PenHu" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_PenHu6" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_PenHu_DianDing" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuQian" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuQian4" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan1" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_TieJi" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_WaiKeShouShuDao" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_XiaoDuYe" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_YiCiXingRuJiaoShouTao" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_YiYongJiuJing" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ZhenTou" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_ShouNaDai" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_PenHu" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_PenHu6" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuQian" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan1" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianFu" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan1" isShow="false"></Action>
+            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianReDuanWeiQian_FuZhi" isShow="false"></Action>
+
+
+
+
             <!--考核模式，选择道具，有问题-->
-            <!--<Action type="UITools" devices="外科手术刀,剪牙钳,接产纸，收纳袋" answers="接产纸，收纳袋"
+            <Action type="UITools" devices="外科手术刀,剪牙钳1,接产纸,收纳袋" answers="接产纸,收纳袋"
               setActive="true"
               rightLabel="提示：物品选择正确。"
-              wrongLabel="提示：物品选择错误，\r\n当前模块中，不需要该物品。"
+              wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
               rightEvent="物品准备通过"
               wrongEvent=""
               rightScore="1"
               wrongScore=""
-              scoreStepName="物品准备"/>-->
+              scoreStepName="物品准备">
-            <!--<Condition type="StrEvent" value="物品准备通过"></Condition>-->
+            </Action>
-
+            <Condition type="StrEvent" value="物品选择正确"></Condition>
-
-
             <Action type="NextOperation"></Action>
+
+
+
+
+
           </Action>
         </Start>
       </Step>
@@ -898,6 +938,7 @@
         <!--点击帽子-->
         <Start>
           <Action type="Sequence">
+
             <Action type="Show" value="ExamPrefab/Teach_ToolsChose" isShow="false"></Action>
             <Action type="CameraSwitch" nearPos="1.2,6.37,-27.03" nearRot="42.808,0,0" nearTime="1" normalPos="1.2,6.37,-27.03" normalRot="42.808,0,0" farTime="0" isNear="false"></Action>
             <Action type="Btns" value="下一步"></Action>