From 5d53aa851fdc62c679c58d029c01495663603265 Mon Sep 17 00:00:00 2001
From: guyuan9527 <2533167850@qq.com>
Date: Mon, 18 Sep 2023 15:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=89=8C=E7=A9=BF?=
 =?UTF-8?q?=E9=80=8FUI=E9=97=AE=E9=A2=98=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Adam/Scripts/ShowNameplate.cs            | 10 +++++++---
 .../电箱(new)/Prefeb/三相_有互感器_无光伏.prefab    |  2 +-
 .../Script/AmmeterManager/MultimeterManager.cs      |  3 ---
 .../Script/Interactive/ClampAmmetersManager.cs      | 13 -------------
 4 files changed, 8 insertions(+), 20 deletions(-)

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");
         }
     }
 }