From 168dc1eca3270ef1ade30efaacb018a5b298b9f0 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Fri, 24 Oct 2025 14:36:35 +0800 Subject: [PATCH] fix bug --- lua/app/common/bi_report.lua | 1 + .../localization_global_const.lua | 22 +++++++++++++++++++ lua/app/config/strings/cn/global.lua | 22 +++++++++++++++++++ lua/app/ui/activity/common/act_base_ui.lua | 3 --- .../activity/common/cell/act_gift_cell_v1.lua | 11 ++++++++-- 5 files changed, 54 insertions(+), 5 deletions(-) diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index f146e5f7..24f87fac 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -254,6 +254,7 @@ BIReport.ADS_CLICK_TYPE = { SUMMON_AD = "SummonAd", AD_ACT_SEVEN_DAY_GIFT = "AdActSevenDayGift", + AD_ACT_SPRINT = "AdActSprint", -- 冲刺活动 } BIReport.FIGHT_OPT_TYPE = { diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index da6ed2bc..43035f69 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -938,6 +938,28 @@ local LocalizationGlobalConst = ACT_TURNTABLE_DESC_5 = "ACT_TURNTABLE_DESC_5", VALUE_DESC = "VALUE_DESC", USING_DESC = "USING_DESC", + FUND_CHAPTER_TAG_DESC_1 = "FUND_CHAPTER_TAG_DESC_1", + FUND_CHAPTER_TAG_DESC_2 = "FUND_CHAPTER_TAG_DESC_2", + FUND_CHAPTER_TAG_DESC_3 = "FUND_CHAPTER_TAG_DESC_3", + FUND_CHAPTER_TAG_DESC_4 = "FUND_CHAPTER_TAG_DESC_4", + FUND_CHAPTER_TAG_DESC_5 = "FUND_CHAPTER_TAG_DESC_5", + FUND_CHAPTER_TAG_DESC_6 = "FUND_CHAPTER_TAG_DESC_6", + FUND_CHAPTER_TAG_DESC_7 = "FUND_CHAPTER_TAG_DESC_7", + FUND_CHAPTER_TAG_DESC_8 = "FUND_CHAPTER_TAG_DESC_8", + FUND_CHAPTER_TAG_DESC_9 = "FUND_CHAPTER_TAG_DESC_9", + FUND_CHAPTER_TAG_DESC_10 = "FUND_CHAPTER_TAG_DESC_10", + FUND_CHAPTER_TAG_DESC_11 = "FUND_CHAPTER_TAG_DESC_11", + FUND_CHAPTER_TAG_DESC_12 = "FUND_CHAPTER_TAG_DESC_12", + FUND_CHAPTER_TAG_DESC_13 = "FUND_CHAPTER_TAG_DESC_13", + FUND_CHAPTER_TAG_DESC_14 = "FUND_CHAPTER_TAG_DESC_14", + FUND_CHAPTER_TAG_DESC_15 = "FUND_CHAPTER_TAG_DESC_15", + FUND_CHAPTER_TAG_DESC_16 = "FUND_CHAPTER_TAG_DESC_16", + FUND_CHAPTER_TAG_DESC_17 = "FUND_CHAPTER_TAG_DESC_17", + FUND_CHAPTER_TAG_DESC_18 = "FUND_CHAPTER_TAG_DESC_18", + FUND_CHAPTER_TAG_DESC_19 = "FUND_CHAPTER_TAG_DESC_19", + FUND_CHAPTER_TAG_DESC_20 = "FUND_CHAPTER_TAG_DESC_20", + FUND_CHAPTER_TAG_DESC_21 = "FUND_CHAPTER_TAG_DESC_21", + FUND_CHAPTER_TAG_DESC_22 = "FUND_CHAPTER_TAG_DESC_22", } 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 b53a0e9e..4743bd8a 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -938,6 +938,28 @@ local localization_global = ["ACT_TURNTABLE_DESC_5"] = "跳过动画", ["VALUE_DESC"] = "超值", ["USING_DESC"] = "使用", + ["FUND_CHAPTER_TAG_DESC_1"] = "关卡基金", + ["FUND_CHAPTER_TAG_DESC_2"] = "关卡基金2", + ["FUND_CHAPTER_TAG_DESC_3"] = "关卡基金3", + ["FUND_CHAPTER_TAG_DESC_4"] = "关卡基金4", + ["FUND_CHAPTER_TAG_DESC_5"] = "关卡基金5", + ["FUND_CHAPTER_TAG_DESC_6"] = "关卡基金6", + ["FUND_CHAPTER_TAG_DESC_7"] = "关卡基金7", + ["FUND_CHAPTER_TAG_DESC_8"] = "关卡基金8", + ["FUND_CHAPTER_TAG_DESC_9"] = "关卡基金9", + ["FUND_CHAPTER_TAG_DESC_10"] = "关卡基金10", + ["FUND_CHAPTER_TAG_DESC_11"] = "关卡基金11", + ["FUND_CHAPTER_TAG_DESC_12"] = "关卡基金12", + ["FUND_CHAPTER_TAG_DESC_13"] = "关卡基金13", + ["FUND_CHAPTER_TAG_DESC_14"] = "关卡基金14", + ["FUND_CHAPTER_TAG_DESC_15"] = "关卡基金15", + ["FUND_CHAPTER_TAG_DESC_16"] = "关卡基金16", + ["FUND_CHAPTER_TAG_DESC_17"] = "关卡基金17", + ["FUND_CHAPTER_TAG_DESC_18"] = "关卡基金18", + ["FUND_CHAPTER_TAG_DESC_19"] = "关卡基金19", + ["FUND_CHAPTER_TAG_DESC_20"] = "关卡基金20", + ["FUND_CHAPTER_TAG_DESC_21"] = "关卡基金21", + ["FUND_CHAPTER_TAG_DESC_22"] = "关卡基金22", } return localization_global \ No newline at end of file diff --git a/lua/app/ui/activity/common/act_base_ui.lua b/lua/app/ui/activity/common/act_base_ui.lua index 8276c042..5c72b659 100755 --- a/lua/app/ui/activity/common/act_base_ui.lua +++ b/lua/app/ui/activity/common/act_base_ui.lua @@ -145,9 +145,6 @@ function ActBaseUI:_bind() end self:refreshPageBtns() end) - self:bind(DataManager.ActTaskData, "isDirty", function() - self:refreshPageBtns() - end) end function ActBaseUI:refreshPage(page) diff --git a/lua/app/ui/activity/common/cell/act_gift_cell_v1.lua b/lua/app/ui/activity/common/cell/act_gift_cell_v1.lua index c063566a..0a2021ac 100644 --- a/lua/app/ui/activity/common/cell/act_gift_cell_v1.lua +++ b/lua/app/ui/activity/common/cell/act_gift_cell_v1.lua @@ -39,6 +39,15 @@ function ActGiftCellV1:refresh(actId, actGiftId) bg:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, (isFree or isAd) and BG_NAME_1 or BG_NAME_2) funcBtn:setSprite(GConst.ATLAS_PATH.COMMON, soldOut and BTN_NAME_1 or BTN_NAME_2) + if isFree or isAd then + local limitStr = I18N:getGlobalText(I18N.GlobalConst.GIFT_ROUTINE_DESC_8) .. "(" .. (limitCount - buyCount) .. "/" .. limitCount .. ")" + -- limitTx:setText(soldOut and "" .. limitStr .. "" or "" .. limitStr .. "") + limitTx:setText("" .. limitStr .. "") + else + local limitStr = I18N:getGlobalText(I18N.GlobalConst.GIFT_ROUTINE_DESC_8) .. "(" .. (limitCount - buyCount) .. "/" .. limitCount .. ")" + -- limitTx:setText(soldOut and "" .. limitStr .. "" or "" .. limitStr .. "") + limitTx:setText("" .. limitStr .. "") + end if soldOut then funcTx:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_GOGOGO_DESC_8)) funcAdIcon:setVisible(false) @@ -89,8 +98,6 @@ function ActGiftCellV1:refresh(actId, actGiftId) self.rewardList[i].baseObject:setActive(false) end end - local limitStr = I18N:getGlobalText(I18N.GlobalConst.GIFT_ROUTINE_DESC_8) .. "(" .. (limitCount - buyCount) .. "/" .. limitCount .. ")" - limitTx:setText(soldOut and "" .. limitStr .. "" or "" .. limitStr .. "") if value then offBg:setVisible(true) offTx:setText(value .. "%")