Merge branch 'main' into HQB_workspace

Assets/Scenes/05_LiveScene.unity

@@ -7127,7 +7127,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4675619581299266311, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: m_Name
-      value: "\u4E09\u76F8\u56DB\u7EBF\u7535\u8868"
+      value: "\u539F\u4E09\u76F8\u56DB\u7EBF\u7535\u8868"
       objectReference: {fileID: 0}
     - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: m_RootOrder

Assets/Scripts/CXX/Devices/现场控制/Device_Control_1002.cs

@@ -91,10 +91,14 @@ public class Device_Control_1002 : Device_Control
                     {
                         if (a)
                         {
+                            //拆下场景中自带的电能表才显示杂物
+                            if (meteringDevice.name == "原三相四线电表")
+                            {
+                                sundries.gameObject.SetActive(true);
+                            }
                             meteringDevice = null;
                             //情况接线关联螺丝
                             ClearLineScrew();
-                            sundries.gameObject.SetActive(true);
                             //打分
                             dianTrigger.CallScoreAction(false);
                         }
@@ -127,10 +131,13 @@ public class Device_Control_1002 : Device_Control
             });
         });
 
-        //接线连接和取下回调
+        //接线连接和取下回调，判断回调
         jieXian_lines.ForEach(line =>
         {
-            line.AddAction(isConnected =>
+            //无电能表不可移动
+            line.AddCanMoveCheck(() => { return meteringDevice != null; });
+
+            line.AddCompleteAction(isConnected =>
             {
                 //刷新带点状态
                 CheckHasElectricity();
@@ -138,6 +145,18 @@ public class Device_Control_1002 : Device_Control
                 CheckJieXianOk(check_JieXian);
             });
         });
+
+        ///开关螺丝不可拆卸
+        inSwitchScrews.ForEach(a => 
+        {
+            a.AddCheckAction(() => 
+            {
+                //提示不可拆
+                TipPanel tip2 = Instantiate(Resources.Load<TipPanel>("UI/UI_Tip/TipPanel"), GameManager.UIMgr.canvas.transform);
+                tip2.Init("当前螺丝不可拆卸！");
+                return false; 
+            });
+        });
     }
 
     /// <summary>

Assets/Scripts/CXX/Tools/Tool_Line.cs

@@ -30,49 +30,74 @@ public class Tool_Line: Tool_Base
     /// </summary>
     public float InstallPosY;
 
+    /// <summary>
+    /// 操作后回调
+    /// </summary>
     private Action<bool> actionBack;
+    /// <summary>
+    /// 是否可移动判断
+    /// </summary>
+    private Func<bool> checkCanMove;
 
-    //protected override void OnAwake()
-    //{
-    //    base.OnAwake();
-    //    id = gameObject.name;
-    //}
 
-    public void AddAction(Action<bool> actionBack)
+    public void AddCompleteAction(Action<bool> actionBack)
     {
         this.actionBack = actionBack;
     }
+    public void AddCanMoveCheck(Func<bool> canMoveCheck)
+    {
+        this.checkCanMove = canMoveCheck;
+    }
+
+    /// <summary>
+    /// 是否可以
+    /// </summary>
+    /// <returns></returns>
+    public bool CanMove()
+    {
+        if (checkCanMove == null)
+        {
+            return true;
+        }
+        else
+        {
+            return checkCanMove.Invoke();
+        }
+    }
     protected override void OnMDown()
     {
-        if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, false)) == 0)
+        if (CanMove())
         {
-            base.OnMDown();
+            if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, false)) == 0)
-            if (isConnected)
             {
-                //ȡϽÓÏß
+                base.OnMDown();
-                if (screws.TrueForAll(a => !a.isInstall))
+                if (isConnected)
                 {
-                    transform.DOLocalMoveY(InstallPosY - 2, 1).OnComplete(() =>
+                    //取下接线
+                    if (screws.TrueForAll(a => !a.isInstall))
                     {
-                        isConnected = false;
+                        transform.DOLocalMoveY(InstallPosY - 2, 1).OnComplete(() =>
-                        actionBack?.Invoke(isConnected);
+                        {
-                        int state = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
+                            isConnected = false;
-                        CallScoreAction(false);
+                            actionBack?.Invoke(isConnected);
-                    });
+                            int state = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
+                            CallScoreAction(false);
+                        });
+                    }
                 }
-            }
+                else
-            else
-            {
-                //×°ÉϽÓÏß
-                if (screws.TrueForAll(a => !a.isInstall))
                 {
-                    transform.DOLocalMoveY(InstallPosY, 1).OnComplete(() =>
+                    //装上接线
+                    if (screws.TrueForAll(a => !a.isInstall))
                     {
-                        isConnected = true;
+                        transform.DOLocalMoveY(InstallPosY, 1).OnComplete(() =>
-                        actionBack?.Invoke(isConnected);
+                        {
-                        int state = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
+                            isConnected = true;
-                        CallScoreAction(true);
+                            actionBack?.Invoke(isConnected);
-                    });
+                            int state = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
+                            CallScoreAction(true);
+                        });
+                    }
                 }
             }
         }