提交电流伏安逻辑
This commit is contained in:
parent
b0daa8dfa8
commit
5b894d0d95
|
|
@ -1588,7 +1588,7 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
isInteractive: 0
|
isInteractive: 0
|
||||||
g1: {fileID: 5555240334297640412}
|
g1: {fileID: 5555240334297640412}
|
||||||
name:
|
name: "\u7528\u7535_CA2"
|
||||||
linearMeasure: 0
|
linearMeasure: 0
|
||||||
floats: []
|
floats: []
|
||||||
Fuan: 0
|
Fuan: 0
|
||||||
|
|
@ -5818,7 +5818,7 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
isInteractive: 0
|
isInteractive: 0
|
||||||
g1: {fileID: 6353080852345845249}
|
g1: {fileID: 6353080852345845249}
|
||||||
name:
|
name: "\u7528\u7535_BA2"
|
||||||
linearMeasure: 0
|
linearMeasure: 0
|
||||||
floats: []
|
floats: []
|
||||||
Fuan: 0
|
Fuan: 0
|
||||||
|
|
@ -6137,7 +6137,7 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
isInteractive: 0
|
isInteractive: 0
|
||||||
g1: {fileID: 1163469228716114748}
|
g1: {fileID: 1163469228716114748}
|
||||||
name:
|
name: "\u7528\u7535_AA2"
|
||||||
linearMeasure: 0
|
linearMeasure: 0
|
||||||
floats: []
|
floats: []
|
||||||
Fuan: 0
|
Fuan: 0
|
||||||
|
|
@ -10135,6 +10135,10 @@ PrefabInstance:
|
||||||
propertyPath: m_AABB.m_Extent.z
|
propertyPath: m_AABB.m_Extent.z
|
||||||
value: 0.059744626
|
value: 0.059744626
|
||||||
objectReference: {fileID: 0}
|
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}
|
- target: {fileID: -491602864608504868, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
|
||||||
propertyPath: m_TagString
|
propertyPath: m_TagString
|
||||||
value: YanDian
|
value: YanDian
|
||||||
|
|
|
||||||
|
|
@ -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.transform.DOLocalMove(new Vector3(-0.14f, -0.08f, 0.11f), 0.25f);
|
||||||
GameManager.ins.BlackWanYon.layer = 0;
|
GameManager.ins.BlackWanYon.layer = 0;
|
||||||
GameManager.ins.MultimeterIm.gameObject.SetActive(true);
|
GameManager.ins.MultimeterIm.gameObject.SetActive(true);
|
||||||
isok = true;
|
|
||||||
}
|
}
|
||||||
if (GameManager.ins.RedWanYon != null&&!isBlack)
|
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.transform.DOLocalMove(new Vector3(-0.08f,0.08f,0.11f), 0.25f);
|
||||||
GameManager.ins.RedWanYon.layer = 0;
|
GameManager.ins.RedWanYon.layer = 0;
|
||||||
GameManager.ins.MultimeterIm.gameObject.SetActive(true);
|
GameManager.ins.MultimeterIm.gameObject.SetActive(true);
|
||||||
}
|
GameManager.ins.show(activation + VV);
|
||||||
if (isok)
|
Debug.Log(activation + VV + "安康就是看到机会");
|
||||||
{
|
|
||||||
GameManager.ins.DianFuIm.gameObject.SetActive(true);
|
|
||||||
GameManager.ins.DianFuTex.text = activation + VV;
|
|
||||||
}
|
}
|
||||||
Debug.Log("³É¹¦");
|
Debug.Log("³É¹¦");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,11 @@ public class GameManager : MonoBehaviour
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public void show(string Str)
|
||||||
|
{
|
||||||
|
DianFuIm.gameObject.SetActive(true);
|
||||||
|
DianFuTex.text = Str;
|
||||||
|
}
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
switch (interactiveEnum)
|
switch (interactiveEnum)
|
||||||
|
|
|
||||||
|
|
@ -38,16 +38,16 @@ public class ClampAmmetersManager : MonoBehaviour
|
||||||
{
|
{
|
||||||
for (int i = 0; i < clampAmmetersInteractives.Count; i++)
|
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;
|
clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxA;
|
||||||
Debug.Log(Three.ttpData.data.qxA + "====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;
|
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;
|
clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxC;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue