WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化流程代码

This commit is contained in:
YangHua 2024-08-29 19:23:37 +08:00
parent c7beeb4a7d
commit a156a7a228
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Scripts/Project/Manager/ProcessManager.cs
View File

@ -137,7 +137,6 @@ public class ProcessManager : BaseManager<ProcessManager>
{ {
HandoverSubProcess(spID, 0); HandoverSubProcess(spID, 0);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId); GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
//Debug.Log($"<color=red>进入下一步子流程</color>");
//Debug.Log("进入下一步子流程"); //Debug.Log("进入下一步子流程");
return true; return true;
} }
@ -171,13 +170,13 @@ public class ProcessManager : BaseManager<ProcessManager>
} }
} }
//public int currentSubProcessIDTemp = 0;
/// <summary> /// <summary>
/// 0 正常，1 不在当前步骤触发ID，2 当前步骤没有触发ID了 /// 0 正常，1 不在当前步骤触发ID，2 当前步骤没有触发ID了
/// </summary> /// </summary>
/// <param name="triggerID"></param> /// <param name="triggerName"></param>
/// <returns></returns> /// <returns></returns>
public int IsRightSubProcessStepsTriggerID(string triggerID, bool isRemove) public int IsRightSubProcessStepsTriggerID(string triggerName, bool isRemove)
{ {
if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) return 0; if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) return 0;
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.precondition == GameManager.RunModelMgr.SceneType.ToString()) if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.precondition == GameManager.RunModelMgr.SceneType.ToString())
@ -185,7 +184,7 @@ public class ProcessManager : BaseManager<ProcessManager>
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count > 0) if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count > 0)
{ {
string currentSubProcessStepTriggerID = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0]; string currentSubProcessStepTriggerID = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0];
if (triggerID == currentSubProcessStepTriggerID) if (triggerName == currentSubProcessStepTriggerID)
{ {
if (isRemove) if (isRemove)
{ {
@ -193,7 +192,15 @@ public class ProcessManager : BaseManager<ProcessManager>
} }
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count == 0) if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count == 0)
{ {
if (triggerID != "工具间按钮" && triggerID != "现场按钮" && triggerID != "收回工具") //if (currentSubProcessIDTemp == d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId)
//{
// Debug.Log($"<color=red>子流程id相等</color>");
//}
//else
//{
// Debug.Log($"<color=green>子流程id不相等</color>");
//}
if (triggerName != "工具间按钮" && triggerName != "现场按钮" && triggerName != "收回工具")
{ {
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) => GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
{ {
@ -210,6 +217,7 @@ public class ProcessManager : BaseManager<ProcessManager>
} }
} }
CurrentSubProcessStepTriggerNames(); CurrentSubProcessStepTriggerNames();
return 0; return 0;
} }
else else