diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 4c083eb3a4..db4f0e4ec0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -223,6 +223,9 @@ function CarbonTypePanelV2:OnShow(...) redPointTypeList[redpoint] = data.redPointType CheckRedPointStatus(data.redPointType) end + + Util.GetGameObject(v, "bg/Mask"):SetActive(false) + Util.GetGameObject(v, "bg/Mask (1)"):SetActive(false) end carbonType = PlayerManager.carbonType diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 3c84c8b0d7..7fe0598e07 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -212,11 +212,13 @@ local jumpDic = { end end, [JumpType.MemberCamp] = function()--成员 + UIManager.CloseAll(true) HeroManager.heroListPanelSortID = 1 HeroManager.heroListPanelProID = 0 - UIManager.OpenPanel(UIName.RoleListPanel) + UIManager.OpenPanel(UIName.RoleListPanel) end, [JumpType.StoreHouse] = function(data)--仓库 + UIManager.CloseAll(true) if data then local openPanle = UIManager.OpenPanel(UIName.BagPanel,data[1]) if openPanle then @@ -240,8 +242,10 @@ local jumpDic = { UIManager.OpenPanel(UIName.GoodFriendMainPanel,nil,data[1]) end, [JumpType.Level] = function(data)--关卡 + + UIManager.CloseAll(true) local openPanle - openPanle = UIManager.OpenPanel(UIName.FightPointPassMainPanel) + openPanle = UIManager.OpenPanel(UIName.FightPointPassMainPanel) if openPanle then openPanle.ShowGuideGo(data[1]) end @@ -323,6 +327,7 @@ local jumpDic = { end end, [JumpType.Privilege] = function(data)--特权 + UIManager.CloseAll(true) local openPanle = UIManager.OpenPanel(UIName.VipPanelV2) if openPanle and data and data[1] < 0 then --引导光圈 -1 下边条目领取按钮 @@ -416,6 +421,8 @@ local jumpDic = { if PlayerManager.familyId == 0 then UIManager.OpenPanel(UIName.GuildFindPopup) else + + UIManager.CloseAll(true) if UIManager.IsOpen(UIName.GuildMainCityPanel) then UIManager.OpenPanel(UIName.GuildAidMainPopup,data[1]) else