WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

12

This commit is contained in:
YangHua 2024-08-25 14:33:01 +08:00
parent aa6f45d70b
commit b7045add8e
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/ArtRes/Excel/Config.xlsx
View File

Binary file not shown.

7
Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
View File

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

1
Assets/Scripts/Project/Manager/LiveSceneManager.cs
View File

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

12
Assets/Scripts/Project/Objects/Other/NPCController.cs
View File

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