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

ll

This commit is contained in:
陈向学 2024-09-05 19:31:08 +08:00
parent 93f2b5ad2c
commit 9d731799cb
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
View File

@ -1,7 +1,6 @@
using DG.Tweening; using DG.Tweening;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using Unity.VisualScripting.Antlr3.Runtime;
using UnityEngine; using UnityEngine;
/// <summary> /// <summary>

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

@ -105,12 +105,15 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
public void OnCheckSubProcess(bool ifdestroy = true) public void OnCheckSubProcess(bool ifdestroy = true)
{ {
if (tMDTips != null) if (currentTool != null)
tMDTips.gameObject.SetActive(false); {
if (ifdestroy) if (tMDTips != null)
Destroy(currentTool); tMDTips.gameObject.SetActive(false);
currentTool = null; if (ifdestroy)
GameManager.EventMgr.EventTrigger<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, null); DestroyImmediate(currentTool);
currentTool = null;
GameManager.EventMgr.EventTrigger<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, null);
}
} }
private void OnDestroy() private void OnDestroy()

3
Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
View File

@ -77,8 +77,9 @@ public class UI_SubProcessItem : BaseItem
GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID); GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
//ÖØÖÃÎïÌå //ÖØÖÃÎïÌå
StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, GameManager.ProcessMgr.d_Scheme.id, subProcessID); StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, GameManager.ProcessMgr.d_Scheme.id, subProcessID);
//通知ui高亮
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID); GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
//Debug.LogError(ProcessManager.Instance.subProcessStepTriggerID); //通知物体高亮
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
}); });
}); });