diff --git a/Assets/Scripts/Device_Control_9001.cs b/Assets/Scripts/Device_Control_9001.cs index b186172..9f1058c 100644 --- a/Assets/Scripts/Device_Control_9001.cs +++ b/Assets/Scripts/Device_Control_9001.cs @@ -80,6 +80,8 @@ public class Device_Control_9001 : Device_Control ewmh.SetActive(true); ewmOK = false; isSMOK = false; + if (ewmh.GetComponent() != null) + ewmh.GetComponent().isInstall = true; } private void Awake() @@ -89,6 +91,8 @@ public class Device_Control_9001 : Device_Control ewmh.SetActive(true); ewmOK = false; isSMOK = false; + if (ewmh.GetComponent() != null) + ewmh.GetComponent().isInstall = true; instance = this; diff --git a/Assets/Scripts/StepState_9001.cs b/Assets/Scripts/StepState_9001.cs index cd8c1f3..2a79c88 100644 --- a/Assets/Scripts/StepState_9001.cs +++ b/Assets/Scripts/StepState_9001.cs @@ -67,21 +67,22 @@ public class StepState_9001 : StepState Score_9001.cdzIndex = 0; //清空背包数据 - PacksackBagMgr.Instance.ClearAllData(); + //PacksackBagMgr.Instance.ClearAllData(); //生成服装 - List items = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "国网安全帽", "工作服", "绝缘手套", "绝缘靴" }); + /*List items = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "国网安全帽", "工作服", "绝缘手套", "绝缘靴" }); //放入背包 items.ForEach(item => { PacksackBagMgr.Instance.AddOneToolOrMater(item); //穿上 PacksackBagMgr.Instance.WearItemState(item, true); - }); + });*/ //生成工具 - List items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "剥线钳", "绝缘铲", "验电笔", "国网安全帽", "工作服", "绝缘手套", "绝缘靴", "工作证", "盒装封印", "绝缘胶带", "三相四线费控智能电能表", "盒装计量箱电子标签" }); + List items2 = ToolAndmaterialMgr.Instance.GetItemInfoByName(new List { "剥线钳", "绝缘铲", "验电笔", "工作证", "盒装封印", "绝缘胶带", "三相四线费控智能电能表", "盒装计量箱电子标签" }); items2.ForEach(item => { - PacksackBagMgr.Instance.AddOneToolOrMater(item); + PacksackBagMgr.Instance.AddOneToolOrMater(item.itemInfo); + Destroy(item.gameObject); }); } else if (num == 4)//验电