Compare commits

..

No commits in common. "55c627529303afbfa726f4cd0c2ff9629ef9d075" and "c81f019ce30b8495628e9645ae92d6205cbd6bba" have entirely different histories.

4 changed files with 15 additions and 18 deletions

View File

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

View File

@ -8,11 +8,10 @@ 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>
@ -21,6 +20,7 @@ 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)

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

View File

@ -18,7 +18,7 @@ public class UI_PlayerSessionPanel : BasePanel
{ {
this.triggerID = triggerID; this.triggerID = triggerID;
callBack += _callBack; callBack += _callBack;
GetControl<TextMeshProUGUI>("PlayerText_DialogBox").text = ""; //GetControl<TextMeshProUGUI>("PlayerText_DialogBox").text = clientTalk /*"好的"*/;
//UItext = GetControl<TextMeshProUGUI>("PlayerText_DialogBox"); //UItext = GetControl<TextMeshProUGUI>("PlayerText_DialogBox");
StartTypewriterEffect(clientTalk); StartTypewriterEffect(clientTalk);
} }