From ba1944260cf7c9014ea82b1a3049fe5d01e6d3f6 Mon Sep 17 00:00:00 2001 From: huqibin <762612145@qq.com> Date: Tue, 18 Feb 2025 16:33:50 +0800 Subject: [PATCH] 0218 --- ...0009_9001_数字化计量箱巡视及异常消缺仿真.xml | 2 +- .../Scripts/Project/Manager/DataManager.cs | 58 ++++++++++++------- .../Project/Manager/LiveSceneManager.cs | 34 +++++++---- 3 files changed, 62 insertions(+), 32 deletions(-) diff --git a/Assets/StreamingAssets/Setting/科目/10009/10009_9001_数字化计量箱巡视及异常消缺仿真.xml b/Assets/StreamingAssets/Setting/科目/10009/10009_9001_数字化计量箱巡视及异常消缺仿真.xml index 8fec604..004b5d4 100644 --- a/Assets/StreamingAssets/Setting/科目/10009/10009_9001_数字化计量箱巡视及异常消缺仿真.xml +++ b/Assets/StreamingAssets/Setting/科目/10009/10009_9001_数字化计量箱巡视及异常消缺仿真.xml @@ -1,7 +1,7 @@ - + diff --git a/Assets/Template/Scripts/Project/Manager/DataManager.cs b/Assets/Template/Scripts/Project/Manager/DataManager.cs index cfff10d..1c2b80b 100644 --- a/Assets/Template/Scripts/Project/Manager/DataManager.cs +++ b/Assets/Template/Scripts/Project/Manager/DataManager.cs @@ -110,7 +110,7 @@ public class DataManager : BaseManager toolAndMaterialDic.Add(tB_ToolAndMaterial.id, tB_ToolAndMaterial); } } - private void ReadSubecjtXML(string path) + public void ReadSubecjtXML(string path) { XmlDocument xmlDoc = new XmlDocument(); xmlDoc.Load(path); @@ -218,28 +218,46 @@ public class DataManager : BaseManager /// public List GetCurrentSystemToolAndMaterials(string tOrMOrD) { + #region 根据科目配置里面的ToolOrMaterilOrDevice去获取当前科目所需要的工具设备 + //var currentSystemToolAndMaterials = new List(); + + //string[] tmdTemp = tOrMOrD.Split(','); + + //for (int i = 0; i < tmdTemp.Length; i++) + //{ + // int index = i; + // foreach (var item in toolAndMaterialDic.Values) + // { + // if (item.objName == tmdTemp[index]) + // { + // D_ToolAndMaterialData d_ToolAndMaterialData = new D_ToolAndMaterialData(); + // d_ToolAndMaterialData.id = item.id; + // d_ToolAndMaterialData.objName = item.objName; + // d_ToolAndMaterialData.type = item.type; + // d_ToolAndMaterialData.prefabName = item.prefabName; + // d_ToolAndMaterialData.iconSpriteName = item.iconSpriteName; + // currentSystemToolAndMaterials.Add(d_ToolAndMaterialData); + // } + // } + //} + //return currentSystemToolAndMaterials; + #endregion + + + #region 获取所有工具设备 var currentSystemToolAndMaterials = new List(); - - string[] tmdTemp = tOrMOrD.Split(','); - - for (int i = 0; i < tmdTemp.Length; i++) + foreach (var item in toolAndMaterialDic.Values) { - int index = i; - foreach (var item in toolAndMaterialDic.Values) - { - if (item.objName == tmdTemp[index]) - { - D_ToolAndMaterialData d_ToolAndMaterialData = new D_ToolAndMaterialData(); - d_ToolAndMaterialData.id = item.id; - d_ToolAndMaterialData.objName = item.objName; - d_ToolAndMaterialData.type = item.type; - d_ToolAndMaterialData.prefabName = item.prefabName; - d_ToolAndMaterialData.iconSpriteName = item.iconSpriteName; - currentSystemToolAndMaterials.Add(d_ToolAndMaterialData); - } - } + D_ToolAndMaterialData d_ToolAndMaterialData = new D_ToolAndMaterialData(); + d_ToolAndMaterialData.id = item.id; + d_ToolAndMaterialData.objName = item.objName; + d_ToolAndMaterialData.type = item.type; + d_ToolAndMaterialData.prefabName = item.prefabName; + d_ToolAndMaterialData.iconSpriteName = item.iconSpriteName; + currentSystemToolAndMaterials.Add(d_ToolAndMaterialData); } - return currentSystemToolAndMaterials; + return currentSystemToolAndMaterials; + #endregion } diff --git a/Assets/Template/Scripts/Project/Manager/LiveSceneManager.cs b/Assets/Template/Scripts/Project/Manager/LiveSceneManager.cs index a1de5f8..9eaf433 100644 --- a/Assets/Template/Scripts/Project/Manager/LiveSceneManager.cs +++ b/Assets/Template/Scripts/Project/Manager/LiveSceneManager.cs @@ -281,10 +281,10 @@ public class LiveSceneManager : SingletonMono private void OnDestroy() { firstPersonController.zoomAction -= OnZoom; - GameManager.EventMgr?.EventTrigger(Enum_EventType.TakeOutAndRetrievingTheTools, null); - GameManager.EventMgr?.RemoveEventListener(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo); - GameManager.EventMgr?.RemoveEventListener(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); - + currentTool = null; + GameManager.EventMgr.EventTrigger(Enum_EventType.TakeOutAndRetrievingTheTools, null); + GameManager.EventMgr.RemoveEventListener(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); + GameManager.EventMgr.RemoveEventListener(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo); //清空设备铭牌核对选项 UI_CheckDevicePanel.isCheck互感器A相 = false; UI_CheckDevicePanel.isCheck互感器B相 = false; @@ -304,12 +304,24 @@ public class LiveSceneManager : SingletonMono } private void OnDisable() { - //StopCoroutine(WaitSetJiaoYanYiState()); - //StopCoroutine(WaitSetJiaoYanYiYiQiState()); - //StopCoroutine(WaitSetJiaoYanYiScreenState()); - firstPersonController.zoomAction -= OnZoom; - GameManager.EventMgr?.EventTrigger(Enum_EventType.TakeOutAndRetrievingTheTools, null); - GameManager.EventMgr?.RemoveEventListener(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo); - GameManager.EventMgr?.RemoveEventListener(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); + //firstPersonController.zoomAction -= OnZoom; + //currentTool = null; + //GameManager.EventMgr.EventTrigger(Enum_EventType.TakeOutAndRetrievingTheTools, null); + //GameManager.EventMgr.RemoveEventListener(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); + //GameManager.EventMgr.RemoveEventListener(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo); + ////清空设备铭牌核对选项 + //if (GameManager.UIMgr.GetPanel()) + //{ + // GameManager.UIMgr.GetPanel().isCheck互感器A相 = false; + // GameManager.UIMgr.GetPanel().isCheck互感器B相 = false; + // GameManager.UIMgr.GetPanel().isCheck互感器C相 = false; + // GameManager.UIMgr.GetPanel().isCheck电能表 = false; + //} + ////删除核对按钮 + //if (CheckDeviceButtonPanel.instance != null) + //{ + // CheckDeviceButtonPanel.instance.MyDesTroy(); + //} + Debug.Log(" OnDisable()"); } }