From 51bdb22652114ff626ea5b4efc5113ac1becae3e Mon Sep 17 00:00:00 2001
From: chenxiangxue <910695411@qq.com>
Date: Mon, 26 Aug 2024 09:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B0=83=EF=BC=8C=E7=88=B6=E7=89=A9?=
 =?UTF-8?q?=E4=BD=93null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/CXX/Devices/Device_Base.cs     | 10 ++++++++++
 Assets/Scripts/CXX/Tools/Tool_Base.cs         | 11 +++++++++++
 Assets/Scripts/CXX/Tools/Tool_Screw.cs        |  2 ++
 Assets/Scripts/CXX/Tools/Tool_TestPen.cs      |  4 +++-
 Assets/Scripts/CXX/Tools/Tool_WireStripper.cs |  1 +
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Assets/Scripts/CXX/Devices/Device_Base.cs b/Assets/Scripts/CXX/Devices/Device_Base.cs
index e4c52c5..446f85b 100644
--- a/Assets/Scripts/CXX/Devices/Device_Base.cs
+++ b/Assets/Scripts/CXX/Devices/Device_Base.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -8,6 +9,10 @@ public class Device_Base : PermanentTriggerBase
     /// 设备类型
     /// </summary>
     public DeviceType deviceType;
+    /// <summary>
+    /// trigger触发事件
+    /// </summary>
+    private Action<string> triggerAction;
 
     protected override void OnStart()
     {
@@ -33,4 +38,9 @@ public class Device_Base : PermanentTriggerBase
             _highlight.SetHighlighted(false);
         }
     }
+
+    public void AddTriggerAction(Action<string> action)
+    {
+        this.triggerAction = action;
+    }
 }
diff --git a/Assets/Scripts/CXX/Tools/Tool_Base.cs b/Assets/Scripts/CXX/Tools/Tool_Base.cs
index 471d709..64ac7eb 100644
--- a/Assets/Scripts/CXX/Tools/Tool_Base.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Base.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using System;
 
 /// <summary>
 /// 工具材料基类
@@ -12,6 +13,11 @@ public class Tool_Base : PermanentTriggerBase
     /// </summary>
     public ToolType toolType;
 
+    /// <summary>
+    /// trigger触发事件
+    /// </summary>
+    private Action<string> triggerAction;
+
     protected override void OnStart()
     {
         if ( GameManager.RunModelMgr.SceneType == E_SceneType.Site)
@@ -36,4 +42,9 @@ public class Tool_Base : PermanentTriggerBase
             _highlight.SetHighlighted(false);
         }
     }
+
+    public void AddTriggerAction(Action<string> action)
+    {
+        this.triggerAction = action;
+    }
 }
diff --git a/Assets/Scripts/CXX/Tools/Tool_Screw.cs b/Assets/Scripts/CXX/Tools/Tool_Screw.cs
index fd4142d..0119022 100644
--- a/Assets/Scripts/CXX/Tools/Tool_Screw.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Screw.cs
@@ -66,6 +66,7 @@ public class Tool_Screw : Tool_Base
             isMoving = true;
             Debug.Log("开始拧紧螺丝");
             //设置螺丝刀初始位置
+            screwdriver.transform.parent = null;
             screwdriver.transform.position = installPos.position;
             screwdriver.transform.localEulerAngles = installPos.localEulerAngles;
             //动画
@@ -97,6 +98,7 @@ public class Tool_Screw : Tool_Base
             isMoving = true;
             Debug.Log("开始卸螺丝");
             //设置螺丝刀初始位置
+            screwdriver.transform.parent = null;
             screwdriver.transform.position = installPos.position;
             screwdriver.transform.localEulerAngles = installPos.localEulerAngles;
             //动画
diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs
index 73d00d8..5d8e8f2 100644
--- a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using static Unity.Burst.Intrinsics.X86.Avx;
 
 /// <summary>
 /// 验电笔
@@ -75,6 +74,7 @@ public class Tool_TestPen : Tool_Base
             {
                 var tmp = ((Device_Socket)device_base);
                 //位置移动
+                transform.parent = null;
                 transform.position = tmp.testPosAndRot.position;
                 transform.eulerAngles = tmp.testPosAndRot.eulerAngles;
                 Debug.Log("计量柜_插座 已验电");
@@ -86,6 +86,7 @@ public class Tool_TestPen : Tool_Base
                 var tmp = ((Device_CabinetDoor)device_base);
 
                 //位置移动
+                transform.parent = null;
                 transform.position = tmp.testPosAndRot.position;
                 transform.localEulerAngles = tmp.testPosAndRot.localEulerAngles;
                 Debug.Log("计量柜_柜门 已验电");
@@ -106,6 +107,7 @@ public class Tool_TestPen : Tool_Base
         {
             var tmp = ((Tool_Screw)tool_base);
             //位置移动
+            transform.parent = null;
             transform.position = tmp.installPos.position;
             transform.localEulerAngles = tmp.installPos.localEulerAngles;
             Debug.Log("螺丝 已验电");
diff --git a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
index f784983..0ca55eb 100644
--- a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
@@ -14,6 +14,7 @@ public class Tool_WireStripper : Tool_Base
     /// <param name="device_Seal"></param>
     public void CutOpen(Device_Seal device_Seal)
     {
+        transform.parent = null;
         transform.position = device_Seal.testPosAndRot.position;
         transform.eulerAngles = device_Seal.testPosAndRot.eulerAngles;
         //播放动画