12

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

@@ -46,10 +46,10 @@ public class Device_CabinetDoor : Device_Base
               });
           });
     }
-
-    private void OnMouseDown()
+    protected override void OnMDown()
     {
-        if (LiveSceneManager.Instance.currentTool.name == "Ñéµç±Ê") return;
+        base.OnMDown();
+        if (LiveSceneManager.Instance.currentTool !=null &&  LiveSceneManager.Instance.currentTool.name == "Ñéµç±Ê") return;
         if (isOpen)
         {
             Close();
@@ -59,4 +59,5 @@ public class Device_CabinetDoor : Device_Base
             Open();
         }
     }
+   
 }

Assets/Scripts/Project/Manager/LiveSceneManager.cs

@@ -30,6 +30,7 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
                 p.Init("", "您好，我是xx供电公司员工，这是我的工作证。现在我们要对贵户更换电能计量表", (intTemp) => { Destroy(currentTool); });
             });
             tMDTips.gameObject.SetActive(false);
+            currentTool.transform.localEulerAngles = new Vector3(90, 0, 0);
         }
     }
 

Assets/Scripts/Project/Objects/Other/NPCController.cs

@@ -6,19 +6,11 @@ public class NPCController : PermanentTriggerBase
 {
     public List<string> npcSpeack;
     public int speackIndex = 0;
-    private  bool onSpeackOver;
     protected override void OnMDown()
     {
         base.OnMDown();
-        if(npcSpeack.Count > 1)
-        {
-            onSpeackOver = false;
-        }
-        else
-        {
-            onSpeackOver = true;
-        }
-        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, onSpeackOver) == 0)
+        
+        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false ) == 0)
         {
             GameManager.UIMgr.ShowPanel<UI_CustomSessionPanel>(E_UI_Layer.Mid, (panel) =>
             {