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

Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
陈向学 2024-09-02 18:29:13 +08:00
parent 7f76d83eda 93832af2ab
commit 395c63e6b5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,6 @@ public class ProcessManager : BaseManager<ProcessManager>
if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id) if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id)
{ {
HandoverSubProcess(spID, 0); HandoverSubProcess(spID, 0);
currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId;
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId); GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
Debug.Log("进入下一步子流程"); Debug.Log("进入下一步子流程");
return 2; return 2;
@ -213,16 +212,19 @@ public class ProcessManager : BaseManager<ProcessManager>
CurrentSubProcessStepTriggerNames(); CurrentSubProcessStepTriggerNames();
}); });
}); });
currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.id;
} }
else else
{ {
CheckSubProcessSteps(subProcessStepId); CheckSubProcessSteps(subProcessStepId);
currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.id;
} }
} }
else else
{ {
CheckSubProcessSteps(subProcessStepId); CheckSubProcessSteps(subProcessStepId);
currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.id;
} }
} }
CurrentSubProcessStepTriggerNames(); CurrentSubProcessStepTriggerNames();