From b7045add8ef9c47977c83e20091e0c6a1297fb69 Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Sun, 25 Aug 2024 14:33:01 +0800
Subject: [PATCH] 12

---
 Assets/ArtRes/Excel/Config.xlsx               | Bin 21226 -> 21227 bytes
 .../CXX/Devices/计量柜/Device_CabinetDoor.cs  |   7 ++++---
 .../Project/Manager/LiveSceneManager.cs       |   1 +
 .../Project/Objects/Other/NPCController.cs    |  12 ++----------
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx
index 3096dad4ef511ca81c4df44e7ef2ee65889b4ae6..07275934b0cf0cd16e2b096049169fbe6b53fcb0 100644
GIT binary patch
delta 2590
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

delta 2558
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
UlYvq_0SJ@7QYHp(P5=M^0C2g*NB{r;

diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
index 166b70a..770d589 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
+++ b/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();
         }
     }
+   
 }
diff --git a/Assets/Scripts/Project/Manager/LiveSceneManager.cs b/Assets/Scripts/Project/Manager/LiveSceneManager.cs
index bbc82c1..9958770 100644
--- a/Assets/Scripts/Project/Manager/LiveSceneManager.cs
+++ b/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);
         }
     }
 
diff --git a/Assets/Scripts/Project/Objects/Other/NPCController.cs b/Assets/Scripts/Project/Objects/Other/NPCController.cs
index 76703ce..8d9d15c 100644
--- a/Assets/Scripts/Project/Objects/Other/NPCController.cs
+++ b/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) =>
             {