添加步骤完成提示，修复封印提示问题

Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs

@@ -11,9 +11,10 @@ public class Check_JieXian : PermanentTriggerBase
     /// 是否已检查接线完好
     /// </summary>
     public bool isChecked;
-    private void OnMouseDown()
+    protected override void OnMDown()
     {
-        if (SiteManager.instance.measuringCabinet.jieXian_lines.TrueForAll(a=>a.isConnected) && SiteManager.instance.measuringCabinet.meteringDevice.jieXian_screws.TrueForAll(a=>a.isInstall))
+        base.OnMDown();
+        if (SiteManager.instance.measuringCabinet.jieXian_lines.TrueForAll(a => a.isConnected) && SiteManager.instance.measuringCabinet.meteringDevice.jieXian_screws.TrueForAll(a => a.isInstall))
         {
             Invoke("Check", 1);
         }
@@ -24,19 +25,23 @@ public class Check_JieXian : PermanentTriggerBase
     /// </summary>
     public void Check()
     {
-        Debug.Log("½ÓÏßÍêºÃ");
+        if (GameManager.ProcessMgr?.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
-        isChecked = true;
-        GetComponent<BoxCollider>().enabled = false;
-
-        if (GameManager.UIMgr != null)
         {
-            GameObject tip2 = Instantiate<GameObject>(Resources.Load<GameObject>("UI/UI_Tip/TipPanel"),GameManager.UIMgr.canvas.transform);
+
-            TipPanel tipPanel = tip2.GetComponent<TipPanel>();
+            Debug.Log("½ÓÏßÍêºÃ");
-            tipPanel.Init("½ÓÏßÍêºÃ£¡");
+            isChecked = true;
+            GetComponent<BoxCollider>().enabled = false;
+
+            if (GameManager.UIMgr != null)
+            {
+                GameObject tip2 = Instantiate<GameObject>(Resources.Load<GameObject>("UI/UI_Tip/TipPanel"), GameManager.UIMgr.canvas.transform);
+                TipPanel tipPanel = tip2.GetComponent<TipPanel>();
+                tipPanel.Init("½ÓÏßÍêºÃ£¡");
+            }
+
+            //GameManager.ProcessMgr?.IsRightSubProcessStepsTriggerID(triggerName, true);
+
+            base.CallScoreAction(true);
         }
-
-        GameManager.ProcessMgr?.IsRightSubProcessStepsTriggerID(triggerName, true);
-
-        base.CallScoreAction(true);
     }
 }

Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs

@@ -23,17 +23,23 @@ public class Tool_BoxSeal : Tool_Base
                         //ÂÝË¿Å¡ÉÏÁ˾Ͱ²×°·âÓ¡
                         if (screw == SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_screw_Left && SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_screw_Left.isInstall)
                         {
-                            //盖子左封印
+                            if ((triggerAction == null ? 0 : triggerAction.Invoke(screw.triggerName, true)) == 0)
-                            SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.Install();
+                            {
-                            //打分
+                                //盖子左封印
-                            SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.CallScoreAction(true);
+                                SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.Install();
+                                //打分
+                                SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.CallScoreAction(true);
+                            }
                         }
                         else if (screw == SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_screw_Right && SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_screw_Right.isInstall)
                         {
-                            //盖子右封印
+                            if ((triggerAction == null ? 0 : triggerAction.Invoke(screw.triggerName, true)) == 0)
-                            SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.Install();
+                            {
-                            //打分
+                                //盖子右封印
-                            SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.CallScoreAction(true);
+                                SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.Install();
+                                //打分
+                                SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.CallScoreAction(true);
+                            }
                         }
                     }
                 }

Assets/Scripts/CXX/Tools/Tool_TestPen.cs

@@ -70,7 +70,7 @@ public class Tool_TestPen : Tool_Base
     /// <param name="device_base">被验电设备</param>
     public void Test(Device_Base device_base)
     {
-        if ((triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true)) == 0)
+        if ((triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", false)) == 0)
         {
             if (device_base.deviceType == DeviceType.计量柜_插座)
             {
@@ -83,6 +83,7 @@ public class Tool_TestPen : Tool_Base
                     Debug.Log("计量柜_插座 已验电");
                     isFlicker = tmp.hasElectricity;
                     screem.materials[0].color = isFlicker ? Color.red : Color.white;
+                    int index = (triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true));
                     base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}");
                 });
             }
@@ -98,6 +99,7 @@ public class Tool_TestPen : Tool_Base
                     Debug.Log("计量柜_柜门 已验电");
                     isFlicker = tmp.hasElectricity;
                     screem.materials[0].color = isFlicker ? Color.red : Color.white;
+                    int index = (triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true));
                     base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}");
                 });
             }

Assets/Scripts/CXX/Tools/Tool_WireStripper.cs

@@ -52,8 +52,8 @@ public class Tool_WireStripper : Tool_Base
         //¼ô¶Ï
         device_Seal.Cut();
         isCuning = false;
-        //int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
         ReBackHead();
+        int result = (triggerAction == null ? 0 : triggerAction.Invoke(device_Seal.triggerName, true));
     }
 
     private void Update()
@@ -68,7 +68,7 @@ public class Tool_WireStripper : Tool_Base
                 Device_Seal ds = hit.transform.GetComponent<Device_Seal>();
                 if (ds != null)
                 {
-                    if ((triggerAction == null ? 0 : triggerAction.Invoke(ds.triggerName, true))== 0)
+                    if ((triggerAction == null ? 0 : triggerAction.Invoke(ds.triggerName, false))== 0)
                     {
                         CutOpen(ds);
                     }

Assets/Scripts/Project/DataClass/ProcessData/D_Process.cs

@@ -90,7 +90,7 @@ public class D_Process : I_Enter, I_Exit
             CurrentSubProcess.Exit();
         CurrentSubProcess = GetSubProcess(subProcessId);
         CurrentSubProcess.Enter();
-        UnityEngine.Debug.Log("切换子流程到:" + subProcessId);
+        //UnityEngine.Debug.Log("切换子流程到:" + subProcessId);
         if (subProcessStepId == 0)
             CurrentSubProcess.HandoverSubProcessStep(CurrentSubProcess.subProcessStepes[0].id);
         else
@@ -127,7 +127,7 @@ public class D_Process : I_Enter, I_Exit
     /// </summary>
     public void Enter()
     {
-        UnityEngine.Debug.Log("进入当前流程:" + id + "_" + processName);
+        //UnityEngine.Debug.Log("进入当前流程:" + id + "_" + processName);
     }
 
     /// <summary>
@@ -135,6 +135,6 @@ public class D_Process : I_Enter, I_Exit
     /// </summary>
     public void Exit()
     {
-        UnityEngine.Debug.Log("退出当前流程:" + id + "_" + processName);
+        //UnityEngine.Debug.Log("退出当前流程:" + id + "_" + processName);
     }
 }

Assets/Scripts/Project/DataClass/ProcessData/D_Scheme.cs

@@ -83,7 +83,7 @@ public class D_Scheme
             CurrentProcess.Exit();
         CurrentProcess = GetProcess(processId);
         CurrentProcess.Enter();
-        UnityEngine.Debug.Log("切换流程到:" + processId);
+        //UnityEngine.Debug.Log("切换流程到:" + processId);
         if (subProcessId == 0)
             CurrentProcess.HandoverSubProcess(CurrentProcess.subProcesses[0].id, subProcessStepId);
         else

Assets/Scripts/Project/DataClass/ProcessData/D_SubProcess.cs

@@ -108,8 +108,8 @@ public class D_SubProcess : I_Enter, I_Exit
             CurrentSubProcessStep.Exit();
         CurrentSubProcessStep = GetSubProcessStep(stepId);
         CurrentSubProcessStep.Enter();
-        UnityEngine.Debug.Log("切换子流程步骤到:" + stepId);
+        //UnityEngine.Debug.Log("切换子流程步骤到:" + stepId);
-        UnityEngine.Debug.Log("切换子流程步骤TriggerID到:" + ProcessManager.Instance.subProcessStepTriggerID);
+        //UnityEngine.Debug.Log("切换子流程步骤TriggerID到:" + ProcessManager.Instance.subProcessStepTriggerID);
     }
 
     /// <summary>
@@ -135,7 +135,7 @@ public class D_SubProcess : I_Enter, I_Exit
     /// </summary>
     public void Exit()
     {
-        UnityEngine.Debug.Log("退出当前子流程:" + id + "_" + subProcessName);
+        //UnityEngine.Debug.Log("退出当前子流程:" + id + "_" + subProcessName);
     }
 
     /// <summary>
@@ -143,6 +143,6 @@ public class D_SubProcess : I_Enter, I_Exit
     /// </summary>
     public void Enter()
     {
-        UnityEngine.Debug.Log("进入当前子流程:" + id + "_" + subProcessName);
+        //UnityEngine.Debug.Log("进入当前子流程:" + id + "_" + subProcessName);
     }
 }

Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs

@@ -66,7 +66,7 @@ public class D_SubProcessStep : I_Enter, I_Exit
     public void Enter()
     {
         //GetTriggerID();
-        UnityEngine.Debug.Log("进入当前子流程步骤:" + id + "_" + subProcessStepName);
+        //UnityEngine.Debug.Log("进入当前子流程步骤:" + id + "_" + subProcessStepName);
     }
     /// <summary>
     /// 退出
@@ -75,6 +75,6 @@ public class D_SubProcessStep : I_Enter, I_Exit
     {
         //triggersId.Clear();
         //triggersComplete.Clear();
-        UnityEngine.Debug.Log("退出当前子流程步骤:" + id + "_" + subProcessStepName);
+        //UnityEngine.Debug.Log("退出当前子流程步骤:" + id + "_" + subProcessStepName);
     }
 }

Assets/Scripts/Project/Manager/ProcessManager.cs

@@ -137,7 +137,7 @@ public class ProcessManager : BaseManager<ProcessManager>
                 {
                     HandoverSubProcess(spID, 0);
                     GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
-
+                    //Debug.Log($"<color=red>进入下一步子流程</color>");
                     //Debug.Log("进入下一步子流程");
                     return true;
                 }
@@ -188,33 +188,28 @@ public class ProcessManager : BaseManager<ProcessManager>
                 if (triggerID == currentSubProcessStepTriggerID)
                 {
                     if (isRemove)
+                    {
                         d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.RemoveAt(0);
+                    }
                     if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count == 0)
                     {
-                        Debug.Log($"<color=red>当前步骤做完了</color>");
+                        if (triggerID != "工具间按钮" && triggerID != "现场按钮" && triggerID != "收回工具")
-                        GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
                         {
-                            p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () =>
+                            GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
                             {
-                                CheckSubProcessSteps(subProcessStepId);
+                                p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () =>
-                                if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count != 0)
                                 {
-                                    string triggerNameTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0];
+                                    CheckSubProcessSteps(subProcessStepId);
-                                    string splitResult = "";
+                                    CurrentSubProcessStepTriggerNames();
-                                    if (triggerNameTemp.Contains("+"))
+                                });
-                                    {
-                                        splitResult = triggerNameTemp.Split('+')[1];
-                                    }
-                                    else
-                                    {
-                                        splitResult = triggerNameTemp;
-                                    }
-                                    subProcessStepTriggerID = splitResult;
-                                    GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult);
-                                }
                             });
-                        });
+                        }
+                        else
+                        {
+                            CheckSubProcessSteps(subProcessStepId);
+                        }
                     }
+                    CurrentSubProcessStepTriggerNames();
                     return 0;
                 }
                 else
@@ -236,6 +231,31 @@ public class ProcessManager : BaseManager<ProcessManager>
         }
     }
 
+    /// <summary>
+    /// 切换流程之后， 当前子流程步骤triggerName不等于0的时候操作
+    /// </summary>
+    private void CurrentSubProcessStepTriggerNames()
+    {
+        if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count != 0)
+        {
+            string triggerNameTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0];
+            string splitResult = "";
+            if (triggerNameTemp.Contains("+"))
+            {
+                splitResult = triggerNameTemp.Split('+')[1];
+            }
+            else
+            {
+                splitResult = triggerNameTemp;
+            }
+            subProcessStepTriggerID = splitResult;
+            GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult);
+        }
+    }
+
+    /// <summary>
+    /// 操作错子流程步骤的triggerName的错误提示
+    /// </summary>
     private void StepErrorTips()
     {
         if (GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>())

Assets/Scripts/Project/Objects/Other/ImageTips.cs

@@ -31,7 +31,6 @@ public class ImageTips : MonoBehaviour
     {
         if (tween != null)
             tween.Kill(true);
-        //image.DOKill();
         transform.parent = null;
         gameObject.SetActive(false);
     }

Assets/Scripts/Project/Objects/Other/MobileController.cs

@@ -34,15 +34,16 @@ public class MobileController : PermanentTriggerBase
         }
     }
 
-    private void PlayerTalk(string triggerID)
+    private void PlayerTalk(string triggerName)
     {
-        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerID, true) == 0)
+        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false) == 0)
         {
             GameManager.UIMgr.ShowPanel<UI_CustomSessionPanel>(E_UI_Layer.Mid, (panel) =>
             {
-                panel.Init(triggerID, "ºÃµÄ", (intTemp) =>
+                panel.Init(triggerName, "ºÃµÄ", (intTemp) =>
                 {
                     ScoreManager.instance.Check(triggerName, "工作预约完成");
+                    GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true);
                     GameManager.UIMgr.HidePanel<UI_CustomSessionPanel>();
                 });
             });

Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs

@@ -45,7 +45,10 @@ public class UI_CheckMyselfPanel : BasePanel
     private void OnWearState()
     {
         if (PacksackBagMgr.Instance.IsWeared(validToolNames))
+        {
+            GameManager.UIMgr.imageTips.HideTips();
             GameManager.UIMgr.HidePanel<UI_CheckMyselfPanel>();
+        }
     }
 
     protected override void OnClick(string btnName)