huqibin
/
new_10009_YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUG265，266,267,269

This commit is contained in:
huqibin 2025-01-14 09:26:11 +08:00
parent 21aafe0d13
commit 131173a397
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/StepState_9001.cs
View File

@ -51,7 +51,7 @@ public class StepState_9001 : StepState
else if (num == 2)//选取工器具 else if (num == 2)//选取工器具
{ {
//服装拿到背包 //服装拿到背包
List<Tool_SelectComponent> items = ToolAndmaterialMgr.Instance.GetItemInfoByName(new List<string> { "国网安全帽", "工作服", "编织手套", "绝缘靴" }); List<Tool_SelectComponent> items = ToolAndmaterialMgr.Instance.GetItemInfoByName(new List<string> { "国网安全帽", "工作服", "绝缘手套", "绝缘靴" });
items.ForEach(item => items.ForEach(item =>
{ {
PacksackBagMgr.Instance.AddOneToolOrMater(item.itemInfo); PacksackBagMgr.Instance.AddOneToolOrMater(item.itemInfo);
@ -70,7 +70,7 @@ public class StepState_9001 : StepState
//清空背包数据 //清空背包数据
PacksackBagMgr.Instance.ClearAllData(); PacksackBagMgr.Instance.ClearAllData();
//生成服装 //生成服装
List<ItemInfo> items = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List<string> { "国网安全帽", "工作服", "编织手套", "绝缘靴" }); List<ItemInfo> items = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List<string> { "国网安全帽", "工作服", "绝缘手套", "绝缘靴" });
//放入背包 //放入背包
items.ForEach(item => items.ForEach(item =>
{ {

6
Assets/Template/Scripts/Project/Manager/LiveSceneManager.cs
View File

@ -295,6 +295,12 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
{ {
CheckDeviceButtonPanel.instance.MyDesTroy(); CheckDeviceButtonPanel.instance.MyDesTroy();
} }
//隐藏中间提示面板
if (GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>())
{
GameManager.UIMgr.HidePanel<UI_MiddleTipPanel>();
}
Debug.Log("LiveSceneManager OnDestroy");
} }
private void OnDisable() private void OnDisable()
{ {

15
Assets/Template/Scripts/Project/Manager/TooRoomMannger.cs
View File

@ -165,12 +165,19 @@ public class TooRoomMannger : SingletonMono<TooRoomMannger>
private void OnDestroy() private void OnDestroy()
{ {
GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
GameManager.UIMgr.toolTips.HideTips();
GameManager.UIMgr.imageTips.HideTips();
if (GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>())
{
GameManager.UIMgr.HidePanel<UI_MiddleTipPanel>();
}
Debug.Log("toolroomManager disable");
} }
private void OnDisable() //private void OnDisable()
{ //{
GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); // GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
} //}
} }