WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
YangHua 2024-08-23 13:20:10 +08:00
parent 118ceaef5f
commit 6679abe086
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab
View File

@ -6324,7 +6324,7 @@ BoxCollider:
m_GameObject: {fileID: 4675619581299266311} m_GameObject: {fileID: 4675619581299266311}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 0 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 0.154481, y: 0.0841517, z: 0.25103334} m_Size: {x: 0.154481, y: 0.0841517, z: 0.25103334}
m_Center: {x: 0.000013098121, y: 0.012870543, z: -0.012511089} m_Center: {x: 0.000013098121, y: 0.012870543, z: -0.012511089}

6
Assets/Scenes/05_LiveScene.unity
View File

@ -3313,7 +3313,7 @@ MonoBehaviour:
seeThroughTexture: {fileID: 0} seeThroughTexture: {fileID: 0}
seeThroughTextureUVSpace: 0 seeThroughTextureUVSpace: 0
seeThroughTextureScale: 1 seeThroughTextureScale: 1
rmsCount: 4 rmsCount: 3
hitFxInitialIntensity: 0 hitFxInitialIntensity: 0
hitFxMode: 0 hitFxMode: 0
hitFxFadeOutDuration: 0.25 hitFxFadeOutDuration: 0.25
@ -5299,7 +5299,9 @@ PrefabInstance:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
objectReference: {fileID: 0} 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} m_SourcePrefab: {fileID: 100100000, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
--- !u!1 &2626639506843241922 --- !u!1 &2626639506843241922
GameObject: GameObject:

18
Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs
View File

@ -35,15 +35,15 @@ public class Device_DirectAccessElectricEnergyMeteringDevice : Device_Base
private BoxCollider boxCollider; private BoxCollider boxCollider;
protected override void OnAwake() //protected override void OnAwake()
{ //{
base.OnAwake(); // base.OnAwake();
boxCollider = GetComponent<BoxCollider>(); // boxCollider = GetComponent<BoxCollider>();
if(UnityEngine.SceneManagement.SceneManager.GetActiveScene().name== "05_LiveScene") // if(UnityEngine.SceneManagement.SceneManager.GetActiveScene().name== "05_LiveScene")
{ // {
boxCollider.enabled = false; // boxCollider.enabled = false;
} // }
} //}
/// <summary> /// <summary>