From a156a7a228fd54612936d37cc2f3ebd2f1372142 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Thu, 29 Aug 2024 19:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Project/Manager/ProcessManager.cs | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Assets/Scripts/Project/Manager/ProcessManager.cs b/Assets/Scripts/Project/Manager/ProcessManager.cs index 1845aef..7ecc1c1 100644 --- a/Assets/Scripts/Project/Manager/ProcessManager.cs +++ b/Assets/Scripts/Project/Manager/ProcessManager.cs @@ -137,7 +137,6 @@ public class ProcessManager : BaseManager { HandoverSubProcess(spID, 0); GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId); - //Debug.Log($"进入下一步子流程"); //Debug.Log("进入下一步子流程"); return true; } @@ -171,13 +170,13 @@ public class ProcessManager : BaseManager } } - + //public int currentSubProcessIDTemp = 0; /// /// 0 正常,1 不在当前步骤触发ID,2 当前步骤没有触发ID了 /// - /// + /// /// - public int IsRightSubProcessStepsTriggerID(string triggerID, bool isRemove) + public int IsRightSubProcessStepsTriggerID(string triggerName, bool isRemove) { if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) return 0; if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.precondition == GameManager.RunModelMgr.SceneType.ToString()) @@ -185,7 +184,7 @@ public class ProcessManager : BaseManager if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count > 0) { string currentSubProcessStepTriggerID = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0]; - if (triggerID == currentSubProcessStepTriggerID) + if (triggerName == currentSubProcessStepTriggerID) { if (isRemove) { @@ -193,7 +192,15 @@ public class ProcessManager : BaseManager } if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count == 0) { - if (triggerID != "工具间按钮" && triggerID != "现场按钮" && triggerID != "收回工具") + //if (currentSubProcessIDTemp == d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId) + //{ + // Debug.Log($"子流程id相等"); + //} + //else + //{ + // Debug.Log($"子流程id不相等"); + //} + if (triggerName != "工具间按钮" && triggerName != "现场按钮" && triggerName != "收回工具") { GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (p) => { @@ -210,6 +217,7 @@ public class ProcessManager : BaseManager } } CurrentSubProcessStepTriggerNames(); + return 0; } else