diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua index 9d7d60b5a4..609c151dce 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua @@ -85,6 +85,7 @@ function HongMengEnvoyPanel:BindEvent() self.AddBtn, function() --二级弹窗界面 + Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.OpenBoxTips) end ) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua index 491c9883e8..41975ebd24 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua @@ -300,6 +300,13 @@ function this:AddBoxFun(boxData) local content = "" Gold = BagManager.GetTotalItemNum(UpViewRechargeType.XuanHuangZhiQi) DemonCrystal = BagManager.GetTotalItemNum(UpViewRechargeType.DemonCrystal) + local keys = GameDataBase.SheetBase.GetKeys(this.tab) --获取数据长度 + if #HarmonyManager.hongmengHeroInfos >= #keys then + -- body + PopupTipPanel.ShowTip("共鸣格子已经全部解锁") + return + end + if Gold >= boxData.PropPrice[2] then content =string.format("是否花费%d玄黄之气解锁共鸣位置",boxData.PropPrice[2]) elseif Gold < boxData.PropPrice[2] then @@ -313,6 +320,9 @@ function this:AddBoxFun(boxData) if Gold < boxData.PropPrice[2] and DemonCrystal < boxData.MoneyPrice[2] then PopupTipPanel.ShowTip("妖晶不足!") return + end + if condition then + -- body end --向服务器请求消息 NetManager.HongMengRequset(boxData.Id,function() @@ -394,6 +404,9 @@ function this:OpenBoxFun() if tempData then -- body this:AddBoxFun(tempData) + else + PopupTipPanel.ShowTip("共鸣格子已经全部解锁") + return end end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index c9e199572f..fad0219e9a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -889,20 +889,17 @@ function this:BindEvent() end) Util.AddClick(this.btnHongMeng,function() - if HarmonyManager:HongMengTowerUpLimit() > 0 then + NetManager.HongMengInfoResponse(function () -- body - UIManager.OpenPanel(UIName.HongMengEnvoyPanel) - else - if PlayerManager.level == 45 then - NetManager.HongMengInfoResponse(function () - -- body - UIManager.OpenPanel(UIName.HongMengPanel) - end) + if HarmonyManager:HongMengTowerUpLimit() > 0 then + -- body + UIManager.OpenPanel(UIName.HongMengEnvoyPanel) else UIManager.OpenPanel(UIName.HongMengPanel) end - - end + + end) + -- if (ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.HongMengZhen)) then