diff --git a/lua/app/module/activity/act_pvp/act_pvp_manager.lua b/lua/app/module/activity/act_pvp/act_pvp_manager.lua index daab8d76..b1aebb4b 100644 --- a/lua/app/module/activity/act_pvp/act_pvp_manager.lua +++ b/lua/app/module/activity/act_pvp/act_pvp_manager.lua @@ -180,6 +180,11 @@ function ActPvpManager:rspRefreshHero(result) end function ActPvpManager:reqMatch() + if not DataManager.ActPvpData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + self:sendMessage(ProtoMsgType.FromMsgEnum.ActivityPVPMatchReq, {}, {}, self.rspMatch) end @@ -191,6 +196,11 @@ function ActPvpManager:rspMatch(result) end function ActPvpManager:reqOverCD(isAd) + if not DataManager.ActPvpData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + if not isAd then local cost = DataManager.ActPvpData:getRematchConstGem() if not GFunc.checkCost(GConst.ItemConst.ITEM_ID_GEM, cost, true) then @@ -226,6 +236,11 @@ function ActPvpManager:rspOverCD(result) end function ActPvpManager:reqFight() + if not DataManager.ActPvpData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + self:sendMessage(ProtoMsgType.FromMsgEnum.ActivityPVPStartReq, {}, {}, self.rspFight) end @@ -321,6 +336,11 @@ function ActPvpManager:rspFightEnd(result) end function ActPvpManager:reqDailyReward(index) + if not DataManager.ActPvpData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + local params = { id = index } @@ -347,6 +367,11 @@ function ActPvpManager:rspRank(result) end function ActPvpManager:reqRankReward() + if not DataManager.ActPvpData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + self:sendMessage(ProtoMsgType.FromMsgEnum.ActivityPVPRankRewardsReq, {}, {}, self.rspRankReward, BIReport.ITEM_GET_TYPE.ACT_PVP_RANK_REWARD) end @@ -358,6 +383,11 @@ function ActPvpManager:rspRankReward(result) end function ActPvpManager:reqBountyReward(id, bountyType) + if not DataManager.ActPvpData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + local typeNum = DataManager.ActPvpData.BOUNTY_TYPE_TO_NUM[bountyType] if not typeNum then return @@ -377,6 +407,11 @@ function ActPvpManager:rspBountyReward(result) end function ActPvpManager:reqBuyBountyLevel() + if not DataManager.ActPvpData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + local level = DataManager.ActPvpData:getBountyLevel() if level + 1 > DataManager.ActPvpData:getMaxBountyLevel() then return diff --git a/lua/app/ui/activity/act_pvp/act_pvp_bounty_ui.lua b/lua/app/ui/activity/act_pvp/act_pvp_bounty_ui.lua index a9d2b57a..0a3b6092 100644 --- a/lua/app/ui/activity/act_pvp/act_pvp_bounty_ui.lua +++ b/lua/app/ui/activity/act_pvp/act_pvp_bounty_ui.lua @@ -85,6 +85,11 @@ function ActPvpBountyUI:refreshBtns() probtn:setSprite(GConst.ATLAS_PATH.COMMON, BTN_ICON[1]) probtn:setTouchEnable(true) probtn:addClickListener(function() + if not DataManager.ActPvpData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + PayManager:purchasePackage(DataManager.ActPvpData:getProActId(), PayManager.PURCHARSE_TYPE.ACT_GIFT) end) proBtntx:setVisible(false) @@ -106,6 +111,11 @@ function ActPvpBountyUI:refreshBtns() utralbtn:setSprite(GConst.ATLAS_PATH.COMMON, BTN_ICON[1]) utralbtn:setTouchEnable(true) utralbtn:addClickListener(function() + if not DataManager.ActPvpData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + PayManager:purchasePackage(DataManager.ActPvpData:getUtralActId(), PayManager.PURCHARSE_TYPE.ACT_GIFT) end) utralBtntx:setVisible(false)