From b968dadcaa658cb33018286b6bf4eccecdfa4041 Mon Sep 17 00:00:00 2001
From: chenxiangxue <910695411@qq.com>
Date: Thu, 29 Aug 2024 18:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../直接接入式电能计量装置/Device_Cover.cs    | 55 +++++++++++--------
 Assets/Scripts/CXX/Tools/Tool_Screw.cs        | 16 ++----
 Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs  |  2 -
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
index 6fa0aa6..59c5a1c 100644
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
@@ -37,12 +37,13 @@ public class Device_Cover : Device_Base
 
             if (!isOpen)
             {
+                //��˿��š�ɲ��ܲ����
                 if (!cover_screw_Left.isInstall && !cover_screw_Right.isInstall)
                 {
                     Open();
                 }
             }
-            else if (isOpen)
+            else
             {
                 Close();
             }
@@ -54,18 +55,22 @@ public class Device_Cover : Device_Base
     /// </summary>
     public void Open()
     {
-        Debug.Log("�򿪸���");
-        isOpen = true;
+        //������˿���ڶ����ܶ�����
+        if (!cover_screw_Left.isMoving && !cover_screw_Right.isMoving)
+        {
+            Debug.Log("�򿪸���");
+            isOpen = true;
 
-        Transform parent = cover_screw_Left.transform.parent;
-        cover_screw_Left.transform.parent = transform;
-        cover_screw_Right.transform.parent = transform;
-        transform.DOLocalMove(new Vector3(transform.localPosition.x, -0.1388763f, -0.2485413f), 2).OnComplete(() =>
-         {
-             cover_screw_Left.transform.parent = parent;
-             cover_screw_Right.transform.parent = parent;
-             int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
-         });
+            Transform parent = cover_screw_Left.transform.parent;
+            cover_screw_Left.transform.parent = transform;
+            cover_screw_Right.transform.parent = transform;
+            transform.DOLocalMove(new Vector3(transform.localPosition.x, -0.1388763f, -0.2485413f), 2).OnComplete(() =>
+             {
+                 cover_screw_Left.transform.parent = parent;
+                 cover_screw_Right.transform.parent = parent;
+                 int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
+             });
+        }
     }
 
     /// <summary>
@@ -73,17 +78,21 @@ public class Device_Cover : Device_Base
     /// </summary>
     public void Close()
     {
-        Debug.Log("���ϸ���");
-        isOpen = false;
+        //������˿���ڶ����ܶ�����
+        if (!cover_screw_Left.isMoving && !cover_screw_Right.isMoving)
+        {
+            Debug.Log("���ϸ���");
+            isOpen = false;
 
-        Transform parent = cover_screw_Left.transform.parent;
-        cover_screw_Left.transform.parent = transform;
-        cover_screw_Right.transform.parent = transform;
-        transform.DOLocalMove(new Vector3(transform.localPosition.x, 0.01112366f, -0.09854126f), 2).OnComplete(() =>
-         {
-             cover_screw_Left.transform.parent = parent;
-             cover_screw_Right.transform.parent = parent;
-             int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
-         });
+            Transform parent = cover_screw_Left.transform.parent;
+            cover_screw_Left.transform.parent = transform;
+            cover_screw_Right.transform.parent = transform;
+            transform.DOLocalMove(new Vector3(transform.localPosition.x, 0.01112366f, -0.09854126f), 2).OnComplete(() =>
+             {
+                 cover_screw_Left.transform.parent = parent;
+                 cover_screw_Right.transform.parent = parent;
+                 int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
+             });
+        }
     }
 }
diff --git a/Assets/Scripts/CXX/Tools/Tool_Screw.cs b/Assets/Scripts/CXX/Tools/Tool_Screw.cs
index 7013aad..d7ba4ee 100644
--- a/Assets/Scripts/CXX/Tools/Tool_Screw.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Screw.cs
@@ -27,12 +27,6 @@ public class Tool_Screw : Tool_Base
     /// </summary>
     public bool hasElectricity;
 
-    /// <summary>
-    /// �����ƶ����ܲ���
-    /// </summary>
-    private bool isMoving;
-
-
     /// <summary>
     /// ��װ״̬ʱY��localֵ
     /// </summary>
@@ -61,9 +55,10 @@ public class Tool_Screw : Tool_Base
     /// <param name="screwdriver"></param>
     public void BeInstalled(Tool_Screwdriver screwdriver)
     {
-        if (!isMoving)
+        if (!isMoving && !screwdriver.isMoving)
         {
             isMoving = true;
+            screwdriver.isMoving = true;
             Debug.Log("��ʼš����˿");
             //������˿����ʼλ��
             screwdriver.transform.parent = null;
@@ -83,9 +78,9 @@ public class Tool_Screw : Tool_Base
                         Debug.Log("��˿��š��");
                         isInstall = true;
                         isMoving = false;
+                        screwdriver.isMoving = false;
                         installAction?.Invoke(true);
                         screwdriver.ReBackHead();
-                        screwdriver.isMoving = false;
                         CallScoreAction(true);
                     });
             });
@@ -98,9 +93,10 @@ public class Tool_Screw : Tool_Base
     /// <param name="screwdriver"></param>
     public void BeUnInstalled(Tool_Screwdriver screwdriver)
     {
-        if (!isMoving)
+        if (!isMoving && !screwdriver.isMoving)
         {
             isMoving = true;
+            screwdriver.isMoving = true;
             Debug.Log("��ʼж��˿");
             //������˿����ʼλ��
             screwdriver.transform.parent = null;
@@ -120,9 +116,9 @@ public class Tool_Screw : Tool_Base
                         Debug.Log("��˿��š��");
                         isInstall = false;
                         isMoving = false;
+                        screwdriver.isMoving = false;
                         installAction?.Invoke(false);
                         screwdriver.ReBackHead();
-                        screwdriver.isMoving = false;
                         CallScoreAction(false);
                     });
             });
diff --git a/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs b/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs
index 5801aac..1cc3efa 100644
--- a/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs
@@ -16,7 +16,6 @@ public class Tool_Screwdriver : Tool_Base
     {
         if (!screw.isInstall)
         {
-            isMoving = true;
             screw.BeInstalled(this);
         }
     }
@@ -29,7 +28,6 @@ public class Tool_Screwdriver : Tool_Base
     {
         if (screw.isInstall)
         {
-            isMoving = true;
             screw.BeUnInstalled(this);
         }
     }