提交宝石琢磨bug勘误，四个模式分数提交

Assets/Scripts/UI/UITools.cs

@@ -56,6 +56,7 @@ namespace QFramework.Example
                 ScoreController.Instance.Add(mData.scoreStepName, mData.totalScore);
             }
             mData = uiData as UIToolsData ?? new UIToolsData();
+            answers.Clear();
             if (string.IsNullOrEmpty(mData.answer) == false)
             {
                 answers = mData.answer.Split(',')?.ToList();
@@ -150,6 +151,10 @@ namespace QFramework.Example
                                         if (curWrongCount >= mData.wrongCount)
                                         {
                                             StringEventSystem.Global.Send(mData.wrongEvent);
+                                            if (mData.SetActive)
+                                            {
+                                                ShowRight();
+                                            }
                                         }
                                     }
                                     SetSelected(obj, false);
@@ -164,6 +169,11 @@ namespace QFramework.Example
                                     if (curWrongCount >= mData.wrongCount)
                                     {
                                         StringEventSystem.Global.Send(mData.wrongEvent);
+                                        Debug.Log("³¬Èý´Î");
+                                        if (mData.SetActive)
+                                        {
+                                            ShowRight();
+                                        }
                                     }
                                 }
                                 SetSelected(obj, false);
@@ -207,6 +217,13 @@ namespace QFramework.Example
 
         }
 
+        public void ShowRight()
+        {
+            foreach (var item in answers)
+            {
+                DeviceController.Instance.GetDeviceObj(item).SetActive(true);
+            }
+        }
         public void SetSelected(GameObject item, bool isRight)
         {
             Transform icon = item.transform.Find("IconBg/Icon");

Data/Xml/BaoShiZhuoMoJiaGong.xml

@@ -185,18 +185,25 @@
 
             <Action type="Hint" value="请选择合适的工具，测量宝玉石原料的长宽，并预留出适当范围" time="-1"  icon="true" ></Action>
 
-            <Action type="UITools" devices="数显游标卡尺,记号笔,记号笔,粘杆,顶平器,八角手,直尺" answers="数显游标卡尺"
+            <Action type="UITools" devices="数显游标卡尺,记号笔,粘杆,顶平器,八角手,直尺" answers="数显游标卡尺"
              setActive="true"
              rightLabel="提示：物品选择正确。"
              wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
              rightEvent="物品准备通过"
-             wrongEvent=""
+            wrongEvent="物品准备失败"
              rightScore="5"
              wrongScore=""
              scoreStepName="宝石琢磨加工1.切割下料"
-             autoHide="1">
+             autoHide="1"
+              wrongCount="3" >
+              
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="Show" value="Main/YouBiaoKaChi" isShow="true"></Action>
 
             <Action type="UIShow" value="UITools" isShow="false"></Action>
@@ -232,13 +239,20 @@
              rightLabel="提示：物品选择正确。"
              wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
              rightEvent="物品准备通过"
-             wrongEvent=""
+            wrongEvent="物品准备失败"
                 rightScore="5"
              wrongScore=""
              scoreStepName="宝石琢磨加工1.切割下料"
-             autoHide="1">
+             autoHide="1"
+             wrongCount="3"
+                    >
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -328,12 +342,16 @@
 
 
 
+            <Action type="Show" value="Main/BaoShiYuanliao" isShow="true" ></Action>
+            <Action type="Show" value="Main/BaoShiYuanliao/Line1" isShow="true" ></Action>
+            <Action type="Show" value="Main/BaoShiYuanliao/Line2" isShow="true" ></Action>
 
             <Action type="Delay" value="1"></Action>
 
 
 
 
+
           </Action>
 
 
@@ -356,16 +374,17 @@
             <Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="false" ></Action>
             <Action type="Show" value="Main/SM_YanMoJi/MoPan_Mesh" isShow="true" ></Action>
 
-            <Action type="Show" value="Main/BaoShiYuanliao" isShow="true" ></Action>
-            <Action type="Show" value="Main/BaoShiYuanliao/Line1" isShow="true" ></Action>
-            <Action type="Show" value="Main/BaoShiYuanliao/Line2" isShow="true" ></Action>
-
             <Action type="Hint" value="请将宝玉石原料缓慢靠近工作台上的切割片，对准刚才的两条标记线，保持稳定的进给速度进行切割" time="-1" audio="sound_106.mp3" icon="true" ></Action>
 
-            <Action type="Move" value="Main/BaoShiYuanliao" to="-3.1801,1.0025,-2.4402" time="0"></Action>
+
-            <Action type="Rotate" value="Main/BaoShiYuanliao" to="270,0,0" time="0"></Action>
+            <Action type="Parallel">
 
 
+              <Action type="Move" value="Main/BaoShiYuanliao" to="-3.1801,1.0025,-2.4402" time="1"></Action>
+              <Action type="Rotate" value="Main/BaoShiYuanliao" to="270,0,0" time="1"></Action>
+
+
+            </Action>
 
             <Action type="HighLightFlash" value="Main/BaoShiYuanliao" isHigh="true" color="255,0,0,255" time="0.25" count="-1"></Action>
             <Condition type="ObjClick" value="Main/BaoShiYuanliao" ></Condition>
@@ -435,6 +454,12 @@
               </Action>
 
             </Action>
+            <!--刀片一直旋转，隐藏-->
+            <Action type="Show" value="Main/SM_YuShiQieGeJi/DaoPian_Opean_Loop" isShow="false"></Action>
+            <Action type="Show" value="Main/SM_YuShiQieGeJi/DaoPian" isShow="true"></Action>
+
+
+
 
             <Action type="HighLightFlash" value="Main/SM_YuShiQieGeJi/SM_KaiGuan_QGJ/KaiGuan/SM_ON" isHigh="false" color="255,0,0,255"></Action>
             <Action type="HighLightFlash" value="Main/SM_YuShiQieGeJi/SM_KaiGuan_QGJ/KaiGuan/SM_OFF" isHigh="false" color="255,0,0,255"></Action>
@@ -453,7 +478,7 @@
             <Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="false" ></Action>
             <Action type="Show" value="Main/SM_YanMoJi/MoPan_Mesh" isShow="true" ></Action>
 
-            <Action type="TimeLine" value="TimeLines/DaoPianTingZhiXuanZhuan" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="100"></Action>
+            <!--<Action type="TimeLine" value="TimeLines/DaoPianTingZhiXuanZhuan" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="100"></Action>-->
 
             <Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="false" ></Action>
             <Action type="Show" value="Main/SM_YanMoJi/MoPan_Mesh" isShow="true" ></Action>
@@ -586,6 +611,10 @@
             <Action type="Rotate" value="FlyCamera" to="33.2670326,178.548508,0" time="0"></Action>
 
             
+            <Action type="Show" value="Main/BaoShi_QieGeChuLaiDe/SM_BaoShi003" isShow="true"></Action>
+            <Action type="Show" value="Main/BaoShi_QieGeChuLaiDe/SM_BaoShi004" isShow="true"></Action>
+            
+            
             <Action type="TimeLine" value="TimeLines/MoPanYanMoBaoShi" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="700"></Action>
 
             <Action type="NextOperation"></Action>
@@ -620,13 +649,19 @@
                        rightLabel="提示：物品选择正确。"
                        wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                        rightEvent="物品准备通过"
-                       wrongEvent=""
+                      wrongEvent="物品准备失败"
                        rightScore="10"
                        wrongScore=""
                        scoreStepName="宝石琢磨加工3.粘胶上杆"
-                       autoHide="1">
+                       autoHide="1"
+                           wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -661,13 +696,19 @@
                        rightLabel="提示：物品选择正确。"
                        wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                        rightEvent="物品准备通过"
-                       wrongEvent=""
+                      wrongEvent="物品准备失败"
                        rightScore="5.2"
                        wrongScore=""
                        scoreStepName="操作准备物品准备"
-                       autoHide="1">
+                       autoHide="1"
+                           wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -720,13 +761,19 @@
                        rightLabel="提示：物品选择正确。"
                        wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                        rightEvent="物品准备通过"
-                       wrongEvent=""
+                      wrongEvent="物品准备失败"
                        rightScore="5"
                        wrongScore=""
                        scoreStepName="宝石琢磨加工4.圈磨腰形"
-                       autoHide="1">
+                       autoHide="1"
+                           wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -758,13 +805,19 @@
                        rightLabel="提示：物品选择正确。"
                        wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                        rightEvent="物品准备通过"
-                       wrongEvent=""
+                      wrongEvent="物品准备失败"
                 rightScore="3"
                        wrongScore=""
                        scoreStepName="宝石琢磨加工4.圈磨腰形"
-                       autoHide="1">
+                       autoHide="1"
+                           wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -841,13 +894,19 @@
                        rightLabel="提示：物品选择正确。"
                        wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                        rightEvent="物品准备通过"
-                       wrongEvent=""
+                      wrongEvent="物品准备失败"
                       rightScore="2"
                        wrongScore=""
                        scoreStepName="宝石琢磨加工4.圈磨腰形"
-                       autoHide="1">
+                       autoHide="1"
+                           wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
             <!--直尺 测量，组装后八角手高度-->
@@ -865,7 +924,7 @@
             <!--输入 9135 的数值-->
 
             <Action type="Input" title="请输入" finishedEvent="UI关闭事件通知用StrEvent接收">
-              <Input name="测量的宝石粗坯直径:" var="变量1" answer="9"></Input>
+              <Input name="测量的宝石粗坯直径:" var="变量1" answer="9135"></Input>
               <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="1"  ></Btn>
               <!--<Btn name="取消"></Btn>-->
             </Action>
@@ -944,13 +1003,19 @@
    rightLabel="提示：物品选择正确。"
    wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
    rightEvent="物品准备通过"
-   wrongEvent=""
+  wrongEvent="物品准备失败"
    rightScore="10"
    wrongScore=""
    scoreStepName="宝石琢磨加工6.冠部抛光"
-   autoHide="1">
+   autoHide="1"
+                           wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -977,7 +1042,7 @@
             <!--磨盘自动旋转，普通磨盘隐藏-->
             <Action type="Show" value="Main/SM_YanMoJi/MoPan_Mesh" isShow="true"></Action>
             <Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="false"></Action>
-
+            <Action type="Show" value="Main/SM_YanMoJi/MoPan_XiMian_Opean_Loop" isShow="false"></Action>
 
             <Action type="NextOperation"></Action>
           </Action>
@@ -1004,8 +1069,8 @@
 
             <!--磨盘自动旋转，普通磨盘隐藏-->
             <Action type="Show" value="Main/SM_YanMoJi/MoPan_Mesh" isShow="false"></Action>
-            <Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="true"></Action>
+            <Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="false"></Action>
-
+            <Action type="Show" value="Main/SM_YanMoJi/MoPan_XiMian_Opean_Loop" isShow="true"></Action>
 
             <!--点击粘竿。-->
             <Action type="HighLightFlash" value="Main/BaJiaoShou/ZhanGan (1)" isHigh="true" color="255,0,0,255" time="0.25" count="-1"></Action>
@@ -1037,13 +1102,19 @@
                        rightLabel="提示：物品选择正确。"
                        wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                        rightEvent="物品准备通过"
-                       wrongEvent=""
+                      wrongEvent="物品准备失败"
                 rightScore="5"
                  wrongScore=""
                  scoreStepName="宝石琢磨加工7.宝石翻胶"
-                       autoHide="1">
+                       autoHide="1"
+                           wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -1083,13 +1154,19 @@
                        rightLabel="提示：物品选择正确。"
                        wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                        rightEvent="物品准备通过"
-                       wrongEvent=""
+                      wrongEvent="物品准备失败"
                         rightScore="5"
                  wrongScore=""
                  scoreStepName="宝石琢磨加工7.宝石翻胶"
-                       autoHide="1">
+                       autoHide="1"
+                           wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -1164,21 +1241,36 @@
                        rightLabel="提示：物品选择正确。"
                        wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                        rightEvent="物品准备通过"
-                       wrongEvent=""
+                      wrongEvent="物品准备失败"
                        rightScore="10"
                        wrongScore=""
                        scoreStepName="宝石琢磨加工9.亭部抛光"
-                       autoHide="1">
+                       autoHide="1"
+                           wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
-            <!--磨盘，一直循环，开启-->
+            <!--磨盘，显示细磨盘-->
-            <Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="true"></Action>
+
+            <Action type="Show" value="Main/SM_YanMoJi/MoPan_XiMian_Opean_Loop" isShow="true"></Action>
+            <Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="false"></Action>
+            <Action type="Show" value="Main/SM_YanMoJi/MoPan_Mesh  " isShow="false"></Action>
+
+
+
             <Action type="TimeLine" value="TimeLines/PaoGuang_PingTouZhanGan" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="200"></Action>
 
 
+            
+            
+
             <Action type="NextOperation"></Action>
           </Action>
 

Data/Xml/HuangJinShouShiJiaGong.xml

@@ -302,15 +302,22 @@
              rightLabel="提示：物品选择正确。"
              wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
              rightEvent="物品准备通过"
-               wrongEvent=""
+              wrongEvent="物品准备失败"
              rightScore="10"
              wrongScore=""
                    random="true"
              scoreStepName="黄金首饰加工工艺1.称重"
-               autoHide="1">
+             autoHide="1"
+                     wrongCount="3"
+                    >
 
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -352,15 +359,21 @@
                        rightLabel="提示：物品选择正确。"
                        wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                        rightEvent="物品准备通过"
-                         wrongEvent=""
+                        wrongEvent="物品准备失败"
                 rightScore="10"
                        wrongScore=""
                    random="true"
                        scoreStepName="黄金首饰加工工艺2.验金"
-                         autoHide="1">
+                       autoHide="1"
+                     wrongCount="3">
 
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <Action type="Delay" value="1"></Action>
 
@@ -413,14 +426,20 @@
                          rightLabel="提示：物品选择正确。"
                          wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                          rightEvent="物品准备通过"
-                         wrongEvent=""
+                          wrongEvent="物品准备失败"
                           rightScore="5"
                          wrongScore=""
                      random="true"
                          scoreStepName="黄金首饰加工工艺3.熔料"
-                         autoHide="1">
+                         autoHide="1"
+                       wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
             <Action type="Delay" value="1"></Action>
@@ -451,14 +470,20 @@
                     rightLabel="提示：物品选择正确。"
                     wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                     rightEvent="物品准备通过"
-                      wrongEvent=""
+                     wrongEvent="物品准备失败"
                     rightScore="3"
                     wrongScore=""
                      random="true"
                     scoreStepName="黄金首饰加工工艺3.熔料"
-                      autoHide="1">
+                    autoHide="1"
+                       wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
             <!--显示静态焊枪-->
@@ -564,14 +589,21 @@
         rightLabel="提示：物品选择正确。"
         wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
         rightEvent="物品准备通过"
-          wrongEvent=""
+         wrongEvent="物品准备失败"
         rightScore="2"
         wrongScore=""
          random="true"
         scoreStepName="黄金首饰加工工艺3.熔料"
-          autoHide="1">
+        autoHide="1"
+       wrongCount="3"
+                   >
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
             <Action type="Show" value="Main/SM_ZhuChangJing/SM_MuJu"  isShow="true" ></Action>
@@ -628,14 +660,20 @@
                   rightLabel="提示：物品选择正确。"
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
-                  wrongEvent=""
+                   wrongEvent="物品准备失败"
                 rightScore="3"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺4.压料"
-                  autoHide="1">
+                  autoHide="1"
+                       wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
             <Action type="Delay" value="1"></Action>
@@ -667,14 +705,20 @@
                   rightLabel="提示：物品选择正确。"
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
-                  wrongEvent=""
+                   wrongEvent="物品准备失败"
                      rightScore="2"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺4.压料"
-                  autoHide="1">
+                  autoHide="1" 
+                    wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
             <Action type="Delay" value="1"></Action>
 
@@ -703,14 +747,20 @@
                   rightLabel="提示：物品选择正确。"
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
-                  wrongEvent=""
+                   wrongEvent="物品准备失败"
                 rightScore="5"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺4.压料"
-                  autoHide="1">
+                  autoHide="1"
+                       wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
             <Action type="Delay" value="0.5"></Action>
 
@@ -759,14 +809,20 @@
                   rightLabel="提示：物品选择正确。"
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
-                  wrongEvent=""
+                   wrongEvent="物品准备失败"
                   rightScore="5"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺5.整形"
-                  autoHide="1">
+                  autoHide="1"
+                       wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
             <Action type="Delay" value="0.5"></Action>
 
@@ -802,14 +858,20 @@
                   rightLabel="提示：物品选择正确。"
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
-                    wrongEvent=""
+                   wrongEvent="物品准备失败"
                      rightScore="5"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺5.整形"
-                    autoHide="1">
+                  autoHide="1"
+                 wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
             <Action type="Delay" value="1"></Action>
 
@@ -859,14 +921,20 @@
                   rightLabel="提示：物品选择正确。"
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
-                  wrongEvent=""
+                   wrongEvent="物品准备失败"
                     rightScore="10"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺6.焊接"
-                  autoHide="1">
+                  autoHide="1"
+                       wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
             <Action type="Delay" value="1"></Action>
 
@@ -930,7 +998,7 @@
              rightLabel="提示：物品选择正确。"
              wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
              rightEvent="物品准备通过"
-             wrongEvent=""
+              wrongEvent="物品准备失败"
              rightScore="5.2"
              wrongScore=""
              scoreStepName="操作准备物品准备"
@@ -987,14 +1055,20 @@
            rightLabel="提示：物品选择正确。"
            wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
            rightEvent="物品准备通过"
-             wrongEvent=""
+            wrongEvent="物品准备失败"
                rightScore="10"
            wrongScore=""
                    random="true"
            scoreStepName="黄金首饰加工工艺7.锉修"
-             autoHide="1">
+           autoHide="1"
+           wrongCount="3"       >
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <Action type="Delay" value="1"></Action>
 
@@ -1040,14 +1114,22 @@
            rightLabel="提示：物品选择正确。"
            wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
            rightEvent="物品准备通过"
-             wrongEvent=""
+            wrongEvent="物品准备失败"
              rightScore="10"
            wrongScore=""
                    random="true"
            scoreStepName="黄金首饰加工工艺8.压光"
-             autoHide="1">
+           autoHide="1"
+           wrongCount="3"       >
           </Action>
+
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <Action type="Delay" value="1"></Action>
 
@@ -1084,14 +1166,20 @@
            rightLabel="提示：物品选择正确。"
            wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
            rightEvent="物品准备通过"
-             wrongEvent=""
+            wrongEvent="物品准备失败"
              rightScore="10"
            wrongScore=""
                    random="true"
            scoreStepName="黄金首饰加工工艺9.标识印记"
-             autoHide="1">
+           autoHide="1"
+                     wrongCount="3">
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <Action type="Delay" value="1"></Action>
 
@@ -1145,14 +1233,20 @@
            rightLabel="提示：物品选择正确。"
            wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
            rightEvent="物品准备通过"
-             wrongEvent=""
+            wrongEvent="物品准备失败"
            rightScore="5"
            wrongScore=""
                    random="true"
            scoreStepName="黄金首饰加工工艺10.称重"
-             autoHide="1">
+           autoHide="1"
+          wrongCount="3"      >
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <Action type="Delay" value="1"></Action>
 
@@ -1193,15 +1287,21 @@
            rightLabel="提示：物品选择正确。"
            wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
            rightEvent="物品准备通过"
-             wrongEvent=""
+            wrongEvent="物品准备失败"
            rightScore="5"
            wrongScore=""
            random="true"
            scoreStepName="黄金首饰加工工艺11.装盒出货"
-             autoHide="1">
+           autoHide="1"
+         wrongCount="3"  >
 
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <Action type="Delay" value="1"></Action>
 

Data/Xml/ShuiReFaHeCheng.xml

@@ -89,13 +89,13 @@
   <!--随便配置的分数模块-->
   <Score>
 
-    <Item step="紫外荧光灯" name="1.肉眼观察" sum="20" bind=""/>
+    <Item step="水热法合成祖母绿检测" name="1.肉眼观察" sum="20" bind=""/>
-    <Item step="紫外荧光灯" name="2.均质体/非均质体检测" sum="20" bind=""/>
+    <Item step="水热法合成祖母绿检测" name="2.均质体/非均质体检测" sum="20" bind=""/>
-    <Item step="紫外荧光灯" name="3.折射率检测" sum="20" bind=""/>
+    <Item step="水热法合成祖母绿检测" name="3.折射率检测" sum="20" bind=""/>
-    <Item step="紫外荧光灯" name="4.放大检测" sum="20" bind=""/>
+    <Item step="水热法合成祖母绿检测" name="4.放大检测" sum="20" bind=""/>
-    <Item step="紫外荧光灯" name="5.密度检测" sum="5" bind=""/>
+    <Item step="水热法合成祖母绿检测" name="5.密度检测" sum="5" bind=""/>
-    <Item step="紫外荧光灯" name="6.紫外荧光检测" sum="5" bind=""/>
+    <Item step="水热法合成祖母绿检测" name="6.紫外荧光检测" sum="5" bind=""/>
-    <Item step="紫外荧光灯" name="7.结论总结" sum="10" bind=""/>
+    <Item step="水热法合成祖母绿检测" name="7.结论总结" sum="10" bind=""/>
 
   </Score>
 
@@ -136,14 +136,22 @@
             rightLabel="提示：物品选择正确。"
             wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
             rightEvent="物品准备通过"
-              wrongEvent=""
+             wrongEvent="物品准备失败"
             rightScore="20"
             wrongScore=""
                      random="true"
-              scoreStepName="紫外荧光灯1.肉眼观察"
+            scoreStepName="水热法合成祖母绿检测1.肉眼观察"
-              autoHide="1">
+            autoHide="1"
+                      wrongCount="3">
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+            
+            
+            
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <!--镊子近距离视角-->
           <Action type="Move" value="FlyCamera" to="0.207000002,1.36743391,2.19799995" time="0"></Action>
@@ -181,14 +189,20 @@
            rightLabel="提示：物品选择正确。"
            wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
            rightEvent="物品准备通过"
-             wrongEvent=""
+           wrongEvent="物品准备失败"
            rightScore="20"
            wrongScore=""
            random="true"
-             scoreStepName="紫外荧光灯2.均质体/非均质体检测"
+           scoreStepName="水热法合成祖母绿检测2.均质体/非均质体检测"
-             autoHide="1">
+           autoHide="1"
+           wrongCount="3">
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+          
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <!--5.放置非均质体单晶类宝石-->
           <Action type="Hint" value="请将已经经过清理的非均质体单晶类宝石，放置在玻璃载物台上" time="-1"  icon="true" ></Action>
@@ -268,19 +282,26 @@
           <Action type="Move" value="FlyCamera" to="0.39630115,1.31917739,2.2649951" time="0"></Action>
 
           <Action type="Rotate" value="FlyCamera" to="53.2786102,357.34729,0" time="0"></Action>
-<Action type="UITools" devices="宝石镊子,偏光镜,折射仪,显微镜,密度仪,紫外荧光灯" answers="折射仪"
+          <Action type="UITools" devices="宝石镊子,偏光镜,折射仪,显微镜,密度仪,紫外荧光灯" answers="折射仪"
             setActive="true"
             rightLabel="提示：物品选择正确。"
             wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
             rightEvent="物品准备通过"
-  wrongEvent=""
+           wrongEvent="物品准备失败"
             rightScore="20"
             wrongScore=""
                      random="true"
-  scoreStepName="紫外荧光灯3.折射率检测"
+            scoreStepName="水热法合成祖母绿检测3.折射率检测"
-  autoHide="1">
+            autoHide="1"
+                      wrongCount="3">
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+          
+          
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <!--变石移动-->
           <Action type="TimeLine" value="TimeLines/DaKaiZheSheYi" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="90"></Action>
@@ -492,14 +513,23 @@
             rightLabel="提示：物品选择正确。"
             wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
             rightEvent="物品准备通过"
-              wrongEvent=""
+              wrongEvent="物品准备失败"
             rightScore="20"
             wrongScore=""
                      random="true"
-              scoreStepName="紫外荧光灯4.放大检测"
+            scoreStepName="水热法合成祖母绿检测4.放大检测"
-              autoHide="1">
+            autoHide="1"
+                      wrongCount="3">
           </Action>
+          
+          
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+          
+          
+          
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <!--显微镜的使用，步骤4、5、6、7-->
           <!--显示灯光-->
@@ -586,7 +616,7 @@
 
           <Action type="Show" value="CustomParent/Canvas/YuanKuang" isShow="false" ></Action>
 
-<!--隐藏显微镜-->
+          <!--隐藏显微镜-->
           <Action type="Show" value="Main/SM_XianWeiJing" isShow="false" ></Action>
           <Action type="Show" value="Main/SM_HaiLanBaoShi_从显微镜拿下" isShow="false" ></Action>
 
@@ -608,14 +638,24 @@
             rightLabel="提示：物品选择正确。"
             wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
             rightEvent="物品准备通过"
-              wrongEvent=""
+             wrongEvent="物品准备失败"
             rightScore="5"
             wrongScore=""
                      random="true"
-              scoreStepName="紫外荧光灯5.密度检测"
+            scoreStepName="水热法合成祖母绿检测5.密度检测"
-              autoHide="1">
+            autoHide="1"
+                  wrongCount="3">
           </Action>
+          
+          
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+          
+          
+          
+          
           <Action type="UIShow" value="UITools" isShow="false"></Action>
 
           <Action type="Show" value="Main/SM_HaiLanBaoShi_MiDuYi" isShow="true" ></Action>
@@ -741,14 +781,25 @@
             rightLabel="提示：物品选择正确。"
             wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
             rightEvent="物品准备通过"
-              wrongEvent=""
+            wrongEvent="物品准备失败"
             rightScore="5"
             wrongScore=""
                      random="true"
-              scoreStepName="紫外荧光灯6.紫外荧光检测"
+            scoreStepName="水热法合成祖母绿检测6.紫外荧光检测"
-              autoHide="1">
+            autoHide="1"
+                      wrongCount="3">
           </Action>
+
+          
+            
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+          
+          
+          
+          
           <Action type="UIShow" value="UITools" isShow="false"></Action>
           <Action type="Show" value="Main/SM_FGJ_ShiYong"  isShow="true" ></Action>
           <Action type="Show" value="Main/SM_FGJ_ShiYong/yudishi"  isShow="true" ></Action>
@@ -809,7 +860,7 @@
         <Action type="Sequence">
           <Action type="Hint" value="请根据上述测量结果，判定当前测试的祖母绿是否为水热法合成祖母绿" time="-1"   audio="sound_44.mp3" icon="true" ></Action>
 
-            <Action type="TextQuestion" title="请根据上述测量结果，判定当前测试的祖母绿是否为水热法合成祖母绿？" options="A.是|B.不是" answers="1" btns="确定" wait="1" showAnswer="true" scoreName="紫外荧光灯7.结论总结" rightScore="10"  absolutely="false" format="{0:F1}" finishedEvent="答题完成" optionType="0"></Action>
+          <Action type="TextQuestion" title="请根据上述测量结果，判定当前测试的祖母绿是否为水热法合成祖母绿？" options="A.是|B.不是" answers="1" btns="确定" wait="1" showAnswer="true" scoreName="水热法合成祖母绿检测7.结论总结" rightScore="10"  absolutely="false" format="{0:F1}" finishedEvent="答题完成" optionType="0"></Action>
 
           <Condition type="StrEvent" value="答题完成"></Condition>
 

Data/Xml/YuDiaoDeZhiZuo.xml

@@ -166,13 +166,19 @@
                         rightLabel="提示：物品选择正确。"
                         wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                         rightEvent="物品准备通过"
-                        wrongEvent=""
+                        wrongEvent="物品准备失败"
                         rightScore="12.5"
                         wrongScore="0"
                         scoreStepName="玉雕的制作1.选料、标记"
-                        autoHide="1">
+                        autoHide="1"
+                     wrongCount="3">
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -215,13 +221,19 @@
                          rightLabel="提示：物品选择正确。"
                          wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                          rightEvent="物品准备通过"
-                         wrongEvent=""
+                         wrongEvent="物品准备失败"
                         rightScore="12.5"
                          wrongScore="0"
                          scoreStepName="玉雕的制作2.出大型"
-                         autoHide="1">
+                         autoHide="1"
+                     wrongCount="3">
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -303,13 +315,20 @@
                         rightLabel="提示：物品选择正确。"
                         wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                         rightEvent="物品准备通过"
-                        wrongEvent=""
+                        wrongEvent="物品准备失败"
                         rightScore="12.5"
                         wrongScore="0"
                         scoreStepName="玉雕的制作3.定中线"
-                        autoHide="1">
+                        autoHide="1"
+                     wrongCount="3">
           </Action>
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -351,13 +370,20 @@
                         rightLabel="提示：物品选择正确。"
                         wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                         rightEvent="物品准备通过"
-                        wrongEvent=""
+                        wrongEvent="物品准备失败"
                      rightScore="12.5"
                         wrongScore="0"
                         scoreStepName="玉雕的制作4.定中心孔位"
-                        autoHide="1">
+                        autoHide="1"
+                     wrongCount="3">
           </Action>
+
+
+          <Condition type="Or">
             <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Condition type="StrEvent" value="物品准备失败"></Condition>
+          </Condition>
+
           <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
@@ -499,13 +525,19 @@
                           rightLabel="提示：物品选择正确。"
                           wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                           rightEvent="物品准备通过"
-                          wrongEvent=""
+                          wrongEvent="物品准备失败"
                         rightScore="6"
                           wrongScore="0"
                           scoreStepName="玉雕的制作5.初稿雕琢"
-                          autoHide="1">
+                          autoHide="1"
+                       wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
             <Action type="TimeLine" value="TimeLines/AnZhuangXiuJiaoTuoJu" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="70"></Action>
 
@@ -555,13 +587,19 @@
                           rightLabel="提示：物品选择正确。"
                           wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                           rightEvent="物品准备通过"
-                          wrongEvent=""
+                          wrongEvent="物品准备失败"
                   rightScore="6.5"
                           wrongScore="0"
                      scoreStepName="玉雕的制作5.初稿雕琢"
-                          autoHide="1">
+                          autoHide="1"
+                       wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
             <!--安装，纹饰-->
@@ -630,13 +668,19 @@
                           rightLabel="提示：物品选择正确。"
                           wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                           rightEvent="物品准备通过"
-                          wrongEvent=""
+                          wrongEvent="物品准备失败"
                          rightScore="12.5"
                           wrongScore="0"
                           scoreStepName="玉雕的制作6.细雕"
-                          autoHide="1">
+                          autoHide="1"
+                       wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>
 
             <!--安装-->
@@ -700,13 +744,19 @@
                           rightLabel="提示：物品选择正确。"
                           wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                           rightEvent="物品准备通过"
-                          wrongEvent=""
+                          wrongEvent="物品准备失败"
                           rightScore="25"
                           wrongScore="-25"
                           scoreStepName="玉雕的制作7.打磨、抛光"
-                          autoHide="1">
+                          autoHide="1"
+                       wrongCount="3">
             </Action>
+
+            <Condition type="Or">
               <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>