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 4b22a4c2..43096928 100644 --- a/lua/app/module/activity/act_pvp/act_pvp_manager.lua +++ b/lua/app/module/activity/act_pvp/act_pvp_manager.lua @@ -382,7 +382,7 @@ function ActPvpManager:reqBuyBountyLevel() costNum = cost.num, okFunc = function() local params = { - id = level + id = DataManager.ActPvpData:getBountyLevelId(level + 1) } self:sendMessage(ProtoMsgType.FromMsgEnum.ActivityPVPBountyClaimByDiamondReq, params, {}, self.rspBuyBountyLevel, BIReport.ITEM_GET_TYPE.ACT_PVP_BUY_BOUNTY_LEVEL) end, 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 0f97a3f2..ee0d47be 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 @@ -259,7 +259,9 @@ function ActPvpMainUI:showTalk() end self.showTalkSeq = self.root:createBindTweenSequence() self.showTalkSeq:AppendCallback(function() - local desc = self.curTaskDescList[math.random(1, #self.curTaskDescList)] + local index = math.random(1, #self.curTaskDescList - 1) + local desc = table.remove(self.curTaskDescList, index) + table.insert(self.curTaskDescList, desc) popDesc:setText(I18N:getGlobalText(I18N.GlobalConst[desc])) popBg:setVisible(false) 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 50e6e202..799ddac4 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 @@ -276,7 +276,9 @@ function ActPvpPlayingUI:showTalk() end self.showTalkSeq = self.root:createBindTweenSequence() self.showTalkSeq:AppendCallback(function() - local desc = TASK_DESC[math.random(1, #TASK_DESC)] + local index = math.random(1, #TASK_DESC - 1) + local desc = table.remove(TASK_DESC, index) + table.insert(TASK_DESC, desc) popDesc:setText(I18N:getGlobalText(I18N.GlobalConst[desc])) popBg:setVisible(false) 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 7f792ed6..e73ce7cd 100644 --- a/lua/app/userdata/activity/act_pvp/act_pvp_data.lua +++ b/lua/app/userdata/activity/act_pvp/act_pvp_data.lua @@ -616,6 +616,10 @@ function ActPvpData:getBountyLevelEnough(level) return self.level + self.minBountyBaseLv >= level end +function ActPvpData:getBountyLevelId(level) + return level + self.minBountyBaseLv +end + function ActPvpData:getProActId() return PRO_ACT_ID end