修改 报错

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

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

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

@@ -42,13 +42,13 @@ public class Device_NamePlate : Device_Base
                 {
                     Debug.Log("核查完成");
                     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>", $"{"核对和抄录完成！"}");
-                        });
+                    //    });
-                    }
+                    //}
                 }
             });
         }

Assets/Scripts/Project/Manager/OfficeManager.cs

@@ -17,11 +17,24 @@ 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()
     {
@@ -55,6 +68,7 @@ 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);
     }
 
 }

Assets/Scripts/Project/Manager/ProcessManager.cs

@@ -125,10 +125,7 @@ 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;
             }
@@ -140,10 +137,7 @@ 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;
                 }
@@ -156,10 +150,7 @@ 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;
                     }

Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs

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

Assets/Scripts/Project/UI/UI_Panel/UI_TopTipPanel.cs

@@ -11,7 +11,7 @@ public class UI_TopTipPanel : BasePanel
     /// 面板显示后几秒后消失
     /// </summary>
     private float disappear = 5f;
-    public void Init(string title, string content)
+    public void Init(string title, string content, bool isHide)
     {
         disappear = 5f;
         GetControl<TextMeshProUGUI>("Text_Title").text = title;
@@ -19,7 +19,8 @@ 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);
-        Hide();
+        if (isHide)
+            Hide();
     }
     /// <summary>
     /// 面板消失