From 872aff659d7c2a1e4f5067a4670c37fe645b456c Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Mon, 2 Sep 2024 18:13:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Project/Manager/ProcessManager.cs              | 4 +++-
 .../StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/Project/Manager/ProcessManager.cs b/Assets/Scripts/Project/Manager/ProcessManager.cs
index eeca618..5519c28 100644
--- a/Assets/Scripts/Project/Manager/ProcessManager.cs
+++ b/Assets/Scripts/Project/Manager/ProcessManager.cs
@@ -136,7 +136,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;
@@ -207,16 +206,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();
diff --git a/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml b/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml
index 059c463..1796356 100644
--- a/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml
+++ b/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml
@@ -24,7 +24,7 @@
           </Step>
 
           <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>
           </Step>