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:
YangHua 2024-08-27 17:12:18 +08:00
parent f6f03a7fbf 311bdcfb64
commit 0130b56fc6
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
View File

@ -35,7 +35,7 @@ public class StepState_1002 : StepState
/// 从场景第一步会依次往下执行，直到指定步骤 /// 从场景第一步会依次往下执行，直到指定步骤
/// </summary> /// </summary>
/// <param name="num"></param> /// <param name="num"></param>
public override void SetStepState(int num) public override void SetStepState(int num, int lastNum)
{ {
Debug.Log("切换步骤"+num); Debug.Log("切换步骤"+num);
if (num == 3001) if (num == 3001)
@ -64,15 +64,19 @@ public class StepState_1002 : StepState
//清空背包 //清空背包
PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial(); PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial();
//完成第一步点击去工具间 //完成第一步点击去工具间
E_SceneType curret=GameManager.RunModelMgr.SceneType; if (num == lastNum)
GameManager.RunModelMgr.SceneType = E_SceneType.Office;
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("묏야쇌객큐", true)==0)
{ {
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) else if (num == 3006)
{ {
@ -93,6 +97,19 @@ public class StepState_1002 : StepState
//场景首个步骤 //场景首个步骤
//与客户沟通 //与客户沟通
//完成第一步点击去工具间
if (num == lastNum)
{
E_SceneType curret = GameManager.RunModelMgr.SceneType;
GameManager.RunModelMgr.SceneType = E_SceneType.ToolRoom;
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("现场按钮", true) == 0)
{
Debug.Log("现场按钮已自动点击");
}
GameManager.RunModelMgr.SceneType = curret;
}
#region 背包重置并带上正确装备 #region 背包重置并带上正确装备
//清空背包数据 //清空背包数据
@ -135,6 +152,8 @@ public class StepState_1002 : StepState
//盖子拆下来 //盖子拆下来
SiteManager.instance.measuringCabinet.meteringDevice.CoverUnstallState(); SiteManager.instance.measuringCabinet.meteringDevice.CoverUnstallState();
//封印拆掉
SiteManager.instance.measuringCabinet.meteringDevice.CoverSealUninstallState();
//接线已检查 //接线已检查
SiteManager.instance.measuringCabinet.check_JieXian.isChecked = true; SiteManager.instance.measuringCabinet.check_JieXian.isChecked = true;
@ -162,6 +181,8 @@ public class StepState_1002 : StepState
SiteManager.instance.measuringCabinet.meteringDevice.Init(false); SiteManager.instance.measuringCabinet.meteringDevice.Init(false);
SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(false); SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(false);
SiteManager.instance.measuringCabinet.meteringDevice = null; SiteManager.instance.measuringCabinet.meteringDevice = null;
//杂物显示
SiteManager.instance.measuringCabinet.sundries.gameObject.SetActive(true);
//电能表接线取下了 //电能表接线取下了
SiteManager.instance.measuringCabinet.jieXian_lines.ForEach(screw => SiteManager.instance.measuringCabinet.jieXian_lines.ForEach(screw =>

9
Assets/Scripts/CXX/StepState/StepState.cs
View File

@ -40,7 +40,7 @@ public abstract class StepState : MonoBehaviour
{ {
if(item.Key>=first && item.Key<=num) 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); /// <summary>
/// 执行步骤还原
/// </summary>
/// <param name="num">要执行的步骤</param>
/// <param name="lastNum">目标步骤</param>
public abstract void SetStepState(int num,int lastNum);
} }