Assets/Scenes/01_InitScene.unity

@@ -250,7 +250,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
       propertyPath: m_LocalPosition.x
@@ -298,6 +298,74 @@ 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

Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs

@@ -11,11 +11,6 @@ public class Check_JieXian : PermanentTriggerBase
     /// 是否已检查接线完好
     /// </summary>
     public bool isChecked;
-    protected override void OnMEnter()
-    {
-        base.OnMEnter();
-        _highlight.SetHighlighted(true);
-    }
     protected override void OnMDown()
     {
         base.OnMDown();
@@ -25,11 +20,6 @@ public class Check_JieXian : PermanentTriggerBase
         }
     }
 
-    protected override void OnMExit()
-    {
-        base.OnMExit();
-        _highlight.SetHighlighted(false);
-    }
     /// <summary>
     /// 检查成功
     /// </summary>

Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs

@@ -100,6 +100,7 @@ public class Device_MeasuringCabinet : MonoBehaviour
         {
             dianCollider.GetComponent<HighlightEffect>().SetHighlighted(false);
         }
+
     }
     /// <summary>
     /// »¹Ô­¼ÆÁ¿¹ñ״̬

Assets/Scripts/Project/Manager/LiveSceneManager.cs

@@ -6,7 +6,7 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
 {
     [HideInInspector]
     public FirstPersonController firstPersonController;
-    //[HideInInspector]
+    [HideInInspector]
     public GameObject currentTool;
     public Transform spawnToolPos;
     public Transform tMDTips;
@@ -55,7 +55,8 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
                 {
                     GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(intTemp, true);
                     ScoreManager.instance.Check(currentTool.name, null);
-                    OnCheckSubProcess();
+                    if (currentTool != null)
+                        Destroy(currentTool);
                 });
             });
             tMDTips.gameObject.SetActive(false);
@@ -67,8 +68,6 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
             tMDTips.gameObject.SetActive(false);
             currentTool.transform.localEulerAngles = new Vector3(-90, 0, -180);
         }
-        if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
-            GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.TakeOutAndRetrievingTheTools, false);
     }
 
     private void Update()
@@ -80,7 +79,8 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
                 if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
                 {
                     Debug.Log("Escape");
-                    OnCheckSubProcess();
+                    tMDTips.gameObject.SetActive(false);
+                    Destroy(currentTool);
                 }
             }
         }
@@ -92,8 +92,5 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
             tMDTips.gameObject.SetActive(false);
         if (ifdestroy)
             Destroy(currentTool);
-        currentTool = null;
-        if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
-            GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.TakeOutAndRetrievingTheTools, true);
     }
 }

Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs

@@ -56,14 +56,6 @@ public class UI_MenuBar : BasePanel
         GameManager.EventMgr.AddEventListener<E_SceneType>(Enum_EventType.SwitchScene, CheckBtnBySceneName);
         if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
-        else
-            GameManager.EventMgr.AddEventListener<bool>(Enum_EventType.TakeOutAndRetrievingTheTools, TakeOutAndRetrievingTheTools);
-
-    }
-
-    private void TakeOutAndRetrievingTheTools(bool isOn)
-    {
-        toolKitBtn.interactable = isOn;
     }
 
     private void SwitchSubProcessStepTriggerID(string triggerID)

Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs

@@ -14,6 +14,8 @@ public class UI_ToolAndMaterialPanel : BasePanel
     {
         if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GetControl<Button>("closeBtn").interactable = false;
+        if (GameManager.RunModelMgr.SceneType != E_SceneType.ToolRoom)
+            GetControl<Button>("closeBtn").gameObject.SetActive(false);
         CreatItem(E_ToolOrDeviceOrMaterials.Tool); //默认打开显示工器具
     }
 

Assets/Scripts/ProjectBase/EventCenter/Enum_EventType.cs

@@ -54,8 +54,4 @@ public enum Enum_EventType
     /// 穿戴状态
     /// </summary>
     WearState,
-    /// <summary>
-    /// 掏出和收回工具
-    /// </summary>
-    TakeOutAndRetrievingTheTools,
 }