优化流程

Assets/Resources/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.prefab

@@ -27665,6 +27665,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6b1cb0c16706db34f8a5d7111f1cd3a6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  triggerID: 0
 --- !u!1 &5092569754032104682
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -47,6 +47,16 @@ public class D_SubProcessStep : I_Enter, I_Exit
         }
     }
 
+    public string SceneName()
+    {
+        if (precondition == "Office")
+            return "办公室";
+        if (precondition == "ToolRoom")
+            return "工具间";
+        if (precondition == "Site")
+            return "现场";
+        return "";
+    }
 
 
     /// <summary>

Assets/Scripts/Project/Enum/Enums.cs

@@ -89,14 +89,6 @@ public enum E_ModeType
     Exam,
 }
 
-//public enum E_SceneName
-//{
-//    None,
-//    Office,
-//    ToolRoom,
-//    LiveScene
-//}
-
 /// <summary>
 /// 工具材料设备
 /// </summary>

Assets/Scripts/Project/Manager/ProcessManager.cs

@@ -124,8 +124,6 @@ public class ProcessManager : BaseManager<ProcessManager>
             if (spStepID <= d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes[spStepcount - 1].id)
             {
                 HandoverSubProcessStep(spStepID);
-                GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, subProcessStepID);
-                //GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, subProcessStepTriggerID);
                 GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
                 {
                     panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
@@ -140,7 +138,6 @@ public class ProcessManager : BaseManager<ProcessManager>
                 if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id)
                 {
                     HandoverSubProcess(spID, 0);
-                    GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId);
                     GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
                     GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
                     {
@@ -193,29 +190,40 @@ public class ProcessManager : BaseManager<ProcessManager>
     /// <returns></returns>
     public int IsRightSubProcessStepsTriggerID(int triggerID, bool isRemove)
     {
-        if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
+        if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.precondition == GameManager.RunModelMgr.SceneType.ToString())
         {
-            int currentSubProcessStepTriggerID = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
+
-            if (triggerID == currentSubProcessStepTriggerID)
+            if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
             {
-                //GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, currentSubProcessStepTriggerID);
+                int currentSubProcessStepTriggerID = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
-                if (isRemove)
+                if (triggerID == currentSubProcessStepTriggerID)
-                    d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
+                {
-                return 0;
+                    if (isRemove)
+                        d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
+                    return 0;
+                }
+                else
+                {
+                    GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
+                    {
+                        p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
+                    });
+                    return 1;
+                }
             }
             else
             {
-                GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
+                Debug.Log($"<color=red>没有提示</color>");
-                {
+                return 2;
-                    p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
-                });
-                return 1;
             }
         }
         else
         {
-            Debug.Log($"<color=red>没有提示</color>");
+            GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
-            return 2;
+            {
+                p.Init($"错误,请前往{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.SceneName()}");
+            });
+            return -1;
         }
     }
 

Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs

@@ -49,7 +49,6 @@ public class UI_SubProcessItem : BaseItem
         {
             case "subProcessBtn":
                 GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
-                GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, subProcessStepID);
                 GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
                 break;
         }

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

@@ -39,6 +39,11 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
             case "Button_Confirm":
                 submit = true;
                 Debug.Log(submit);
+                if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerID, true) == 0)
+                {
+                    GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
+                    GameManager.UIMgr.HidePanel<UI_InstallAndDismantleTicketPanel>();
+                }
                 break;
             case "Button_Close":