diff --git a/lua/app/module/shop/shop_const.lua b/lua/app/module/shop/shop_const.lua index 805f5c40..38d654df 100644 --- a/lua/app/module/shop/shop_const.lua +++ b/lua/app/module/shop/shop_const.lua @@ -96,15 +96,15 @@ ShopConst.FUND_PAGE_BTN_ICON_ATLAS = { [ShopConst.FUND_SHOW_PAGE.TOWER_BOUNTY] = GConst.ATLAS_PATH.UI_ACT_COMMON, } ShopConst.FUND_PAGE_BTN_ICON_1 = { - [ShopConst.FUND_SHOW_PAGE.FUND] = "act_common_btn_11_1", - [ShopConst.FUND_SHOW_PAGE.CHAPTER_FUND] = "act_common_btn_10_1", + [ShopConst.FUND_SHOW_PAGE.FUND] = "act_common_btn_45_1", + [ShopConst.FUND_SHOW_PAGE.CHAPTER_FUND] = "act_common_btn_46_1", [ShopConst.FUND_SHOW_PAGE.BOUNTY] = "act_common_btn_5_1", [ShopConst.FUND_SHOW_PAGE.BOUNTY_COLLECTION] = "act_common_btn_6_1", [ShopConst.FUND_SHOW_PAGE.TOWER_BOUNTY] = "act_common_btn_5_1", } ShopConst.FUND_PAGE_BTN_ICON_2 = { - [ShopConst.FUND_SHOW_PAGE.FUND] = "act_common_btn_11_2", - [ShopConst.FUND_SHOW_PAGE.CHAPTER_FUND] = "act_common_btn_10_2", + [ShopConst.FUND_SHOW_PAGE.FUND] = "act_common_btn_45_2", + [ShopConst.FUND_SHOW_PAGE.CHAPTER_FUND] = "act_common_btn_46_2", [ShopConst.FUND_SHOW_PAGE.BOUNTY] = "act_common_btn_5_2", [ShopConst.FUND_SHOW_PAGE.BOUNTY_COLLECTION] = "act_common_btn_6_2", [ShopConst.FUND_SHOW_PAGE.TOWER_BOUNTY] = "act_common_btn_5_2", diff --git a/lua/app/ui/fund/fund_chapter_comp.lua b/lua/app/ui/fund/fund_chapter_comp.lua index 1276a444..a712a303 100755 --- a/lua/app/ui/fund/fund_chapter_comp.lua +++ b/lua/app/ui/fund/fund_chapter_comp.lua @@ -164,7 +164,7 @@ function FundChapterComp:refreshStageTags() return end self.tagsNode:setActive(true) - local totalWidth = #stageList * TAG_SIZE + (#stageList - 1) * 5 + local totalWidth = #stageList * TAG_SIZE + (#stageList - 1) * 5 + 20 self.tagsContent:setSizeDeltaX(totalWidth) self.tagsViewport:setSizeDeltaX(totalWidth < TAG_COMMON_TOTAL_SIZE and totalWidth or TAG_COMMON_TOTAL_SIZE) diff --git a/lua/app/ui/fund/fund_level_comp.lua b/lua/app/ui/fund/fund_level_comp.lua index e5f3f414..2446b340 100755 --- a/lua/app/ui/fund/fund_level_comp.lua +++ b/lua/app/ui/fund/fund_level_comp.lua @@ -38,7 +38,8 @@ function FundLevelComp:init() end self.imgProgress = uiMap["fund_level_comp.top.img_prog"] self.txProg = uiMap["fund_level_comp.top.img_prog.tx_prog"] - self.txGetAll = uiMap["fund_level_comp.top.bg.desc_2.img_reward.tx_get_all"] + self.rewardImg = uiMap["fund_level_comp.top.bg.img_reward"] + self.txGetAll = uiMap["fund_level_comp.top.bg.tx_get_all"] self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.FUND_DESC_4)) self.txDesc2:setText(I18N:getGlobalText(I18N.GlobalConst.FORCE_DESC_29)) @@ -162,6 +163,7 @@ function FundLevelComp:refresh(isAuto) end end self.txGetAll:setText(count) + GFunc.centerImgAndTx(self.rewardImg, self.txGetAll) end function FundLevelComp:updateData(stage) @@ -185,7 +187,7 @@ function FundLevelComp:refreshStageTags() return end self.tagsNode:setActive(true) - local totalWidth = #stageList * TAG_SIZE + (#stageList - 1) * 5 + local totalWidth = #stageList * TAG_SIZE + (#stageList - 1) * 5 + 20 self.tagsContent:setSizeDeltaX(totalWidth) self.tagsViewport:setSizeDeltaX(totalWidth < TAG_COMMON_TOTAL_SIZE and totalWidth or TAG_COMMON_TOTAL_SIZE)