diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs index 0e399bc6..59dea973 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.EventSystems; public class ShowNameplate : MonoBehaviour { @@ -15,9 +16,12 @@ public class ShowNameplate : MonoBehaviour private void OnMouseDown() { + if (EventSystem.current.IsPointerOverGameObject()) + { + return; + } NameplateController.Instance.RefreshShown(); - - if (!NameplateController.Instance.DictextMeshPro.ContainsKey(myName)) + if (!NameplateController.Instance.DictextMeshPro.ContainsKey(myName)) { return; } @@ -26,7 +30,7 @@ public class ShowNameplate : MonoBehaviour NameplateController.Instance.NameplateImage.overrideSprite = sprite; NameplateController.Instance.NameplateImage.SetNativeSize(); - switch (myName) + switch (myName) { case "ѹ": multiple = 1.0f; diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab index eaa97c08..64afcb7a 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab @@ -10137,7 +10137,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -491602864608504868, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -491602864608504868, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3} propertyPath: m_TagString diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs index 504d302a..d8977141 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs @@ -26,13 +26,10 @@ public class MultimeterManager : MonoBehaviour { // λ÷һ߾Ļϵλ Ray ray = Camera.ScreenPointToRay(Input.mousePosition); - // һײϢ RaycastHit hit; - // ײ bool res = Physics.Raycast(ray, out hit, 1 << 7) && !EventSystem.current.IsPointerOverGameObject(); - if (res) { // ײ diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs index 97496b27..f86f7fce 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs @@ -41,7 +41,6 @@ public class ClampAmmetersManager : MonoBehaviour 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")|| clampAmmetersInteractives[i].name.Equals("õ_BA3")) { @@ -66,18 +65,6 @@ public class ClampAmmetersManager : MonoBehaviour { Multimeter[i].activation = Three.ttpData.data.dyC; } - //if (Multimeter[i].name.Equals("õ_N")) - //{ - // Multimeter[i].activation = Three.ttpData.data.dyC; - //} - } - } - - private void Update() - { - if (Input.GetKeyDown("q")) - { - Debug.Log(Three.ttpData.data.qxA + "====Three.ttpData.data.qxA"); } } }