提交宝石琢磨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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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/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="StrEvent" value="物品准备通过"></Condition>
+
+          <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="StrEvent" value="物品准备通过"></Condition>
+
+          <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="StrEvent" value="物品准备通过"></Condition>
+
+          <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="StrEvent" value="物品准备通过"></Condition>
+
+
+          <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <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="StrEvent" value="物品准备通过"></Condition>
+
+            <Condition type="Or">
+              <Condition type="StrEvent" value="物品准备通过"></Condition>
+              <Condition type="StrEvent" value="物品准备失败"></Condition>
+            </Condition>
+
             <Action type="UIShow" value="UITools" isShow="false"></Action>