diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 278eb15b..a56cdfc6 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -604,6 +604,7 @@ local localization_global = ["ACT_PVP_DESC_21"] = "帮助文本1", ["ACT_PVP_DESC_22"] = "帮助文本2", ["ACT_PVP_DESC_23"] = "帮助文本3", + ["ACT_PVP_DESC_24"] = "停业中", ["ACT_PVP_TALK_DESC_1"] = "嗨~今天想来一局吗?", ["ACT_PVP_TALK_DESC_2"] = "强者,每天可以领取累胜奖励!", ["ACT_PVP_TALK_DESC_3"] = "嗯,这听起来很有趣,我们开始吧!", 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 43096928..9d5e73f8 100644 --- a/lua/app/module/activity/act_pvp/act_pvp_manager.lua +++ b/lua/app/module/activity/act_pvp/act_pvp_manager.lua @@ -79,6 +79,10 @@ function ActPvpManager:rspActData(result) end function ActPvpManager:reqEnter() + if DataManager.ActPvpData:isFinalDay() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACT_PVP_DESC_24)) + end + if not DataManager.ActPvpData:getIsOpen() then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) return @@ -373,6 +377,9 @@ function ActPvpManager:reqBuyBountyLevel() return end local cost = DataManager.ActPvpData:getBuyBountyLevelCost() + if not GFunc.checkCost(cost.id, cost.num, true) then + return + end local params ={ titleTx = I18N:getGlobalText(I18N.GlobalConst.BOUNTY_BUY_LEVEL_TITLE), content = I18N:getGlobalText(I18N.GlobalConst.BOUNTY_BUY_LEVEL_COUNTENT), diff --git a/lua/app/ui/activity/act_pvp/act_pvp_main_ui.lua b/lua/app/ui/activity/act_pvp/act_pvp_main_ui.lua index ee0d47be..778f355b 100644 --- a/lua/app/ui/activity/act_pvp/act_pvp_main_ui.lua +++ b/lua/app/ui/activity/act_pvp/act_pvp_main_ui.lua @@ -1,5 +1,7 @@ local ActPvpMainUI = class("ActPvpMainUI", BaseUI) +local ENTER_BTN_BG = {"common_btn_green_1", "common_btn_grey_1"} + local TASK_DESC = { "ACT_PVP_TALK_DESC_1", @@ -75,10 +77,16 @@ end function ActPvpMainUI:_display() local uiMap = self.root:genAllChildren() uiMap["act_pvp_main_ui.bg.ui_spine_obj"]:playAnim("idle", true, false, false) - uiMap["act_pvp_main_ui.down.enter_node.enter_btn.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_PVP_DESC_2)) uiMap["act_pvp_main_ui.down.btn_rank.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_10)) uiMap["act_pvp_main_ui.down.btn_bounty.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_PVP_DESC_4)) uiMap["act_pvp_main_ui.bg.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_PVP_DESC_5)) + if DataManager.ActPvpData:isFinalDay() then + uiMap["act_pvp_main_ui.down.enter_node.enter_btn"]:setSprite(GConst.ATLAS_PATH.COMMON, ENTER_BTN_BG[2]) + uiMap["act_pvp_main_ui.down.enter_node.enter_btn.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_PVP_DESC_24)) + else + uiMap["act_pvp_main_ui.down.enter_node.enter_btn"]:setSprite(GConst.ATLAS_PATH.COMMON, ENTER_BTN_BG[1]) + uiMap["act_pvp_main_ui.down.enter_node.enter_btn.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_PVP_DESC_2)) + end local titleBg = uiMap["act_pvp_main_ui.bg.title_img"] local title = uiMap["act_pvp_main_ui.bg.title_tx"] title:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_PVP_DESC_6)) @@ -146,7 +154,8 @@ function ActPvpMainUI:refreshTime() if self.canFight ~= canFight then self.canFight = canFight if not self.canFight then - uiMap["act_pvp_main_ui.down.enter_node"]:setVisible(false) + uiMap["act_pvp_main_ui.down.enter_node.enter_btn"]:setSprite(GConst.ATLAS_PATH.COMMON, ENTER_BTN_BG[2]) + uiMap["act_pvp_main_ui.down.enter_node.enter_btn.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_PVP_DESC_24)) end end end diff --git a/lua/app/ui/activity/act_pvp/act_pvp_playing_ui.lua b/lua/app/ui/activity/act_pvp/act_pvp_playing_ui.lua index 799ddac4..b4c19c6d 100644 --- a/lua/app/ui/activity/act_pvp/act_pvp_playing_ui.lua +++ b/lua/app/ui/activity/act_pvp/act_pvp_playing_ui.lua @@ -73,6 +73,10 @@ function ActPvpPlayingUI:_addListeners() local uiMap = self.root:genAllChildren() uiMap["act_pvp_main_ui.down.playing_node.macth_btn"]:addClickListener(function() + if DataManager.ActPvpData:isFinalDay() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACT_PVP_DESC_24)) + return + end ModuleManager.ActPvpManager:showMatchUI() end) diff --git a/lua/app/userdata/activity/act_pvp/act_pvp_data.lua b/lua/app/userdata/activity/act_pvp/act_pvp_data.lua index e73ce7cd..2ac96fcf 100644 --- a/lua/app/userdata/activity/act_pvp/act_pvp_data.lua +++ b/lua/app/userdata/activity/act_pvp/act_pvp_data.lua @@ -61,6 +61,7 @@ function ActPvpData:init(data) else self:updateData(data) end + self:getBountyList() DataManager:registerCrossDayFunc("ActPvpData", function() self.playing = false self.enterCountDaily = 0 @@ -75,9 +76,6 @@ function ActPvpData:init(data) end function ActPvpData:updateData(data) - Logger.logHighlight("---------------ActPvpData:init-----------------") - Logger.printTable(data) - Logger.logHighlight("-----------") if not data then return end @@ -510,6 +508,9 @@ function ActPvpData:getBountyLevel() end function ActPvpData:setBountyLevel(level) + if level > self.minBountyBaseLv then + level = level - self.minBountyBaseLv + end self.level = level self:setDirty() end