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

Compare commits

base: WangWeiZhi:daac6e5ba6b243335058bd0aed2539f7754278d2
Branches Tags
WangWeiZhi:main
WangWeiZhi:HQB_workspace
...
compare: WangWeiZhi:93832af2abe8dfeb0a5e95d818354e9969d9cd92
Branches Tags
WangWeiZhi:HQB_workspace
WangWeiZhi:main

2 Commits
daac6e5ba6 ... 93832af2ab

Author SHA1 Message Date
YangHua 93832af2ab Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-02 18:13:28 +08:00
YangHua 872aff659d 修改流程 2024-09-02 18:13:17 +08:00
2 changed files with 4 additions and 2 deletions
Show Stats 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();

2
Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml
View File

@ -24,7 +24,7 @@
</Step> </Step>
<Step id="" subProcessName="正确着装" isPrecondition="FALSE" precondition="" tipTitle="" tips="请前往工具间，选取工作服、绝缘鞋、安全帽、手套，到梳妆镜面前进行换装"> <Step id="" subProcessName="正确着装" isPrecondition="FALSE" precondition="" tipTitle="" tips="请前往工具间，选取工作服、绝缘鞋、安全帽、手套，到梳妆镜面前进行换装">
<operation id="" subProcessStepName="前往工具间" isPrecondition="" precondition="Office" triggerID="工具间按钮" tipTitle="" score=""></operation> <operation id="" subProcessStepName="前往工具间" isPrecondition="" precondition="Office" triggerID="工具间按钮" tipTitle="前往工具间" score=""></operation>
<operation id="" subProcessStepName="选择着装" isPrecondition="" precondition="ToolRoom" triggerID="国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请点击正确的着装" score=""></operation> <operation id="" subProcessStepName="选择着装" isPrecondition="" precondition="ToolRoom" triggerID="国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请点击正确的着装" score=""></operation>
<operation id="" subProcessStepName="正确着装" isPrecondition="" precondition="ToolRoom" triggerID="镜子,国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请走到镜子面前，点击镜子" score=""></operation> <operation id="" subProcessStepName="正确着装" isPrecondition="" precondition="ToolRoom" triggerID="镜子,国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请走到镜子面前，点击镜子" score=""></operation>
</Step> </Step>