diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
index 74c7a02..36755a6 100644
--- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
+++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
@@ -35,7 +35,7 @@ public class StepState_1002 : StepState
/// 从场景第一步会依次往下执行,直到指定步骤
///
///
- public override void SetStepState(int num)
+ public override void SetStepState(int num, int lastNum)
{
Debug.Log("切换步骤"+num);
if (num == 3001)
@@ -64,14 +64,18 @@ public class StepState_1002 : StepState
//清空背包
PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial();
+
//完成第一步点击去工具间
- E_SceneType curret=GameManager.RunModelMgr.SceneType;
- GameManager.RunModelMgr.SceneType = E_SceneType.Office;
- if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("工具间按钮", true)==0)
+ if (num == lastNum)
{
- Debug.Log("工具间按钮已点击");
+ E_SceneType curret = GameManager.RunModelMgr.SceneType;
+ GameManager.RunModelMgr.SceneType = E_SceneType.Office;
+ if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("工具间按钮", true) == 0)
+ {
+ Debug.Log("工具间按钮已自动点击");
+ }
+ GameManager.RunModelMgr.SceneType = curret;
}
- GameManager.RunModelMgr.SceneType = curret;
}
else if (num == 3006)
{
@@ -94,13 +98,16 @@ public class StepState_1002 : StepState
//与客户沟通
//完成第一步点击去工具间
- E_SceneType curret = GameManager.RunModelMgr.SceneType;
- GameManager.RunModelMgr.SceneType = E_SceneType.ToolRoom;
- if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("现场按钮", true) == 0)
+ if (num == lastNum)
{
- Debug.Log("现场按钮已点击");
+ E_SceneType curret = GameManager.RunModelMgr.SceneType;
+ GameManager.RunModelMgr.SceneType = E_SceneType.ToolRoom;
+ if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("现场按钮", true) == 0)
+ {
+ Debug.Log("现场按钮已自动点击");
+ }
+ GameManager.RunModelMgr.SceneType = curret;
}
- GameManager.RunModelMgr.SceneType = curret;
#region 背包重置并带上正确装备
diff --git a/Assets/Scripts/CXX/StepState/StepState.cs b/Assets/Scripts/CXX/StepState/StepState.cs
index b3d1364..3fa43ff 100644
--- a/Assets/Scripts/CXX/StepState/StepState.cs
+++ b/Assets/Scripts/CXX/StepState/StepState.cs
@@ -40,7 +40,7 @@ public abstract class StepState : MonoBehaviour
{
if(item.Key>=first && item.Key<=num)
{
- SetStepState(item.Key);
+ SetStepState(item.Key,num);
}
}
});
@@ -91,6 +91,11 @@ public abstract class StepState : MonoBehaviour
}
}
- public abstract void SetStepState(int num);
+///
+/// 执行步骤还原
+///
+/// 要执行的步骤
+/// 目标步骤
+ public abstract void SetStepState(int num,int lastNum);
}