Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

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

@@ -25,6 +25,13 @@ public class Check_JieXian : PermanentTriggerBase
         isChecked = true;
         gameObject.SetActive(false);
 
+        if (GameManager.UIMgr != null)
+        {
+            GameObject tip2 = Instantiate<GameObject>(Resources.Load<GameObject>("UI/UI_Tip/TipPanel"), UIManager.Instance.canvas.transform);
+            TipPanel tipPanel = tip2.GetComponent<TipPanel>();
+            tipPanel.Init("接线完好！");
+        }
+
         if (GameManager.ProcessMgr != null)
             GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true);
     }

Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs

@@ -74,6 +74,10 @@ public class Device_MeasuringCabinet : Device_Base
     {
         //还原三相四线电能表
         meteringDevice.Init(true);
+        //»¹Ô­½ÓÏßÍêºÃ
+        check_JieXian.isChecked = false;
+        check_JieXian.gameObject.SetActive(true);
+
         //还原柜门
         cabinetDoor.CloseState();
         //还原插座
@@ -191,6 +195,10 @@ public class Device_MeasuringCabinet : Device_Base
                             //接线关联螺丝
                             SetLineScrew();
 
+                            //½ÓÏßδ¼ì²é
+                            SiteManager.instance.measuringCabinet.check_JieXian.isChecked = false;
+                            SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(true);
+
                             //刷新带电状态
                             CheckHasElectricity();
                         }

Assets/Scripts/CXX/StepState/1002/StepState_1002.cs

@@ -129,6 +129,10 @@ public class StepState_1002 : StepState
             //盖子拆下来
             SiteManager.instance.measuringCabinet.meteringDevice.CoverUnstallState();
 
+            //½ÓÏßÒѼì²é
+            SiteManager.instance.measuringCabinet.check_JieXian.isChecked = true;
+            SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(false);
+
         }
         else if (num == 3011)
         {

Assets/Scripts/CXX/UI/TipPanel.cs

@@ -9,5 +9,11 @@ public class TipPanel : MonoBehaviour
     public void Init(string tip)
     {
         m_TextMeshProUGUI.text= tip;
+        Invoke("Des", 2);
+    }
+
+    public void Des()
+    {
+        Destroy(gameObject);
     }
 }