From 2dbe46c258d187d984233b5869402de1a4f384d5 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Sat, 16 Sep 2023 18:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E6=A2=A6=E9=AD=87?= =?UTF-8?q?=E9=85=92=E9=A6=86=EF=BC=8C=E5=B7=AE=E8=A1=A8=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/activity/act_pvp/act_pvp_main_ui.lua | 1 + lua/app/ui/activity/act_pvp/act_pvp_playing_ui.lua | 1 + lua/app/ui/main_city/cell/side_bar_act_pvp_cell.lua | 2 +- lua/app/userdata/activity/act_pvp/act_pvp_data.lua | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) 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 d5423b73..e5fa860f 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 @@ -37,6 +37,7 @@ 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)) 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 4f0a2835..02fe9df9 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 @@ -37,6 +37,7 @@ end function ActPvpPlayingUI:_display() local uiMap = self.root:genAllChildren() + uiMap["act_pvp_playing_ui.bg.ui_spine_obj"]:playAnim("idle", true, false, false) uiMap["act_pvp_main_ui.down.playing_node.macth_btn.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_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)) diff --git a/lua/app/ui/main_city/cell/side_bar_act_pvp_cell.lua b/lua/app/ui/main_city/cell/side_bar_act_pvp_cell.lua index 9dc3169d..5fc44325 100644 --- a/lua/app/ui/main_city/cell/side_bar_act_pvp_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_act_pvp_cell.lua @@ -14,7 +14,7 @@ function SideBarActPvpCell:getIsOpen() end function SideBarActPvpCell:getSpineName() - return "ui_act_bossrush_mainbtn" + return "ui_main_btn_act_pvp" end function SideBarActPvpCell:onClick() 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 53ecf68d..7de43f6c 100644 --- a/lua/app/userdata/activity/act_pvp/act_pvp_data.lua +++ b/lua/app/userdata/activity/act_pvp/act_pvp_data.lua @@ -636,7 +636,7 @@ end function ActPvpData:getBountyRp() self:getBountyList() - for level = self.minBountyBaseLv + 1, self.level do + for level = self.minBountyBaseLv + 1, self.level + self.minBountyBaseLv do for k, bountyType in pairs(ActPvpData.BOUNTY_TYPE) do if self:getBountyCanGet(level, bountyType) then return true