diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity
index c3f8ec9..289ccfa 100644
--- a/Assets/Scenes/05_LiveScene.unity
+++ b/Assets/Scenes/05_LiveScene.unity
@@ -1538,7 +1538,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &478648693
 Transform:
   m_ObjectHideFlags: 0
@@ -5702,7 +5702,7 @@ MonoBehaviour:
   - {fileID: 302277748}
   - {fileID: 302277752}
   - {fileID: 1352022184}
-  dianCollider: {fileID: 478648694}
+  dianTrigger: {fileID: 478648696}
   sundries: {fileID: 737359439}
   inSwitchScrews:
   - {fileID: 1775693151}
diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
index 692d3c9..84442ec 100644
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
@@ -67,16 +67,6 @@ public class Device_Cover : Device_Base
 
             return true;
         });
-        //���ӡ���ϻص�
-        cover_seal_Left.cutAction += () =>
-        {
-            cover_seal_left_Trigger.gameObject.SetActive(true);
-        };
-        //�ҷ�ӡ���ϻص�
-        cover_seal_Right.cutAction += () => 
-        {
-            cover_seal_right_Trigger.gameObject.SetActive(true);
-        };
         //�����������ص�
         cover_seal_left_Trigger.clickAction += () =>
         {
@@ -108,10 +98,7 @@ public class Device_Cover : Device_Base
             }
         };
         //ע�Ṥ���ó����ջأ���ʾ��������ķ�ӡ�Ĵ���
-        EventCenter.Instance.AddEventListener(Enum_EventType.TakeOutAndRetrievingTheTools, () => 
-        {
-
-        });
+        EventCenter.Instance.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, CheckTriggerShow);
     }
     protected override void OnMDown()
     {
@@ -138,6 +125,32 @@ public class Device_Cover : Device_Base
         }
     }
 
+    /// <summary>
+    /// �����ʾ�����ط�ӡ������
+    /// </summary>
+    /// <param name="obj"></param>
+    private void CheckTriggerShow(GameObject obj)
+    {
+        if (obj == null)
+        {
+            //�ջ�
+            cover_seal_left_Trigger.gameObject.SetActive(false);
+            cover_seal_right_Trigger.gameObject.SetActive(false);
+        }
+        else
+        {
+            //�ó�
+            if (obj.name == "��װ��ӡ")
+            {
+                if (!isOpen && cover_seal_Left.isCut && cover_screw_Left.isInstall)
+                    cover_seal_left_Trigger.gameObject.SetActive(true);
+
+                if (!isOpen && cover_seal_Right.isCut && cover_screw_Right.isInstall)
+                    cover_seal_right_Trigger.gameObject.SetActive(true);
+            }
+        }
+    }
+
     /// <summary>
     /// �򿪸���
     /// </summary>
@@ -187,4 +200,13 @@ public class Device_Cover : Device_Base
              });
         }
     }
+
+    private void OnDestroy()
+    {
+        EventCenter.Instance.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, CheckTriggerShow);
+    }
+    private void OnDisable()
+    {
+        EventCenter.Instance.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, CheckTriggerShow);
+    }
 }
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_Control_1002.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_Control_1002.cs
index 9872f3e..feeb6bb 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_Control_1002.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_Control_1002.cs
@@ -51,13 +51,49 @@ public class Device_Control_1002 : Device_Control
     {
         StepStateControl.instance.SetDeviceControl(1002,this);
         AddActions();
-        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
-            GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+        //if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
+        //    GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
         sundries.gameObject.SetActive(false);
 
         check_JieXian.tool_Lines = jieXian_lines;
         check_JieXian.tool_Screws = meteringDevice.jieXian_screws;
 
+        //���ӵ��ܱ��������¼�
+        dianTrigger.clickAction += () => 
+        {
+            if ((GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(dianTrigger.gameObject.name, true)) == 0)
+            {
+                if (meteringDevice == null)
+                {
+                    //��װ���ܱ�
+                    if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.GetComponent<Device_3Phase4WireMeter>() != null)
+                    {
+                        meteringDevice = LiveSceneManager.Instance.currentTool.GetComponent<Device_3Phase4WireMeter>();
+                        meteringDevice.Add(this);
+                        //������ù�����˿���¸�ֵ
+                        check_JieXian.tool_Screws = meteringDevice.jieXian_screws;
+                        //���߹�����˿
+                        SetLineScrew();
+                        //����ע��ص�
+                        AddActions();
+                        //ˢ�´���״̬
+                        CheckHasElectricity();
+                        //���
+                        dianTrigger.CallScoreAction(true);
+                    }
+                }
+                else
+                {
+                    //���µ��ܱ�
+                    meteringDevice.Remove(this);
+                    //������߹�����˿
+                    ClearLineScrew();
+                    sundries.gameObject.SetActive(true);
+                    //���
+                    dianTrigger.CallScoreAction(false);
+                }
+            }
+        };
     }
     /// <summary>
     /// ���Ӹ��ֲ����ص�
@@ -95,17 +131,17 @@ public class Device_Control_1002 : Device_Control
             });
         });
     }
-    private void SwitchSubProcessStepTriggerID(string arg0)
-    {
-        if (dianTrigger.gameObject.name == arg0)
-        {
-            dianTrigger.GetComponent<HighlightEffect>().SetHighlighted(true);
-        }
-        else
-        {
-            dianTrigger.GetComponent<HighlightEffect>().SetHighlighted(false);
-        }
-    }
+    //private void SwitchSubProcessStepTriggerID(string arg0)
+    //{
+    //    if (dianTrigger.triggerName == arg0)
+    //    {
+    //        dianTrigger.GetComponent<HighlightEffect>().SetHighlighted(true);
+    //    }
+    //    else
+    //    {
+    //        dianTrigger.GetComponent<HighlightEffect>().SetHighlighted(false);
+    //    }
+    //}
     /// <summary>
     /// ��ԭ������״̬
     /// </summary>
@@ -229,79 +265,36 @@ public class Device_Control_1002 : Device_Control
             Debug.Log("���ؽ���");
         }
     }
-    private void Update()
+
+    private void FixedUpdate()
     {
         //�Ƿ���Դ����ܱ��IJ�ж��װ��
         if (meteringDevice == null)
         {
-            dianTrigger.enabled = true;
+            dianTrigger.gameObject.SetActive(true);
         }
         else
         {
             //���ܱ��̶���˿����ˣ��߲����
             if (!meteringDevice.fix_screw_left.isInstall && !meteringDevice.fix_screw_right.isInstall && jieXian_lines.TrueForAll(a => !a.isConnected))
             {
-                dianTrigger.enabled = true;
+                dianTrigger.gameObject.SetActive(true);
             }
             else
             {
-                dianTrigger.enabled = false;
-            }
-        }
-
-        //��װ�������ܱ�
-        if (dianTrigger.enabled)
-        {
-            if (Input.GetMouseButtonDown(0))
-            {
-                if (Physics.Raycast(Camera.main.ScreenPointToRay(Input.mousePosition), out RaycastHit hit))
-                {
-                    if (hit.collider == dianTrigger)
-                    {
-                        if ((GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(dianTrigger.gameObject.name, true)) == 0)
-                        {
-                            if (meteringDevice == null)
-                            {
-                                //��װ���ܱ�
-                                if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.GetComponent<Device_3Phase4WireMeter>() != null)
-                                {
-                                    meteringDevice = LiveSceneManager.Instance.currentTool.GetComponent<Device_3Phase4WireMeter>();
-                                    meteringDevice.Add(this);
-                                    //���߹�����˿
-                                    SetLineScrew();
-                                    //����ע��ص�
-                                    AddActions();
-                                    //ˢ�´���״̬
-                                    CheckHasElectricity();
-                                    //���
-                                    ScoreManager.instance.Check(dianTrigger.gameObject.name, true);
-                                }
-                            }
-                            else
-                            {
-                                //���µ��ܱ�
-                                meteringDevice.Remove(this);
-                                //������߹�����˿
-                                ClearLineScrew();
-                                sundries.gameObject.SetActive(true);
-                                //���
-                                ScoreManager.instance.Check(dianTrigger.gameObject.name, false);
-                            }
-                        }
-                    }
-                }
+                dianTrigger.gameObject.SetActive(false);
             }
         }
     }
 
-    private void OnDestroy()
-    {
-        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
-            GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
-    }
-    private void OnDisable()
-    {
-        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
-            GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
-    }
+    //private void OnDestroy()
+    //{
+    //    if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
+    //        GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    //}
+    //private void OnDisable()
+    //{
+    //    if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
+    //        GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    //}
 }
diff --git a/Assets/Scripts/CXX/Score/Score_1002.cs b/Assets/Scripts/CXX/Score/Score_1002.cs
index b397e1b..0b99f60 100644
--- a/Assets/Scripts/CXX/Score/Score_1002.cs
+++ b/Assets/Scripts/CXX/Score/Score_1002.cs
@@ -257,7 +257,7 @@ public class Score_1002 : ScoreBase
         else if(triggerName== "���ܱ�������ײ")
         {
             //ȡ�µ��ܱ�ʱ�ж����˳��
-            if(!(bool)para)
+            if(para!=null && !(bool)para)
             {
                 steps[12].SetScore(IsUninstallJieXianCheckE());
             }