diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index c35187c2..594150ae 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -449,6 +449,14 @@ local LocalizationGlobalConst = ARENA_DESC_35 = "ARENA_DESC_35", ARENA_DESC_36 = "ARENA_DESC_36", ONE_KEY_GET_DESC = "ONE_KEY_GET_DESC", + + ["ACTIVITY_OVER_EDSC"] = "ACTIVITY_OVER_EDSC", + ["PART_IN_DESC"] = "PART_IN_DESC", + + ["HERO_FUND_DESCC_1"] = "HERO_FUND_DESCC_1", + ["HERO_FUND_DESCC_2"] = "HERO_FUND_DESCC_2", + ["HERO_FUND_DESCC_3"] = "HERO_FUND_DESCC_3", + ["HERO_FUND_DESCC_4"] = "HERO_FUND_DESCC_4" } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 6d3878b6..6f0816b1 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -451,6 +451,11 @@ local localization_global = ["ONE_KEY_GET_DESC"] = "一键领取", ["ACTIVITY_OVER_EDSC"] = "活动已结束", + ["PART_IN_DESC"] = "参与", + ["HERO_FUND_DESCC_1"] = "新活动月之祝福开启", + ["HERO_FUND_DESCC_2"] = "月之祝福标题", + ["HERO_FUND_DESCC_3"] = "月之祝福描述", + ["HERO_FUND_DESCC_4"] = "月之祝福前往14天乐描述" } return localization_global \ No newline at end of file diff --git a/lua/app/ui/activity/hero_fund/hero_fund_ui.lua b/lua/app/ui/activity/hero_fund/hero_fund_ui.lua index 6fb45bdd..2617c6e3 100644 --- a/lua/app/ui/activity/hero_fund/hero_fund_ui.lua +++ b/lua/app/ui/activity/hero_fund/hero_fund_ui.lua @@ -1,9 +1,12 @@ local HeroFundUI = class("HeroFundUI", BaseUI) local FUND_CELL = "app/ui/activity/hero_fund/cell/fund_cell" - local BTN_ICON = {"common_btn_green_3", "common_btn_dark_4"} +function HeroFundUI:isFullScreen() + return false +end + function HeroFundUI:ctor() self.rewardList = {} for id, info in pairs(DataManager.HeroFundData:getConfig()) do @@ -33,6 +36,20 @@ function HeroFundUI:onLoadRootComplete() end function HeroFundUI:_display() + local uiMap = self.root:genAllChildren() + uiMap["activity_herofund_ui.bg.bg.title"]:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_FUND_DESCC_2)) + self.downDesc = uiMap["activity_herofund_ui.bg.bg.desc"] + self.downDesc:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_FUND_DESCC_3)) + self.toActivityTx = uiMap["activity_herofund_ui.bg.bg.to_activity_tx"] + self.toActivityTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_FUND_DESCC_4)) + self.toActivityBtn = uiMap["activity_herofund_ui.bg.bg.to_activity_btn"] + self.toActivityBtnTx = uiMap["activity_herofund_ui.bg.bg.to_activity_btn.text"] + self.toActivityBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.PART_IN_DESC)) + self.toActivityBtn:addClickListener(function() + self:closeUI() + -- 去14活动 + end) + self:refreshBtns() self:_refreshScrollrect() end @@ -143,12 +160,21 @@ end function HeroFundUI:refreshTime() local uiMap = self.root:genAllChildren() - local remianTime = DataManager.HeroFundData:getRemainTime() + local remainTime = DataManager.HeroFundData:getRemainTime() local str - if remianTime <= 0 then + if remainTime <= 0 then str = I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC) else - str = Time:formatNumTimeStr(remianTime) + str = Time:formatNumTimeStr(remainTime) + if remainTime <= 86400 then --最后一天 + self.toActivityTx:setVisible(true) + self.toActivityBtn:setActive(true) + self.downDesc:setVisible(false) + else + self.toActivityTx:setVisible(false) + self.toActivityBtn:setActive(false) + self.downDesc:setVisible(true) + end end uiMap["activity_herofund_ui.bg.countdown.tx_countdown"]:setText(str) end diff --git a/lua/app/ui/activity/seven_day/seven_day_ui.lua b/lua/app/ui/activity/seven_day/seven_day_ui.lua index c16a087d..5092b418 100644 --- a/lua/app/ui/activity/seven_day/seven_day_ui.lua +++ b/lua/app/ui/activity/seven_day/seven_day_ui.lua @@ -54,6 +54,19 @@ function SevenDayUI:_display() self:closeUI() end) + self.downDesc = self.uiMap["seven_day_ui.down.desc"] + self.toHeroFundTx = self.uiMap["seven_day_ui.down.to_herofund_tx"] + self.toHeroFundBtn = self.uiMap["seven_day_ui.down.to_herofund_btn"] + self.toHeroFundBtnTx = self.uiMap["seven_day_ui.down.to_herofund_btn.text"] + self.toHeroFundBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.PART_IN_DESC)) + self.toHeroFundTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_FUND_DESCC_1)) + self.toHeroFundBtn:addClickListener(function() + self:closeUI() + if DataManager.HeroFundData:getIsOpen() then + ModuleManager.HeroFundManager:showMainUI() + end + end) + self:initTop() self:initTasks() end @@ -244,6 +257,15 @@ function SevenDayUI:updateTime() local remainTime = endTime - Time:getServerTime() if remainTime >= 0 then self.timeTx:setText(GFunc.getTimeStr(remainTime)) + if remainTime <= 86400 then --最后一天 + self.toHeroFundTx:setVisible(true) + self.toHeroFundBtn:setActive(true) + self.downDesc:setVisible(false) + else + self.toHeroFundTx:setVisible(false) + self.toHeroFundBtn:setActive(false) + self.downDesc:setVisible(true) + end else UIManager:closeUnderUI(self) self:closeUI()