Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology
This commit is contained in:
commit
395c63e6b5
|
@ -142,7 +142,6 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id)
|
||||
{
|
||||
HandoverSubProcess(spID, 0);
|
||||
currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId;
|
||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
|
||||
Debug.Log("进入下一步子流程");
|
||||
return 2;
|
||||
|
@ -213,16 +212,19 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
CurrentSubProcessStepTriggerNames();
|
||||
});
|
||||
});
|
||||
currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.id;
|
||||
}
|
||||
else
|
||||
{
|
||||
CheckSubProcessSteps(subProcessStepId);
|
||||
currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.id;
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
CheckSubProcessSteps(subProcessStepId);
|
||||
currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.id;
|
||||
}
|
||||
}
|
||||
CurrentSubProcessStepTriggerNames();
|
||||
|
|
Loading…
Reference in New Issue