Assets/Resources/Prefabs/Objects/Tools/万用表.prefab

@@ -60,12 +60,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 0
-    toolName: 
-    toolOrDeviceOrMaterial: 0
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!114 &2468428323860960022
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Objects/Tools/剥线钳.prefab

@@ -60,12 +60,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 1
-    toolName: 
-    toolOrDeviceOrMaterial: 0
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!114 &2186571632370376101
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Objects/Tools/国网安全帽.prefab

@@ -60,12 +60,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 0
-    toolName: 
-    toolOrDeviceOrMaterial: 1
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!114 &2906462593900441407
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Objects/Tools/工作服.prefab

@@ -60,12 +60,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 0
-    toolName: 
-    toolOrDeviceOrMaterial: 0
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!114 &2397141117729196589
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Objects/Tools/工作证.prefab

@@ -143,12 +143,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 0
-    toolName: 
-    toolOrDeviceOrMaterial: 0
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!114 &9159459832370388555
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Objects/Tools/盒装封印.prefab

@@ -499,12 +499,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 0
-    toolName: 
-    toolOrDeviceOrMaterial: 0
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!65 &3014182739139812810
 BoxCollider:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Objects/Tools/绝缘手套.prefab

@@ -48,12 +48,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 0
-    toolName: 
-    toolOrDeviceOrMaterial: 0
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!65 &5298069477168308409
 BoxCollider:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Objects/Tools/绝缘胶带.prefab

@@ -60,12 +60,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 0
-    toolName: 
-    toolOrDeviceOrMaterial: 0
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!114 &2357552334371453598
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Objects/Tools/绝缘螺丝刀.prefab

@@ -48,12 +48,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 0
-    toolName: 
-    toolOrDeviceOrMaterial: 0
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!65 &2292098275725943769
 BoxCollider:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Objects/Tools/绝缘靴.prefab

@@ -47,12 +47,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 0
-    toolName: 
-    toolOrDeviceOrMaterial: 0
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!65 &7642060814474931475
 BoxCollider:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Objects/Tools/验电笔.prefab

@@ -47,12 +47,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemInfo:
+  toolId: 0
-    toolId: 0
+  toolName: 
-    triggerID: 0
+  toolOrDeviceOrMaterial: 0
-    toolName: 
-    toolOrDeviceOrMaterial: 0
   _highlight: {fileID: 0}
+  IsClick: 1
 --- !u!65 &2828524944087783442
 BoxCollider:
   m_ObjectHideFlags: 0

Assets/Scripts/ExcelData/DataClass/TB_Scheme.cs

@@ -6,5 +6,4 @@ public class TB_Scheme
 	public string schemeName;
 	public string deviceMap;
 	public string schemeDes;
-	public string ToolOrMaterilOrDevice;
 }

Assets/Scripts/ExcelData/DataClass/TB_ToolAndMaterial.cs

@@ -1,6 +1,7 @@
 public class TB_ToolAndMaterial
 {
 	public int id;
+	public int schemeId;
 	public string objName;
 	public int type;
 	public string prefabName;

Assets/Scripts/Project/DataClass/D_ToolAndMaterialData.cs

@@ -1,14 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-/// <summary>
-/// 材料/工具/设备
-/// </summary>
-public class D_ToolAndMaterialData
-{
-	public int id;
-	public string objName;
-	public int type;
-	public string prefabName;
-	public string iconSpriteName;
-}

Assets/Scripts/Project/DataClass/ProcessData/D_Scheme.cs

@@ -18,8 +18,6 @@ public class D_Scheme
     /// </summary>
     public string schemeName;
 
-    public string ToolOrMaterilOrDevice;
-
     #endregion
 
     /// <summary>

Assets/Scripts/Project/DataClass/ToolAndMaterialData.cs

@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ToolAndMaterialData
+{
+   public string objName;
+   public int type;
+   public uint count;
+}

Assets/Scripts/Project/Enum/Enums.cs

@@ -97,21 +97,21 @@ public enum E_ToolOrDeviceOrMaterials
     /// <summary>
     /// 空
     /// </summary>
-    None = -1,
+    None = 0,
 
     /// <summary>
     /// 工具
     /// </summary>
-    Tool = 0,
+    Tool,
-    /// <summary>
+
-    /// 设备
-    /// </summary>
-    Device = 1,
     /// <summary>
     /// 材质
     /// </summary>
-    Materials = 2
+    Materials,
-
+    /// <summary>
+    /// 设备
+    /// </summary>
+    Device
 }
 
 /// <summary>

Assets/Scripts/Project/Manager/DataManager.cs

@@ -84,38 +84,23 @@ public class DataManager : BaseManager<DataManager>
         return allSchemeList;
     }
 
-    /// <summary>
+    ///// <summary>
-    /// 根据方案 ToolOrMaterilOrDevice 获取当前系统全部工器具和材料
+    ///// 获取当前系统全部工器具和材料
-    /// </summary>
+    ///// </summary>
-    /// <returns></returns>
+    ///// <returns></returns>
-    public List<D_ToolAndMaterialData> GetCurrentSystemToolAndMaterials(string tOrMOrD)
+    //public List<TB_ToolAndMaterial> GetCurrentSystemToolAndMaterials()
-    {
+    //{
-        var currentSystemToolAndMaterials = new List<D_ToolAndMaterialData>();
+    //    var currentSystemToolAndMaterials = new List<TB_ToolAndMaterial>();
-
+    //    foreach (var item in toolAndMaterialDic.Values)
-        string[] tmdTemp = tOrMOrD.Split(',');
+    //    {
-
+    //        if (item.systemID == GameManager.ProcessMgr.id)
-        for (int i = 0; i < tmdTemp.Length; i++)
+    //        {
-        {
+    //            currentSystemToolAndMaterials.Add(item);
-            int index = i;
+    //        }
-            foreach (var item in toolAndMaterialDic.Values)
+    //    }
-            {
-                if (item.id == int.Parse(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;
-    }
-
-
 
+    //    return currentSystemToolAndMaterials;
+    //}
 
     /// <summary>
     /// 获取D_Scheme
@@ -130,7 +115,6 @@ public class DataManager : BaseManager<DataManager>
         {
             d_Scheme.id = schemeDic[id].id;
             d_Scheme.schemeName = schemeDic[id].schemeName;
-            d_Scheme.ToolOrMaterilOrDevice = schemeDic[id].ToolOrMaterilOrDevice;
         }
         d_Scheme.processes = GetD_Processes(d_Scheme.id);
         return d_Scheme;
@@ -224,7 +208,7 @@ public class DataManager : BaseManager<DataManager>
     }
 
 
-    public List<int> GetSubProcessStepIDByTriggerID(int triggerID)
+    public List<int> GetSubProcessStepIDByToolID(int toolID)
     {
         List<TB_SubProcessStep> tb_subProcesssSteps = new List<TB_SubProcessStep>();
         List<int> stepIDsTemp = new List<int>();
@@ -242,7 +226,7 @@ public class DataManager : BaseManager<DataManager>
             string[] subProcessStepToolID = item.triggerID.Split(',');
             for (int i = 0; i < subProcessStepToolID.Length; i++)
             {
-                if (int.Parse(subProcessStepToolID[i]) == triggerID)
+                if (int.Parse(subProcessStepToolID[i]) == toolID)
                     stepIDsTemp.Add(item.id);
             }
         }

Assets/Scripts/Project/Manager/ProcessManager.cs

@@ -27,7 +27,6 @@ public class ProcessManager : BaseManager<ProcessManager>
     /// </summary>
     public D_Scheme d_Scheme;
 
-
     /// <summary>
     ///当前方案ID
     /// </summary>
@@ -77,7 +76,7 @@ public class ProcessManager : BaseManager<ProcessManager>
         coroutine = GameManager.MonoMgr.StartCoroutine(CountDown(countDown));
         d_Scheme = DataManager.Instance.GetSchemeData(id);
         ReportManager.Instance.creport = DataManager.Instance.GetSchemeReport(id);
-        GameManager.ToolAndmaterialMgr.Init(d_Scheme.ToolOrMaterilOrDevice);
+
         d_Scheme.Init();
         Debug.Log("流程初始化完成");
     }

Assets/Scripts/Project/Manager/RunModelMgr.cs

@@ -20,7 +20,7 @@ public class RunModelMgr : BaseManager<RunModelMgr>
     /// <summary>
     /// 设备/方案id
     /// </summary>
-    public int schemeID;
+    public int deviceId;
 
 
     public E_ModeType ModeType

Assets/Scripts/Project/Manager/TooRoomlMannger.cs

@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class TooRoomlMannger : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}

Assets/Scripts/Project/Manager/TooRoomlMannger.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: efa839f070de80947a96cae9774ce7e9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs

@@ -9,25 +9,40 @@ public class ToolAndmaterialMgr : BaseManager<ToolAndmaterialMgr>
 {
     //该系统所需要使用的全部工器具和材料
 
-    public List<D_ToolAndMaterialData> toolAndMaterialList = new List<D_ToolAndMaterialData>();
+    public List<TB_ToolAndMaterial> toolAndMaterialList;
 
     private ToolAndmaterialMgr()
     {
     }
 
-    public void Init(string toolOrMaterilOrDevice)
+    //public void Init()
+    //{
+    //    toolAndMaterialList = GameManager.DataMgr.GetCurrentSystemToolAndMaterials();
+    //}
+
+    public string GetIconSpriteName(string objName)
     {
-        toolAndMaterialList = GameManager.DataMgr.GetCurrentSystemToolAndMaterials(toolOrMaterilOrDevice);
+        var tempObj= toolAndMaterialList.Find(o => o.objName == objName);
+        if (tempObj!=null)
+        {
+            return tempObj.iconSpriteName;
+        }
+        else
+        {
+            return null;
+        }
     }
 
-
+    public int GetObjType(string objName)
-    public D_ToolAndMaterialData GetToolOrMaterialOrDeviceInfoByObjName(string objName)
     {
-        for (int i = 0; i < toolAndMaterialList.Count; i++)
+        var tempObj= toolAndMaterialList.Find(o => o.objName == objName);
+        if (tempObj!=null)
         {
-            if (toolAndMaterialList[i].objName == objName)
+            return tempObj.type;
-                return toolAndMaterialList[i];
+        }
+        else
+        {
+            return -1;
         }
-        return null;
     }
 }

Assets/Scripts/Project/Objects/Device/Device_Mobile.cs

@@ -10,7 +10,6 @@ public class Device_Mobile : MonoBehaviour
     public int downIndex = 0;
     public int triggerID = 5005;
     private HighlightEffect _highlight;
-
     private void Awake()
     {
         _highlight = GetComponent<HighlightEffect>();

Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs

@@ -14,7 +14,10 @@ public class ItemInfo
     public int toolId;
     public int triggerID;
     public string toolName;
+
     public E_ToolOrDeviceOrMaterials toolOrDeviceOrMaterial;
+
+    // 你可以在这里添加更多的属性和方法
 }
 /// <summary>
 /// 工具或者材料基类，此脚本必须挂在工具或者材料上
@@ -22,37 +25,64 @@ public class ItemInfo
 public abstract class BaseToolOrDevice : MonoBehaviour
 {
     public ItemInfo itemInfo;
-    [HideInInspector]
     public HighlightEffect _highlight;
+    public bool IsClick = true;
 
     private void Start()
     {
         _highlight = GetComponent<HighlightEffect>();
-        GetInfo();
     }
 
-
+   
-    public void GetInfo()
+    [ContextMenu("GetInfo")]
+    public void GetInfo(string itemName)
     {
-        D_ToolAndMaterialData dTMD = GameManager.ToolAndmaterialMgr.GetToolOrMaterialOrDeviceInfoByObjName(gameObject.name);
+      
-        if (dTMD != null)
-        {
-            itemInfo.toolId = dTMD.id;
-            itemInfo.triggerID = dTMD.id;
-            itemInfo.toolOrDeviceOrMaterial = (E_ToolOrDeviceOrMaterials)dTMD.type;
-            gameObject.SetActive(true);
-        }
-        else
-        {
-            gameObject.SetActive(false);
-        }
     }
+    //public void GetInfo(string itemName)
+    //{
+    //    if (itemDatabase.ContainsKey(itemName))
+    //    {
+    //        ItemInfo info = itemDatabase[itemName];
+    //        OnItemInfoReceived?.Invoke(info); 
+    //    }
+    //}
+
+    //public void GetInfo(GameObject Item,string ItemName,E_ToolOrDeviceOrMaterials E_Item)
+    //{
+
+    //    Item.SetActive(false);
+    //    if (itemDatabase.ContainsKey(ItemName))
+    //    {
+    //        // 获取物品信息
+    //        ItemInfo info = itemDatabase[ItemName];
+    //        // TODO: 后续处理，例如更新UI或执行其他逻辑
+    //    }
+    //    else
+    //    {
+    //        Debug.LogWarning($"物品 '{ItemName}' 不存在于数据库中");
+    //    }
+    //    switch (E_Item)
+    //    {
+    //         case E_ToolOrDeviceOrMaterials.Tool:
+
+    //            break;
+    //            case E_ToolOrDeviceOrMaterials.Materials:
+
+    //            break;
+    //    }
+    //    //TODO:后续 根据英文名称去获取ID 中文名 和其它
+    //}
 
     private void OnMouseEnter()
     {
         if (GameManager.RunModelMgr.SceneType != E_SceneType.ToolRoom) return;
         if (EventSystem.current.IsPointerOverGameObject()) return;
         OnEnter();
+        UIManager.Instance.ShowPanel<ItemTips>(E_UI_Layer.System, (panel) =>
+        {
+            panel.Init(gameObject.name);
+        });        //提示面板
     }
 
     private void OnMouseDown()
@@ -60,13 +90,17 @@ public abstract class BaseToolOrDevice : MonoBehaviour
         if (GameManager.RunModelMgr.SceneType != E_SceneType.ToolRoom) return;
         if (EventSystem.current.IsPointerOverGameObject()) return;
         OnDown();
+        //gameObject.SetActive(false);
     }
 
     private void OnMouseExit()
     {
+      
+        //TODO: 这里写提示关闭的代码
         if (GameManager.RunModelMgr.SceneType != E_SceneType.ToolRoom) return;
-        OnExit();
         if (EventSystem.current.IsPointerOverGameObject()) return;
+        OnExit();
+        UIManager.Instance.HidePanel<ItemTips>();//提示面板
     }
 
 

Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs

@@ -7,32 +7,28 @@ public class Tool_SelectComponent : BaseToolOrDevice
     public override void OnEnter()
     {
         base.OnEnter();
-        GameManager.UIMgr.ShowPanel<ItemTips>(E_UI_Layer.System, (panel) =>
-        {
-            panel.Init(gameObject.name);
-        });
         ///高亮
         _highlight.highlighted = true;
     }
     public override void OnDown()
     {
         base.OnDown();
-        ////렴흙교관
+        if (GameManager.RunModelMgr.SceneType == E_SceneType.ToolRoom)//털뙤끝쒼
-        //묏야츰냔뵨묏야렴흙묏야움
-
-        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(itemInfo.triggerID, true) == 0)
         {
-            GameManager.PacksackBagMgr.AddOneToolOrMater(itemInfo);
+            ////렴흙교관
-            gameObject.SetActive(false);
+            if (IsClick)
-            GameManager.UIMgr.HidePanel<ItemTips>();//瓊刻충겼
+            {
+                //묏야츰냔뵨묏야렴흙묏야움
+                GameManager.PacksackBagMgr.AddOneToolOrMater(itemInfo);
+                this.gameObject.SetActive(false);
+            }
         }
     }
 
     public override void OnExit()
     {
         ///关闭高亮
-        base.OnExit();
         _highlight.highlighted = false;
-        GameManager.UIMgr.HidePanel<ItemTips>();//瓊刻충겼
+        base.OnExit();
     }
 }

Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs

@@ -27,7 +27,7 @@ public class UI_MenuBar : BasePanel
     private Coroutine coroutine;
     public void Init()
     {
-        //coroutine = GameManager.MonoMgr.StartCoroutine(CountDown(countDown));
+        coroutine = GameManager.MonoMgr.StartCoroutine(CountDown(countDown));
         //MenuBarIamge = GetControl<Image>("MenuBar");
         closeDefaultBtn = GetControl<Button>("CloseDefaultBtn");
         toolRoomBtn = GetControl<Button>("ToolRoomBtn");
@@ -64,7 +64,6 @@ public class UI_MenuBar : BasePanel
     public void CheckBtnBySceneName(E_SceneType type)
     {
         Debug.Log(type.ToString());
-        GetControl<Image>("MenuBar").transform.DOLocalMoveX(1070, 0.5f);
         toolRoomBtn.gameObject.SetActive(type != E_SceneType.ToolRoom);
         siteBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
         workOrderBtn.gameObject.SetActive(type == E_SceneType.Office || type == E_SceneType.Site);
@@ -113,12 +112,11 @@ public class UI_MenuBar : BasePanel
                     GameManager.ScenesMgr.LoadSceneAsyn("04_ToolMaterialScene", () =>
                     {
                         GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
-                        GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
                     });
                 });
                 break;
             case "SiteBtn":
-
+                SceneManager.LoadScene("");
                 break;
             case "WorkOrderBtn":
                 if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(workOrderID, false) == 0)
@@ -141,12 +139,6 @@ public class UI_MenuBar : BasePanel
                 });
                 }
                 break;
-            case "ToolKitBtn":
-                GameManager.UIMgr.ShowPanel<UI_ToolAndMaterialPanel>(E_UI_Layer.Mid, (p) =>
-                {
-
-                });
-                break;
             default:
                 break;
         }

Assets/Scripts/Project/UI/UI_Panel/UI_SelectDevicePanel.cs

@@ -71,8 +71,8 @@ public class UI_SelectDevicePanel : BasePanel
             });
         deviceBtnAComponent.onClick.AddListener(() =>
         {
-            GameManager.RunModelMgr.schemeID = int.Parse(deviceBtnAComponent.name);
+            GameManager.RunModelMgr.deviceId = int.Parse(deviceBtnAComponent.name);
-            GameManager.ProcessMgr.Init(GameManager.RunModelMgr.schemeID, E_ModeType.Study);
+            GameManager.ProcessMgr.Init(GameManager.RunModelMgr.deviceId, E_ModeType.Study);
             GameManager.UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) =>
             {
                 GameManager.UIMgr.ShowPanel<UI_MainTitlePanel>(E_UI_Layer.Bot, (panel) =>

Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs

@@ -6,7 +6,6 @@ public class UI_ToolAndMaterialPanel : BasePanel
 {
     public void Init()
     {
-
     }