From 6a75caa453aa3e2b19716cf9b974b471f3bf3c11 Mon Sep 17 00:00:00 2001
From: chenxiangxue <910695411@qq.com>
Date: Fri, 23 Aug 2024 14:00:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=B1=BB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/Prefabs/Objects/Tools/验电笔.prefab | 15 ---------------
 ...ricEnergyMeteringDevice.cs => Device_3Phase4WireMeter.cs} |  4 ++--
 ...eteringDevice.cs.meta => Device_3Phase4WireMeter.cs.meta} |  0
 .../CXX/Devices/计量柜/Device_MeasuringCabinet.cs |  6 +++---
 .../Scripts/CXX/Devices/计量柜/Device_Sundries.cs |  2 +-
 5 files changed, 6 insertions(+), 21 deletions(-)
 rename Assets/Scripts/CXX/Devices/直接接入式电能计量装置/{Device_DirectAccessElectricEnergyMeteringDevice.cs => Device_3Phase4WireMeter.cs} (97%)
 rename Assets/Scripts/CXX/Devices/直接接入式电能计量装置/{Device_DirectAccessElectricEnergyMeteringDevice.cs.meta => Device_3Phase4WireMeter.cs.meta} (100%)

diff --git a/Assets/Resources/Prefabs/Objects/Tools/验电笔.prefab b/Assets/Resources/Prefabs/Objects/Tools/验电笔.prefab
index a4349d0..368aed9 100644
--- a/Assets/Resources/Prefabs/Objects/Tools/验电笔.prefab
+++ b/Assets/Resources/Prefabs/Objects/Tools/验电笔.prefab
@@ -269,7 +269,6 @@ GameObject:
   - component: {fileID: 369494497360900419}
   - component: {fileID: 7907263493084928653}
   - component: {fileID: 2465643204263011842}
-  - component: {fileID: 5202113740305358043}
   m_Layer: 0
   m_Name: screem
   m_TagString: Untagged
@@ -342,20 +341,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &5202113740305358043
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6963989103699611485}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &1745229904814492725
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
similarity index 97%
rename from Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs
rename to Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
index 06da1f5..58ebf22 100644
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
@@ -5,9 +5,9 @@ using System.Collections.Generic;
 using UnityEngine;
 
 /// <summary>
-/// ֱ�ӽ���ʽ���ܼ���װ��
+/// 3��4�ߵ��ܱ�
 /// </summary>
-public class Device_DirectAccessElectricEnergyMeteringDevice : Device_Base
+public class Device_3Phase4WireMeter : Device_Base
 {
     /// <summary>
     /// ����
diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs.meta b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs.meta
similarity index 100%
rename from Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs.meta
rename to Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs.meta
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
index e229914..b1303fa 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
@@ -13,7 +13,7 @@ public class Device_MeasuringCabinet : Device_Base
     /// <summary>
     /// ��ǰ�����а�װ���������ߵ��ܱ�
     /// </summary>
-    public Device_DirectAccessElectricEnergyMeteringDevice meteringDevice;
+    public Device_3Phase4WireMeter meteringDevice;
     /// <summary>
     /// ����
     /// </summary>
@@ -148,9 +148,9 @@ public class Device_MeasuringCabinet : Device_Base
                     if (meteringDevice == null)
                     {
                         //��װ���ܱ�
-                        if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.GetComponent<Device_DirectAccessElectricEnergyMeteringDevice>() != null)
+                        if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.GetComponent<Device_3Phase4WireMeter>() != null)
                         {
-                            meteringDevice = LiveSceneManager.Instance.currentTool.GetComponent<Device_DirectAccessElectricEnergyMeteringDevice>();
+                            meteringDevice = LiveSceneManager.Instance.currentTool.GetComponent<Device_3Phase4WireMeter>();
                             meteringDevice.Add();
                             //���߹�����˿
                             SetLineScrew();
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
index c660cc0..88133a4 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
@@ -6,6 +6,6 @@ public class Device_Sundries : Device_Base
 {
     private void OnMouseDown()
     {
-        gameObject.SetActive(false);
+        gameObject.SetActive(false); 
     }
 }