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

修改清理杂物判断逻辑

This commit is contained in:
YangHua 2024-08-30 14:33:19 +08:00
parent 4766fa4d06
commit 1a4ec4d0e7
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
View File

@ -7,10 +7,13 @@ public class Device_Sundries : Device_Base
protected override void OnMDown() protected override void OnMDown()
{ {
base.OnMDown(); base.OnMDown();
Debug.Log("清理柜子杂物"); if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
gameObject.SetActive(false); {
triggerAction.Invoke(triggerName, false); Debug.Log("清理柜子杂物");
base.CallScoreAction(); gameObject.SetActive(false);
triggerAction.Invoke(triggerName, false);
base.CallScoreAction();
}
} }
} }

10
Assets/Scripts/Project/Manager/OfficeManager.cs
View File

@ -8,10 +8,11 @@ using UnityEngine;
/// </summary> /// </summary>
public class OfficeManager : SingletonMono<OfficeManager> public class OfficeManager : SingletonMono<OfficeManager>
{ {
public int currentProcessID; //public int currentProcessID;
public int currentSubProcessID; //public int currentSubProcessID;
public int currentSubProcessStepID; //public int currentSubProcessStepID;
public int currentSubProcessStepTriggerID; //public int currentSubProcessStepTriggerID;
/// <summary> /// <summary>
@ -20,7 +21,6 @@ public class OfficeManager : SingletonMono<OfficeManager>
public MobileController mobileController; public MobileController mobileController;
void Start() void Start()
{ {
GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver); GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI); GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI);
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)

6
Assets/Scripts/Project/Manager/ProcessManager.cs
View File

@ -150,12 +150,12 @@ public class ProcessManager : BaseManager<ProcessManager>
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId); GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId);
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($"<color=red>进入下一步流程</color>");
return true; return true;
} }
else else
{ {
//Debug.Log("完成所有"); Debug.Log($"<color=red>完成所有</color>");
return false; return false;
} }
@ -164,7 +164,7 @@ public class ProcessManager : BaseManager<ProcessManager>
} }
else else
{ {
//Debug.Log("按照流程走"); Debug.Log($"<color=red>按照流程走</color>");
StepErrorTips(); StepErrorTips();
return false; return false;
} }

4
Assets/Scripts/Project/UI/UI_Panel/UI_PlayerSessionPanel.cs
View File

@ -10,7 +10,7 @@ public class UI_PlayerSessionPanel : BasePanel
{ {
private string triggerID; private string triggerID;
public Action<string> callBack; public Action<string> callBack;
private float typingSpeed = 0.05f; private float typingSpeed = 0.05f;
/// <summary> /// <summary>
/// 初始化,state 0 激活另一个操作 /// 初始化,state 0 激活另一个操作
/// </summary> /// </summary>
@ -18,7 +18,7 @@ public class UI_PlayerSessionPanel : BasePanel
{ {
this.triggerID = triggerID; this.triggerID = triggerID;
callBack += _callBack; callBack += _callBack;
//GetControl<TextMeshProUGUI>("PlayerText_DialogBox").text = clientTalk /*"好的"*/; GetControl<TextMeshProUGUI>("PlayerText_DialogBox").text = "";
//UItext = GetControl<TextMeshProUGUI>("PlayerText_DialogBox"); //UItext = GetControl<TextMeshProUGUI>("PlayerText_DialogBox");
StartTypewriterEffect(clientTalk); StartTypewriterEffect(clientTalk);
} }