From 1444dc395f9618fd8865628fd2fb422de721b381 Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Fri, 30 Aug 2024 18:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=8E=A5=E7=BA=BF?=
 =?UTF-8?q?=E5=AE=8C=E5=A5=BD=E4=B8=8D=E9=AB=98=E4=BA=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scenes/01_InitScene.unity              | 70 +------------------
 .../Devices/杂/接线完好检查/Check_JieXian.cs  | 10 +++
 .../Devices/计量柜/Device_MeasuringCabinet.cs |  1 -
 3 files changed, 11 insertions(+), 70 deletions(-)

diff --git a/Assets/Scenes/01_InitScene.unity b/Assets/Scenes/01_InitScene.unity
index 59298bd..d402283 100644
--- a/Assets/Scenes/01_InitScene.unity
+++ b/Assets/Scenes/01_InitScene.unity
@@ -250,7 +250,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
       propertyPath: m_LocalPosition.x
@@ -298,74 +298,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
---- !u!1 &678380208
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 678380211}
-  - component: {fileID: 678380210}
-  - component: {fileID: 678380209}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &678380209
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 678380208}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SendPointerHoverToParent: 1
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &678380210
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 678380208}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 10
---- !u!4 &678380211
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 678380208}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &744736104
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs b/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs
index d21b6de..8cfaa46 100644
--- a/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs
+++ b/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs
@@ -11,6 +11,11 @@ public class Check_JieXian : PermanentTriggerBase
     /// �Ƿ��Ѽ��������
     /// </summary>
     public bool isChecked;
+    protected override void OnMEnter()
+    {
+        base.OnMEnter();
+        _highlight.SetHighlighted(true);
+    }
     protected override void OnMDown()
     {
         base.OnMDown();
@@ -20,6 +25,11 @@ public class Check_JieXian : PermanentTriggerBase
         }
     }
 
+    protected override void OnMExit()
+    {
+        base.OnMExit();
+        _highlight.SetHighlighted(false);
+    }
     /// <summary>
     /// ���ɹ�
     /// </summary>
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
index 5c67c39..3cf7b04 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
@@ -100,7 +100,6 @@ public class Device_MeasuringCabinet : MonoBehaviour
         {
             dianCollider.GetComponent<HighlightEffect>().SetHighlighted(false);
         }
-
     }
     /// <summary>
     /// ��ԭ������״̬