From da661a3881da681b585de38f7c02f1d053c9616d Mon Sep 17 00:00:00 2001
From: chenxiangxue <910695411@qq.com>
Date: Mon, 26 Aug 2024 20:08:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E6=AD=A5=E8=BD=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../直接接入式电能计量装置/Device_3Phase4WireMeter.cs     | 2 ++
 .../Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs | 2 +-
 Assets/Scripts/CXX/StepState/1002/StepState_1002.cs       | 8 ++++++--
 Assets/Scripts/CXX/UI/ProcessTipPanel.cs                  | 8 ++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
index c723383..68a2e42 100644
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
@@ -51,6 +51,7 @@ public class Device_3Phase4WireMeter : Device_Base
             JieXianScrewInstallState();
             //����
             namePlate.isChecked = false;
+            gameObject.SetActive(true);
         }
         else
         {
@@ -59,6 +60,7 @@ public class Device_3Phase4WireMeter : Device_Base
             CoverUnstallState();
             //������˿š��״̬
             JieXianScrewUninstallState();
+            gameObject.SetActive(false);
         }
     }
 
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
index b9f58ea..a692aa8 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
@@ -214,7 +214,7 @@ public class Device_MeasuringCabinet : MonoBehaviour
 
                                     //������
                                     SiteManager.instance.measuringCabinet.check_JieXian.isChecked = false;
-                                    SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(true);
+                                    SiteManager.instance.measuringCabinet.check_JieXian.gameObject.SetActive(true);
 
                                     //ˢ�´���״̬
                                     CheckHasElectricity();
diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
index 895b7a4..47fc6bf 100644
--- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
+++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
@@ -131,7 +131,7 @@ public class StepState_1002 : StepState
 
             //�����Ѽ��
             SiteManager.instance.measuringCabinet.check_JieXian.isChecked = true;
-            SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(false);
+            SiteManager.instance.measuringCabinet.check_JieXian.gameObject.SetActive(false);
 
         }
         else if (num == 3011)
@@ -169,7 +169,7 @@ public class StepState_1002 : StepState
 
             //������
             SiteManager.instance.measuringCabinet.check_JieXian.isChecked = false;
-            SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(true);
+            SiteManager.instance.measuringCabinet.check_JieXian.gameObject.SetActive(true);
             //���ܱ�����������
             SiteManager.instance.measuringCabinet.jieXian_screws.ForEach(screw =>
             {
@@ -184,6 +184,10 @@ public class StepState_1002 : StepState
         else if(num== 3015)
         {
             //�ֳ�ͨ�缰���
+
+            //������
+            SiteManager.instance.measuringCabinet.check_JieXian.isChecked = true;
+            SiteManager.instance.measuringCabinet.check_JieXian.gameObject.SetActive(false);
         }
         else if(num== 3016)
         {
diff --git a/Assets/Scripts/CXX/UI/ProcessTipPanel.cs b/Assets/Scripts/CXX/UI/ProcessTipPanel.cs
index 787a1b2..764f8d1 100644
--- a/Assets/Scripts/CXX/UI/ProcessTipPanel.cs
+++ b/Assets/Scripts/CXX/UI/ProcessTipPanel.cs
@@ -33,7 +33,7 @@ public class ProcessTipPanel : MonoBehaviour
     public void StartProcess(Action<bool> back)
     {
         this.isCheck=true;
-        tmpback += back;
+        tmpback = back;
         Debug.Log("��ʼ�˶Ժͳ�¼");
     }
 
@@ -45,7 +45,7 @@ public class ProcessTipPanel : MonoBehaviour
         this.isCheck = false;
         currentProcess = 0;
         image.fillAmount = currentProcess;
-        tmpback?.Invoke(false);
+        tmpback(false);
     }
 
 
@@ -60,7 +60,7 @@ public class ProcessTipPanel : MonoBehaviour
                 if (currentProcess == 1)
                 {
                     isOver = true;
-                    Invoke("ThisDestroy", 2);
+                    ThisDestroy();
                 }
             }
 
@@ -79,7 +79,7 @@ public class ProcessTipPanel : MonoBehaviour
     private void ThisDestroy()
     {
         Debug.Log("�˶Ժͳ�¼��ɣ�");
-        tmpback?.Invoke(true);
+        tmpback(true);
         Destroy(gameObject);
     }
 }
\ No newline at end of file