diff --git a/Assets/Scripts/Project/Manager/ProcessManager.cs b/Assets/Scripts/Project/Manager/ProcessManager.cs index 54f81a1..eeca618 100644 --- a/Assets/Scripts/Project/Manager/ProcessManager.cs +++ b/Assets/Scripts/Project/Manager/ProcessManager.cs @@ -136,8 +136,9 @@ public class ProcessManager : BaseManager if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id) { HandoverSubProcess(spID, 0); + currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId; GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId); - //Debug.Log("进入下一步子流程"); + Debug.Log("进入下一步子流程"); return 2; } else @@ -172,7 +173,7 @@ public class ProcessManager : BaseManager } } - //public int currentSubProcessIDTemp = 0; + public int currentSubProcessIDTemp = 0; /// /// 0 正常,1 不在当前步骤触发ID,2 当前步骤没有触发ID了 /// @@ -194,15 +195,10 @@ public class ProcessManager : BaseManager } if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count == 0) { - if (triggerName != "工具间按钮" && triggerName != "现场按钮" && triggerName != "收回工具") { - //if (CheckSubProcessSteps(subProcessStepId) == 3) - //{ - - //} - //else - //{ + if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId != currentSubProcessIDTemp) + { GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (p) => { p.Init("提示", "当前步骤已完成,即将进入下一步", E_MessageType.Normal, () => @@ -211,7 +207,12 @@ public class ProcessManager : BaseManager CurrentSubProcessStepTriggerNames(); }); }); - //} + } + else + { + CheckSubProcessSteps(subProcessStepId); + } + } else { diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs index 1401c4f..fe284ad 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs @@ -9,6 +9,7 @@ public class UI_SubProcessItem : BaseItem public int processID; public int subProcessID; public int subProcessStepID; + public string warnnigTips; public void Init(D_SubProcess d_SubProcess, int subProcessID) { @@ -19,6 +20,7 @@ public class UI_SubProcessItem : BaseItem gameObject.name = subProcessID.ToString(); SwitchSubProcess(subProcessID); ShowMe(); + warnnigTips = "ǰ軹ûѧ꣬ȷҪл"; } @@ -38,8 +40,9 @@ public class UI_SubProcessItem : BaseItem else GetControl("learningTips").gameObject.SetActive(false); } - public void OnResetClick() + public void OnResetClick(bool isReset) { + warnnigTips = isReset ? "Ƿѧϰ" : "ǰ軹ûѧ꣬ȷҪл"; OnClick("subProcessBtn"); } protected override void OnClick(string btnName) @@ -53,7 +56,7 @@ public class UI_SubProcessItem : BaseItem { GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (p) => { - p.Init("ʾ", "ǰ軹ûѧ꣬ȷҪл", E_MessageType.Error, () => + p.Init("ʾ", warnnigTips, E_MessageType.Error, () => { GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID); // diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs index 4b2cf16..1dc4d12 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs @@ -52,12 +52,12 @@ public class UI_TaskListPanel : BasePanel { if (_content.GetChild(0).GetComponent()) { - _content.GetChild(0).GetComponent().OnResetClick(); + _content.GetChild(0).GetComponent().OnResetClick(true); return; } if (_content.GetChild(1).GetComponent()) { - _content.GetChild(1).GetComponent().OnResetClick(); + _content.GetChild(1).GetComponent().OnResetClick(true); } }