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

Compare commits

base: WangWeiZhi:118ceaef5f68d6434a961d986aa73b9d54d76b76
Branches Tags
WangWeiZhi:main
WangWeiZhi:HQB_workspace
..
compare: WangWeiZhi:2475ebc28fb75d3e328ae45cdab1ddffc7f463a2
Branches Tags
WangWeiZhi:HQB_workspace
WangWeiZhi:main

No commits in common. "118ceaef5f68d6434a961d986aa73b9d54d76b76" and "2475ebc28fb75d3e328ae45cdab1ddffc7f463a2" have entirely different histories.
118ceaef5f ... 2475ebc28f

6 changed files with 29 additions and 45 deletions
Show Stats Expand all files Collapse all files

3
Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs
View File

@ -35,9 +35,8 @@ public class Device_DirectAccessElectricEnergyMeteringDevice : Device_Base
private BoxCollider boxCollider;
protected override void OnAwake()
private void Awake()
{
base.OnAwake();
boxCollider = GetComponent<BoxCollider>();
if(UnityEngine.SceneManagement.SceneManager.GetActiveScene().name== "05_LiveScene")
{

14
Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_NamePlate.cs
View File

@ -42,13 +42,13 @@ public class Device_NamePlate : Device_Base
{
Debug.Log("核查完成");
isChecked = true;
//if (GameManager.UIMgr != null)
//{
// GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
// {
// //panel.Init($"{""}:<color=blue>{""}</color>", $"{"核对和抄录完成！"}");
// });
//}
if (GameManager.UIMgr != null)
{
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
{
panel.Init($"{""}:<color=blue>{""}</color>", $"{"核对和抄录完成！"}");
});
}
}
});
}

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

@ -17,24 +17,11 @@ public class OfficeManager : MonoBehaviour
{
GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
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()
{
@ -68,7 +55,6 @@ public class OfficeManager : MonoBehaviour
{
GameManager.EventMgr.RemoveEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
GameManager.EventMgr.RemoveEventListener(Enum_EventType.InitializationUI, InitializationUI);
//GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
}
}

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

@ -125,7 +125,10 @@ public class ProcessManager : BaseManager<ProcessManager>
if (spStepID <= d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes[spStepcount - 1].id)
{
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("进入下一步子流程步骤");
return true;
}
@ -137,7 +140,10 @@ public class ProcessManager : BaseManager<ProcessManager>
{
HandoverSubProcess(spID, 0);
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("进入下一步子流程");
return true;
}
@ -150,7 +156,10 @@ public class ProcessManager : BaseManager<ProcessManager>
HandoverProcess(pID, 0, 0);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId);
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("进入下一步流程");
return true;
}

19
Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs
View File

@ -33,23 +33,14 @@ public abstract class BaseToolOrDevice : MonoBehaviour
}
private void SwitchSubProcessStepTriggerID(int arg0)
{
try
if (itemInfo.triggerID == arg0)
{
if (itemInfo.triggerID == arg0)
{
_highlight.SetHighlighted(true);
Debug.Log("BaseToolOrDevice我应该提示");
}
else
{
_highlight.SetHighlighted(false);
}
_highlight.SetHighlighted(true);
Debug.Log("BaseToolOrDevice我应该提示");
}
catch (Exception e)
else
{
Debug.Log($"<color=yellow>{gameObject.name}===={e}</color>");
_highlight.SetHighlighted(false);
}
}

5
Assets/Scripts/Project/UI/UI_Panel/UI_TopTipPanel.cs
View File

@ -11,7 +11,7 @@ public class UI_TopTipPanel : BasePanel
/// 面板显示后几秒后消失
/// </summary>
private float disappear = 5f;
public void Init(string title, string content, bool isHide)
public void Init(string title, string content)
{
disappear = 5f;
GetControl<TextMeshProUGUI>("Text_Title").text = title;
@ -19,8 +19,7 @@ public class UI_TopTipPanel : BasePanel
GetControl<TextMeshProUGUI>("Text_Content").GetComponent<ContentSizeFitter>().SetLayoutVertical();
var height = GetControl<TextMeshProUGUI>("Text_Content").rectTransform.sizeDelta.y + 60 + 40;
GetControl<Image>("Image_BackGround").rectTransform.sizeDelta = new Vector2(640, height);
if (isHide)
Hide();
Hide();
}
/// <summary>
/// 面板消失