修改单列

Assets/SandBox/JBQ/JBQ_Test.cs

@@ -30,12 +30,12 @@ public class JBQ_Test : MonoBehaviour
             //});
 
             ///4.¹¤×÷ƱѡÔñÃæ°å
-            UIManager.Instance.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.System, (panel) =>
+            //UIManager.Instance.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.System, (panel) =>
-            {
+            //{
-                ProcessManager.Instance.mode = E_ModeType.Study;
+            //    ProcessManager.Instance.mode = E_ModeType.Study;
-                //panel.Init(4);
+            //    //panel.Init(4);
 
-            });
+            //});
 
             ///5.¶¥²¿ÌáʾÃæ°å
             //UIManager.Instance.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
@@ -72,16 +72,16 @@ public class JBQ_Test : MonoBehaviour
             //});
         }
 
-        if (Input.GetKeyDown(KeyCode.L))
+        //if (Input.GetKeyDown(KeyCode.L))
-        {
+        //{
-            ///ÕÚÕÖת³¡Ãæ°å½¥ÒþÃüÁî
+        //    ///ÕÚÕÖת³¡Ãæ°å½¥ÒþÃüÁî
-            //EventCenter.Instance.EventTrigger(Enum_EventType.HideMask);
+        //    //EventCenter.Instance.EventTrigger(Enum_EventType.HideMask);
 
-            UIManager.Instance.ShowPanel<UI_MenuBar>(E_UI_Layer.System, (panel) =>
+        //    UIManager.Instance.ShowPanel<UI_MenuBar>(E_UI_Layer.System, (panel) =>
-            {
+        //    {
-                panel.Init();
+        //        panel.Init();
 
-            });
+        //    });
-        }
+        //}
     }
 }

Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs

@@ -30,7 +30,7 @@ public class Check_JieXian : PermanentTriggerBase
 
         if (GameManager.UIMgr != null)
         {
-            GameObject tip2 = Instantiate<GameObject>(Resources.Load<GameObject>("UI/UI_Tip/TipPanel"), UIManager.Instance.canvas.transform);
+            GameObject tip2 = Instantiate<GameObject>(Resources.Load<GameObject>("UI/UI_Tip/TipPanel"),GameManager.UIMgr.canvas.transform);
             TipPanel tipPanel = tip2.GetComponent<TipPanel>();
             tipPanel.Init("接线完好！");
         }

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

@@ -31,7 +31,7 @@ public class Device_NamePlate : Device_Base
                 }
 
                 //生成进度条
-                GameObject tip = Instantiate<GameObject>(checkUiPrefb, UIManager.Instance.canvas.transform);
+                GameObject tip = Instantiate<GameObject>(checkUiPrefb, GameManager.UIMgr.canvas.transform);
                 ProcessTipPanel processTipPanel = tip.GetComponent<ProcessTipPanel>();
 
                 //开始走进度
@@ -44,7 +44,7 @@ public class Device_NamePlate : Device_Base
                         TipPanel tTemp = Resources.Load<TipPanel>("UI/UI_Tip/TipPanel");
                         if (GameManager.UIMgr != null)
                         {
-                            TipPanel tip2 = Instantiate(tTemp, UIManager.Instance.canvas.transform);
+                            TipPanel tip2 = Instantiate(tTemp, GameManager.UIMgr.canvas.transform);
                             tip2.Init("核对和抄录完成！");
                         }
                         int state = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));

Assets/Scripts/Project/Manager/ProcessManager.cs

@@ -184,8 +184,6 @@ public class ProcessManager : BaseManager<ProcessManager>
             if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count > 0)
             {
                 string currentSubProcessStepTriggerID = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0];
-                Debug.Log($"<color=green>triggersId=={triggerID}</color>");
-                Debug.Log($"<color=green>currentSubProcessStepTriggerID=={currentSubProcessStepTriggerID}</color>");
                 if (triggerID == currentSubProcessStepTriggerID)
                 {
                     if (isRemove)

Assets/Scripts/Project/Objects/Other/ImageTips.cs

@@ -23,11 +23,13 @@ public class ImageTips : MonoBehaviour
         selfRect.offsetMax = Vector2.zero;
         selfRect.offsetMin = Vector2.zero;
         //selfRect.sizeDelta = target.sizeDelta + sizeOffset;
+        if (gameObject.activeSelf)
             StartCoroutine(FlashRoutine());
     }
 
     public void HideTips()
     {
+        transform.parent = null;
         StopCoroutine(FlashRoutine());
         gameObject.SetActive(false);
     }

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

@@ -36,7 +36,6 @@ public abstract class BaseToolOrDevice : MonoBehaviour
         if (itemInfo.toolName == arg0)
         {
             _highlight.SetHighlighted(true);
-            Debug.Log("BaseToolOrDevice我应该提示");
         }
         else
         {

Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs

@@ -20,6 +20,16 @@ public class UI_CheckMyselfItem : BaseItem
             tips.text = isOn ? "ÒÑ×°Åä" : "";
         }
         GetControl<Image>("iconBtn").sprite = Resources.Load<Sprite>(Const.LoadToolAndMaterialPath + _itemInfo.toolName);
+        GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    }
+
+
+    private void SwitchSubProcessStepTriggerID(string arg0)
+    {
+        if (itemInfo.toolName == arg0)
+        {
+            GameManager.UIMgr.imageTips.ShowTips(GetComponent<RectTransform>());
+        }
     }
     protected override void OnClick(string btnName)
     {
@@ -43,4 +53,14 @@ public class UI_CheckMyselfItem : BaseItem
                 break;
         }
     }
+
+    private void OnDestroy()
+    {
+        GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    }
+
+    private void OnDisable()
+    {
+        GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    }
 }

Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs

@@ -24,9 +24,15 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
         }
         GetControl<TextMeshProUGUI>("countText").text = _itemInfo.Count.ToString();
         GetControl<Image>("iconBtn").sprite = Resources.Load<Sprite>(Const.LoadToolAndMaterialPath + currentItem.toolName);
-
+        GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    }
+    private void SwitchSubProcessStepTriggerID(string arg0)
+    {
+        if (currentItem.toolName == arg0)
+        {
+            GameManager.UIMgr.imageTips.ShowTips(GetComponent<RectTransform>());
+        }
     }
-
     protected override void OnClick(string btnName)
     {
         base.OnClick(btnName);
@@ -62,4 +68,13 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
                 break;
         }
     }
+    private void OnDestroy()
+    {
+        GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    }
+
+    private void OnDisable()
+    {
+        GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    }
 }

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

@@ -13,11 +13,6 @@ public class UI_CheckMyselfPanel : BasePanel
     public override void ShowMe()
     {
         base.ShowMe();
-        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
-        {
-            GetControl<Button>("closeBtn").interactable = false;
-            GameManager.EventMgr.AddEventListener(Enum_EventType.WearState, OnWearState);
-        }
         var currentBagDataForTool = GameManager.PacksackBagMgr.GetItemsByE_TMDType(E_ToolOrDeviceOrMaterials.Tool);
 
         foreach (var item in currentBagDataForTool.Keys)
@@ -28,8 +23,15 @@ public class UI_CheckMyselfPanel : BasePanel
                 cItem.Init(currentBagDataForTool[item][0]);
             }
         }
-
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
+        {
+            GetControl<Button>("closeBtn").interactable = false;
+            GameManager.EventMgr.AddEventListener(Enum_EventType.WearState, OnWearState);
+            GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0]);
         }
+    }
+
+
 
     public override void HideMe()
     {
@@ -43,7 +45,7 @@ public class UI_CheckMyselfPanel : BasePanel
     private void OnWearState()
     {
         if (PacksackBagMgr.Instance.IsWeared(validToolNames))
-            UIManager.Instance.HidePanel<UI_CheckMyselfPanel>();
+            GameManager.UIMgr.HidePanel<UI_CheckMyselfPanel>();
     }
 
     protected override void OnClick(string btnName)
@@ -51,7 +53,7 @@ public class UI_CheckMyselfPanel : BasePanel
         switch (btnName)
         {
             case "closeBtn":
-                UIManager.Instance.HidePanel<UI_CheckMyselfPanel>();
+                GameManager.UIMgr.HidePanel<UI_CheckMyselfPanel>();
                 //GameManager.UIMgr.HidePanel<UI_CheckMyselfPanel>();
                 break;
             default:

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

@@ -50,7 +50,7 @@ public class UI_CheckTaskPanel : BasePanel
         switch (btnName)
         {
             case "Button_Close":
-                UIManager.Instance.HidePanel<UI_CheckTaskPanel>();
+                GameManager.UIMgr.HidePanel<UI_CheckTaskPanel>();
                 break;
         }
     }

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

@@ -52,7 +52,7 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
                 break;
             case "Button_Close":
 
-                UIManager.Instance.HidePanel<UI_InstallAndDismantleTicketPanel>();
+                GameManager.UIMgr.HidePanel<UI_InstallAndDismantleTicketPanel>();
                 break;
 
             case "Button_Previous"://上一步

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

@@ -51,7 +51,7 @@ public class UI_LoadingPanel : BasePanel
             {
                 isUpdate = false;
                 if (currentProgress == 1)
-                    UIManager.Instance.HidePanel<UI_LoadingPanel>();
+                    GameManager.UIMgr.HidePanel<UI_LoadingPanel>();
             }
         }
     }

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

@@ -26,12 +26,12 @@ public class UI_LowTensionWorkTicketPanel : BasePanel
         switch (btnName)
         {
             case "closeBtn":
-                UIManager.Instance.HidePanel<UI_LowTensionWorkTicketPanel>();
+                GameManager.UIMgr.HidePanel<UI_LowTensionWorkTicketPanel>();
                 break;
             case "ConfirmBtn":
                 if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
                 {
-                    UIManager.Instance.HidePanel<UI_LowTensionWorkTicketPanel>();
+                    GameManager.UIMgr.HidePanel<UI_LowTensionWorkTicketPanel>();
                 }
                 break;
             case "NewAddBtn":

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

@@ -89,6 +89,6 @@ public class UI_MessagePanel : BasePanel
                 
                 break;
         }
-        UIManager.Instance.HidePanel<UI_MessagePanel>();
+        GameManager.UIMgr.HidePanel<UI_MessagePanel>();
     }
 }

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

@@ -99,8 +99,8 @@ public class UI_SelectDevicePanel : BasePanel
         switch (btnName)
         {
             case "backBtn":
-                UIManager.Instance.ShowPanel<UI_SelectModePanel>(E_UI_Layer.Mid, panel => { panel.Init(); });
+                GameManager.UIMgr.ShowPanel<UI_SelectModePanel>(E_UI_Layer.Mid, panel => { panel.Init(); });
-                UIManager.Instance.HidePanel<UI_SelectDevicePanel>();
+                GameManager.UIMgr.HidePanel<UI_SelectDevicePanel>();
                 break;
         }
     }

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

@@ -30,7 +30,7 @@ public class UI_SelectWorkTicketPanel : BasePanel
         switch (btnName)
         {
             case "Button_Close":
-                UIManager.Instance.HidePanel<UI_SelectWorkTicketPanel>();
+                GameManager.UIMgr.HidePanel<UI_SelectWorkTicketPanel>();
                 break;
             case "Button_Continue":
                 switch (ProcessManager.Instance.mode)
@@ -40,7 +40,7 @@ public class UI_SelectWorkTicketPanel : BasePanel
                         GetControl<Text>("Text_True").gameObject.SetActive(true);
                         if (GetControl<Toggle>("ImageF").isOn)
                         {
-                            UIManager.Instance.HidePanel<UI_SelectWorkTicketPanel>();
+                            GameManager.UIMgr.HidePanel<UI_SelectWorkTicketPanel>();
                             if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
                             {
                                 GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid);
@@ -51,7 +51,7 @@ public class UI_SelectWorkTicketPanel : BasePanel
                         {
                             if (number == 3)
                             {
-                                UIManager.Instance.HidePanel<UI_SelectWorkTicketPanel>();
+                                GameManager.UIMgr.HidePanel<UI_SelectWorkTicketPanel>();
                                 Debug.Log("错误三次了,直接进行下一个面板");
                                 if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
                                 {
@@ -64,14 +64,14 @@ public class UI_SelectWorkTicketPanel : BasePanel
                         if (GetControl<Toggle>("ImageF").isOn)
                         {
                             Debug.Log("判分后进行下一个面板");
-                            UIManager.Instance.HidePanel<UI_SelectWorkTicketPanel>();
+                            GameManager.UIMgr.HidePanel<UI_SelectWorkTicketPanel>();
                         }
                         break;
                     case E_ModeType.Exam:
                         if (GetControl<Toggle>("ImageF").isOn)
                         {
                             Debug.Log("判分后进行下一个面板");
-                            UIManager.Instance.HidePanel<UI_SelectWorkTicketPanel>();
+                            GameManager.UIMgr.HidePanel<UI_SelectWorkTicketPanel>();
                         }
                         break;
                 }

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

@@ -33,6 +33,6 @@ public class UI_TopTipPanel : BasePanel
     private IEnumerator HideAsync()
     {
         yield return new WaitForSeconds(disappear);
-        UIManager.Instance.HidePanel<UI_TopTipPanel>();
+        GameManager.UIMgr.HidePanel<UI_TopTipPanel>();
     }
 }

Assets/Scripts/Wwz/ToolMaterialScene.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7bde5d8036a399f479182b20f0b57cb3
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Wwz/ToolMaterialScene/Mirror.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class Mirror : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-
-    private void OnMouseDown()
-    {
-        GameManager.UIMgr.ShowPanel<UI_CheckMyselfPanel>();
-    }
-}

Assets/Scripts/Wwz/ToolMaterialScene/Mirror.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: b55109e3c95e48c4abfa08fb926dcc06
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: