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

Compare commits

base: WangWeiZhi:2273c14be78c64c76b3b8af42af78236185990ce
Branches Tags
WangWeiZhi:main
WangWeiZhi:HQB_workspace
..
compare: WangWeiZhi:55ef60e0776a19a2281541895440a680c2379959
Branches Tags
WangWeiZhi:HQB_workspace
WangWeiZhi:main

No commits in common. "2273c14be78c64c76b3b8af42af78236185990ce" and "55ef60e0776a19a2281541895440a680c2379959" have entirely different histories.
2273c14be7 ... 55ef60e077

3 changed files with 14 additions and 18 deletions
Show Stats Expand all files Collapse all files

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

@ -136,9 +136,8 @@ public class ProcessManager : BaseManager<ProcessManager>
if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id) if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id)
{ {
HandoverSubProcess(spID, 0); HandoverSubProcess(spID, 0);
currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId;
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("进入下一步子流程");
return 2; return 2;
} }
else else
@ -173,7 +172,7 @@ public class ProcessManager : BaseManager<ProcessManager>
} }
} }
public int currentSubProcessIDTemp = 0; //public int currentSubProcessIDTemp = 0;
/// <summary> /// <summary>
/// 0 正常，1 不在当前步骤触发ID，2 当前步骤没有触发ID了 /// 0 正常，1 不在当前步骤触发ID，2 当前步骤没有触发ID了
/// </summary> /// </summary>
@ -195,10 +194,15 @@ public class ProcessManager : BaseManager<ProcessManager>
} }
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count == 0) if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count == 0)
{ {
if (triggerName != "工具间按钮" && triggerName != "现场按钮" && triggerName != "收回工具") if (triggerName != "工具间按钮" && triggerName != "现场按钮" && triggerName != "收回工具")
{ {
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId != currentSubProcessIDTemp) //if (CheckSubProcessSteps(subProcessStepId) == 3)
{ //{
//}
//else
//{
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) => GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
{ {
p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () => p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () =>
@ -207,12 +211,7 @@ public class ProcessManager : BaseManager<ProcessManager>
CurrentSubProcessStepTriggerNames(); CurrentSubProcessStepTriggerNames();
}); });
}); });
} //}
else
{
CheckSubProcessSteps(subProcessStepId);
}
} }
else else
{ {

7
Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
View File

@ -9,7 +9,6 @@ public class UI_SubProcessItem : BaseItem
public int processID; public int processID;
public int subProcessID; public int subProcessID;
public int subProcessStepID; public int subProcessStepID;
public string warnnigTips;
public void Init(D_SubProcess d_SubProcess, int subProcessID) public void Init(D_SubProcess d_SubProcess, int subProcessID)
{ {
@ -20,7 +19,6 @@ public class UI_SubProcessItem : BaseItem
gameObject.name = subProcessID.ToString(); gameObject.name = subProcessID.ToString();
SwitchSubProcess(subProcessID); SwitchSubProcess(subProcessID);
ShowMe(); ShowMe();
warnnigTips = "当前步骤还没有学完，确定要切换吗？";
} }
@ -40,9 +38,8 @@ public class UI_SubProcessItem : BaseItem
else else
GetControl<Image>("learningTips").gameObject.SetActive(false); GetControl<Image>("learningTips").gameObject.SetActive(false);
} }
public void OnResetClick(bool isReset) public void OnResetClick()
{ {
warnnigTips = isReset ? "是否重新学习？" : "当前步骤还没有学完，确定要切换吗？";
OnClick("subProcessBtn"); OnClick("subProcessBtn");
} }
protected override void OnClick(string btnName) protected override void OnClick(string btnName)
@ -56,7 +53,7 @@ public class UI_SubProcessItem : BaseItem
{ {
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) => GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
{ {
p.Init("提示", warnnigTips, E_MessageType.Error, () => p.Init("提示", "当前步骤还没有学完，确定要切换吗？", E_MessageType.Error, () =>
{ {
GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID); GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
//ÖØÖÃÎïÌå //ÖØÖÃÎïÌå

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

@ -52,12 +52,12 @@ public class UI_TaskListPanel : BasePanel
{ {
if (_content.GetChild(0).GetComponent<UI_SubProcessItem>()) if (_content.GetChild(0).GetComponent<UI_SubProcessItem>())
{ {
_content.GetChild(0).GetComponent<UI_SubProcessItem>().OnResetClick(true); _content.GetChild(0).GetComponent<UI_SubProcessItem>().OnResetClick();
return; return;
} }
if (_content.GetChild(1).GetComponent<UI_SubProcessItem>()) if (_content.GetChild(1).GetComponent<UI_SubProcessItem>())
{ {
_content.GetChild(1).GetComponent<UI_SubProcessItem>().OnResetClick(true); _content.GetChild(1).GetComponent<UI_SubProcessItem>().OnResetClick();
} }
} }