zhuyayu
/
E_ElecCompetition
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

提交电流伏安逻辑

This commit is contained in:
康地林 2023-09-18 15:26:23 +08:00
parent b0daa8dfa8
commit 5b894d0d95
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
View File

@ -1588,7 +1588,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 5555240334297640412}
name:
name: "\u7528\u7535_CA2"
linearMeasure: 0
floats: []
Fuan: 0
@ -5818,7 +5818,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 6353080852345845249}
name:
name: "\u7528\u7535_BA2"
linearMeasure: 0
floats: []
Fuan: 0
@ -6137,7 +6137,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 1163469228716114748}
name:
name: "\u7528\u7535_AA2"
linearMeasure: 0
floats: []
Fuan: 0
@ -10135,6 +10135,10 @@ PrefabInstance:
propertyPath: m_AABB.m_Extent.z
value: 0.059744626
objectReference: {fileID: 0}
- target: {fileID: -491602864608504868, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: -491602864608504868, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
propertyPath: m_TagString
value: YanDian

9
Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/Multimeter.cs
View File

@ -24,7 +24,7 @@ public class Multimeter : MonoBehaviour
GameManager.ins.BlackWanYon.transform.DOLocalMove(new Vector3(-0.14f, -0.08f, 0.11f), 0.25f);
GameManager.ins.BlackWanYon.layer = 0;
GameManager.ins.MultimeterIm.gameObject.SetActive(true);
isok = true;
}
if (GameManager.ins.RedWanYon != null&&!isBlack)
{
@ -34,11 +34,8 @@ public class Multimeter : MonoBehaviour
GameManager.ins.RedWanYon.transform.DOLocalMove(new Vector3(-0.08f,0.08f,0.11f), 0.25f);
GameManager.ins.RedWanYon.layer = 0;
GameManager.ins.MultimeterIm.gameObject.SetActive(true);
}
if (isok)
{
GameManager.ins.DianFuIm.gameObject.SetActive(true);
GameManager.ins.DianFuTex.text = activation + VV;
GameManager.ins.show(activation + VV);
Debug.Log(activation + VV + "安康就是看到机会");
}
Debug.Log("³É¹¦");
}

6
Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
View File

@ -90,7 +90,11 @@ public class GameManager : MonoBehaviour
}
}
}
public void show(string Str)
{
DianFuIm.gameObject.SetActive(true);
DianFuTex.text = Str;
}
private void Update()
{
switch (interactiveEnum)

6
Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs
View File

@ -38,16 +38,16 @@ public class ClampAmmetersManager : MonoBehaviour
{
for (int i = 0; i < clampAmmetersInteractives.Count; i++)
{
if (clampAmmetersInteractives[i].name.Equals("用电_AA2"))
if (clampAmmetersInteractives[i].name.Equals("用电_AA2")|| clampAmmetersInteractives[i].name.Equals("用电_AA3"))
{
clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxA;
Debug.Log(Three.ttpData.data.qxA + "====Three.ttpData.data.qxA");
}
if (clampAmmetersInteractives[i].name.Equals("用电_BA2"))
if (clampAmmetersInteractives[i].name.Equals("用电_BA2")|| clampAmmetersInteractives[i].name.Equals("用电_BA3"))
{
clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxB;
}
if (clampAmmetersInteractives[i].name.Equals("用电_CA2"))
if (clampAmmetersInteractives[i].name.Equals("用电_CA2") || clampAmmetersInteractives[i].name.Equals("用电_CA3") )
{
clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxC;
}