diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 3096dad..0727593 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ 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 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 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(E_UI_Layer.Mid, (panel) => {