diff --git a/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab b/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab index e3be4aa..1c9c648 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab @@ -6324,7 +6324,7 @@ BoxCollider: m_GameObject: {fileID: 4675619581299266311} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 2 m_Size: {x: 0.154481, y: 0.0841517, z: 0.25103334} m_Center: {x: 0.000013098121, y: 0.012870543, z: -0.012511089} diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity index fc383fa..2bf2b8c 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -3313,7 +3313,7 @@ MonoBehaviour: seeThroughTexture: {fileID: 0} seeThroughTextureUVSpace: 0 seeThroughTextureScale: 1 - rmsCount: 4 + rmsCount: 3 hitFxInitialIntensity: 0 hitFxMode: 0 hitFxFadeOutDuration: 0.25 @@ -5299,7 +5299,9 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4834241782207447596, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + - {fileID: 2921358948653541, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} --- !u!1 &2626639506843241922 GameObject: diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs index 108fb59..06da1f5 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs @@ -35,15 +35,15 @@ public class Device_DirectAccessElectricEnergyMeteringDevice : Device_Base private BoxCollider boxCollider; - protected override void OnAwake() - { - base.OnAwake(); - boxCollider = GetComponent(); - if(UnityEngine.SceneManagement.SceneManager.GetActiveScene().name== "05_LiveScene") - { - boxCollider.enabled = false; - } - } + //protected override void OnAwake() + //{ + // base.OnAwake(); + // boxCollider = GetComponent(); + // if(UnityEngine.SceneManagement.SceneManager.GetActiveScene().name== "05_LiveScene") + // { + // boxCollider.enabled = false; + // } + //} ///