修改提示为常驻
This commit is contained in:
parent
072d03ee12
commit
0a75301cc3
|
@ -42,13 +42,13 @@ public class Device_NamePlate : Device_Base
|
||||||
{
|
{
|
||||||
Debug.Log("核查完成");
|
Debug.Log("核查完成");
|
||||||
isChecked = true;
|
isChecked = true;
|
||||||
if (GameManager.UIMgr != null)
|
//if (GameManager.UIMgr != null)
|
||||||
{
|
//{
|
||||||
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
// GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
||||||
{
|
// {
|
||||||
panel.Init($"{""}:<color=blue>{""}</color>", $"{"核对和抄录完成!"}");
|
// //panel.Init($"{""}:<color=blue>{""}</color>", $"{"核对和抄录完成!"}");
|
||||||
});
|
// });
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,11 +17,24 @@ public class OfficeManager : MonoBehaviour
|
||||||
{
|
{
|
||||||
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);
|
||||||
|
GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SwitchSubProcess(int subProcess)
|
||||||
|
{
|
||||||
|
if (!GameManager.UIMgr.GetPanel<UI_TopTipPanel>())
|
||||||
|
{
|
||||||
|
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
||||||
|
{
|
||||||
|
panel.Init($"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.processName}:<color=blue>{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.tips}", false);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GameManager.UIMgr.GetPanel<UI_TopTipPanel>().Init($"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.processName}:<color=blue>{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.tips}", false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void OfficeTimeLineOver()
|
private void OfficeTimeLineOver()
|
||||||
{
|
{
|
||||||
|
@ -55,6 +68,7 @@ public class OfficeManager : MonoBehaviour
|
||||||
{
|
{
|
||||||
GameManager.EventMgr.RemoveEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
|
GameManager.EventMgr.RemoveEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
|
||||||
GameManager.EventMgr.RemoveEventListener(Enum_EventType.InitializationUI, InitializationUI);
|
GameManager.EventMgr.RemoveEventListener(Enum_EventType.InitializationUI, InitializationUI);
|
||||||
|
//GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,10 +125,7 @@ public class ProcessManager : BaseManager<ProcessManager>
|
||||||
if (spStepID <= d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes[spStepcount - 1].id)
|
if (spStepID <= d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes[spStepcount - 1].id)
|
||||||
{
|
{
|
||||||
HandoverSubProcessStep(spStepID);
|
HandoverSubProcessStep(spStepID);
|
||||||
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
|
||||||
{
|
|
||||||
panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
|
|
||||||
});
|
|
||||||
Debug.Log("进入下一步子流程步骤");
|
Debug.Log("进入下一步子流程步骤");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -140,10 +137,7 @@ public class ProcessManager : BaseManager<ProcessManager>
|
||||||
{
|
{
|
||||||
HandoverSubProcess(spID, 0);
|
HandoverSubProcess(spID, 0);
|
||||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
|
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
|
||||||
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
|
||||||
{
|
|
||||||
panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
|
|
||||||
});
|
|
||||||
Debug.Log("进入下一步子流程");
|
Debug.Log("进入下一步子流程");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -156,10 +150,7 @@ public class ProcessManager : BaseManager<ProcessManager>
|
||||||
HandoverProcess(pID, 0, 0);
|
HandoverProcess(pID, 0, 0);
|
||||||
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);
|
||||||
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
|
||||||
{
|
|
||||||
panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
|
|
||||||
});
|
|
||||||
Debug.Log("进入下一步流程");
|
Debug.Log("进入下一步流程");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ public class UI_TopTipPanel : BasePanel
|
||||||
/// 面板显示后几秒后消失
|
/// 面板显示后几秒后消失
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private float disappear = 5f;
|
private float disappear = 5f;
|
||||||
public void Init(string title, string content)
|
public void Init(string title, string content, bool isHide)
|
||||||
{
|
{
|
||||||
disappear = 5f;
|
disappear = 5f;
|
||||||
GetControl<TextMeshProUGUI>("Text_Title").text = title;
|
GetControl<TextMeshProUGUI>("Text_Title").text = title;
|
||||||
|
@ -19,7 +19,8 @@ public class UI_TopTipPanel : BasePanel
|
||||||
GetControl<TextMeshProUGUI>("Text_Content").GetComponent<ContentSizeFitter>().SetLayoutVertical();
|
GetControl<TextMeshProUGUI>("Text_Content").GetComponent<ContentSizeFitter>().SetLayoutVertical();
|
||||||
var height = GetControl<TextMeshProUGUI>("Text_Content").rectTransform.sizeDelta.y + 60 + 40;
|
var height = GetControl<TextMeshProUGUI>("Text_Content").rectTransform.sizeDelta.y + 60 + 40;
|
||||||
GetControl<Image>("Image_BackGround").rectTransform.sizeDelta = new Vector2(640, height);
|
GetControl<Image>("Image_BackGround").rectTransform.sizeDelta = new Vector2(640, height);
|
||||||
Hide();
|
if (isHide)
|
||||||
|
Hide();
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 面板消失
|
/// 面板消失
|
||||||
|
|
Loading…
Reference in New Issue