Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

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

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>
     /// ÃúÅÆ

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();

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); 
     }
 }