diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity index cb3f4fd9..dc288298 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity @@ -10576,6 +10576,10 @@ PrefabInstance: propertyPath: m_Name value: "\u4F0F\u5B89UI" objectReference: {fileID: 0} + - target: {fileID: 5953364403843559748, guid: 6858abc4395af9947bb1e19b0f27fffb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5953364403843559751, guid: 6858abc4395af9947bb1e19b0f27fffb, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -140631,6 +140635,10 @@ PrefabInstance: propertyPath: m_TagString value: Untagged objectReference: {fileID: 0} + - target: {fileID: 1253040782233410607, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3} + propertyPath: isDian + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3} propertyPath: m_RootOrder value: 24 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs index 7e0d4043..08603c3d 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs @@ -19,32 +19,35 @@ public class MultimeterManager : MonoBehaviour // Update is called once per frame void Update() { - // - if (Input.GetMouseButtonDown(0)) + if (Camera) { - // λ÷һ߾Ļϵλ - Ray ray = Camera.ScreenPointToRay(Input.mousePosition); - - // һײϢ - RaycastHit hit; - - // ײ - bool res = Physics.Raycast(ray, out hit,1 << 7) && !EventSystem.current.IsPointerOverGameObject(); - - if (res) + // + if (Input.GetMouseButtonDown(0)) { - // ײ - if (hit.collider.name.Equals("RedWanYon")) + // λ÷һ߾Ļϵλ + Ray ray = Camera.ScreenPointToRay(Input.mousePosition); + + // һײϢ + RaycastHit hit; + + // ײ + bool res = Physics.Raycast(ray, out hit, 1 << 7) && !EventSystem.current.IsPointerOverGameObject(); + + if (res) { - GameManager.ins.BlackWanYon = null; - GameManager.ins.RedWanYon = RedXian.gameObject; + // ײ + if (hit.collider.name.Equals("RedWanYon")) + { + GameManager.ins.BlackWanYon = null; + GameManager.ins.RedWanYon = RedXian.gameObject; + } + if (hit.collider.name.Equals("BlackWanYon")) + { + GameManager.ins.RedWanYon = null; + GameManager.ins.BlackWanYon = blackXian.gameObject; + } + Debug.Log(hit.collider.name); } - if (hit.collider.name.Equals("BlackWanYon")) - { - GameManager.ins.RedWanYon = null; - GameManager.ins.BlackWanYon = blackXian.gameObject; - } - Debug.Log(hit.collider.name); } } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/VoltAmpereMeter.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/VoltAmpereMeter.cs new file mode 100644 index 00000000..3cca18a7 --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/VoltAmpereMeter.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class VoltAmpereMeter : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/VoltAmpereMeter.cs.meta b/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/VoltAmpereMeter.cs.meta new file mode 100644 index 00000000..6292a173 --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/VoltAmpereMeter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 009306981be6fdd42bcf5d7f9474d54a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: