融合

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

@@ -44,7 +44,8 @@ public class Device_Cover : Device_Base
     {
         Debug.Log("打开盖子");
         isOpen = true;
-        transform.DOLocalMoveZ(transform.localPosition.z - 0.15f, 2);
+        transform.DOLocalMoveY(transform.localPosition.y - 0.15f, 2);
+        transform.DOLocalMoveZ(transform.localPosition.y - 0.15f, 2);
     }
 
     /// <summary>
@@ -54,6 +55,7 @@ public class Device_Cover : Device_Base
     {
         Debug.Log("盖上盖子");
         isOpen = false;
+        transform.DOLocalMoveY(transform.localPosition.y + 0.15f, 2);
         transform.DOLocalMoveZ(transform.localPosition.z + 0.15f, 2);
     }
 }

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

@@ -27,14 +27,13 @@ public class Device_DirectAccessElectricEnergyMeteringDevice : Device_Base
     [Tooltip("右盖子封印")]
     public Device_Seal cover_seal_Right;
 
-    /// <summary>
+
-    /// 电能表接线螺丝
-    /// </summary>
-    public List<Tool_Screw> line_screws;
     /// <summary>
     /// 电能表接线
     /// </summary>
-    public List<Tool_Line> lines;
+    [Tooltip("½ÓÏß")]
+    public List<Tool_Line> jieXian_lines;
+
     /// <summary>
     /// 电能表固定螺丝
     /// </summary>

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

@@ -23,8 +23,4 @@ public class Device_MeasuringCabinet : Device_Base
     /// 进电开关
     /// </summary>
     public Device_Switch inSwitch;
-    /// <summary>
-    /// ·âÓ¡
-    /// </summary>
-    public Device_Seal seal;
 }

Assets/Scripts/CXX/Tools/Tool_Base.cs

@@ -15,6 +15,7 @@ public class Tool_Base : PermanentTriggerBase
     protected override void OnMEnter()
     {
         base.OnMEnter();
+        Debug.Log(gameObject.name);
         _highlight.highlighted = true;
     }
     protected override void OnMExit()

Assets/Scripts/CXX/Tools/Tool_Line.cs

@@ -1,3 +1,4 @@
+using DG.Tweening;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -8,8 +9,47 @@ using UnityEngine;
 /// </summary>
 public class Tool_Line: Tool_Base
 {
+    /// <summary>
+    /// 是否接上
+    /// </summary>
+    public bool isConnected;
     /// <summary>
     /// ±êʶ
     /// </summary>
     public string id;
+
+    /// <summary>
+    /// 固定接线的螺丝
+    /// </summary>
+    public List<Tool_Screw> screws=new List<Tool_Screw>();
+
+    protected override void OnAwake()
+    {
+        base.OnAwake();
+        id = gameObject.name;
+    }
+
+    private void OnMouseDown()
+    {
+        if(isConnected)
+        {
+            //取下接线
+            if(screws.TrueForAll(a=>!a.isInstall))
+            {
+                isConnected = false;
+                transform.DOLocalMoveY(transform.localPosition.y - 2, 1);
+            }
+        }
+        else
+        {
+            //装上接线
+            if (screws.TrueForAll(a => !a.isInstall))
+            {
+                transform.DOLocalMoveY(transform.localPosition.y + 2, 1).OnComplete(() => 
+                {
+                    isConnected = true;
+                });
+            }
+        }
+    }
 }

Assets/Scripts/CXX/Tools/Tool_Screw.cs

@@ -36,8 +36,9 @@ public class Tool_Screw : Tool_Base
     private float localYUnInstallValue;
 
 
-    private void Awake()
+    protected override void OnAwake()
     {
+        base.OnAwake();
         id = gameObject.name;
     }
 

Assets/Scripts/Project/Enum/Enums.cs

@@ -185,7 +185,8 @@ public enum ToolType
     工作证,
     盒装封印,
     绝缘胶带,
-    螺丝
+    螺丝,
+    接线
 }
 
 /// <summary>

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

@@ -11,7 +11,7 @@ public class PermanentTriggerBase : MonoBehaviour
 {
     public int triggerID;
     public string triggerName;
-    [HideInInspector]
+    //[HideInInspector]
     public HighlightEffect _highlight;
     private void Awake()
     {