From c6d10d882517e34a738fe7e86a766c01f46b3460 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 24 Jul 2023 18:47:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/localization/localization_global_const.lua | 1 + lua/app/config/strings/cn/global.lua | 1 + lua/app/module/dungeon_armor/dungeon_armor_manager.lua | 1 + lua/app/ui/dungeon_armor/dungeon_armor_farm_ui.lua | 2 +- lua/app/ui/dungeon_armor/dungeon_armor_fight_ui.lua | 1 + lua/app/userdata/dungeon/dungeon_armor_entity.lua | 8 ++++++++ 6 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 9e5cec71..d00828d7 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -1,5 +1,6 @@ local LocalizationGlobalConst = { + DUNGEON_ARMOR_DESC_17 = "DUNGEON_ARMOR_DESC_17", MAIN_BTN_1 = "MAIN_BTN_1", QLT_DESC_1 = "QLT_DESC_1", QLT_DESC_2 = "QLT_DESC_2", diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 6a3efe81..7c502cbe 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -420,6 +420,7 @@ local localization_global = ["DUNGEON_ARMOR_DESC_15"] = "请先购买本基金", ["DUNGEON_ARMOR_DESC_16"] = "超值", ["MOP_UP_DESC_3"] = "足够", + ["DUNGEON_ARMOR_DESC_17"] = "今日剩余挑战次数{0}" } return localization_global \ No newline at end of file diff --git a/lua/app/module/dungeon_armor/dungeon_armor_manager.lua b/lua/app/module/dungeon_armor/dungeon_armor_manager.lua index f6f73402..20b2ae75 100644 --- a/lua/app/module/dungeon_armor/dungeon_armor_manager.lua +++ b/lua/app/module/dungeon_armor/dungeon_armor_manager.lua @@ -54,6 +54,7 @@ function DungeonArmorManager:rsqFight(result) local armorData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR) if result.reqData then armorData:setCurFightChapterId(result.reqData.chapter_armor_id) + armorData:refreshFarmCount(result.reqData.chapter_armor_id, result.farm_count) end local params = { atkFormation = {} diff --git a/lua/app/ui/dungeon_armor/dungeon_armor_farm_ui.lua b/lua/app/ui/dungeon_armor/dungeon_armor_farm_ui.lua index bcafecdc..cea8d26d 100644 --- a/lua/app/ui/dungeon_armor/dungeon_armor_farm_ui.lua +++ b/lua/app/ui/dungeon_armor/dungeon_armor_farm_ui.lua @@ -84,7 +84,7 @@ function DungeonArmorFarmUI:refreshBottom() GFunc.centerImgAndTx(vitIcon, costVit, 10) uiMap["dungeon_armor_farm_ui.bg.bg.btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH)) - uiMap["dungeon_armor_farm_ui.bg.bg.desc_2"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_5, self.armorData:getRemianFarmCount(self.chapterId))) + uiMap["dungeon_armor_farm_ui.bg.bg.desc_2"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_ARMOR_DESC_17, self.armorData:getRemianFarmCount(self.chapterId))) end return DungeonArmorFarmUI \ No newline at end of file diff --git a/lua/app/ui/dungeon_armor/dungeon_armor_fight_ui.lua b/lua/app/ui/dungeon_armor/dungeon_armor_fight_ui.lua index 85cdd5e2..474fa80c 100644 --- a/lua/app/ui/dungeon_armor/dungeon_armor_fight_ui.lua +++ b/lua/app/ui/dungeon_armor/dungeon_armor_fight_ui.lua @@ -91,6 +91,7 @@ function DungeonArmorFightUI:refreshBottom() GFunc.centerImgAndTx(vitIcon, costVit, 10) uiMap["dungeon_armor_fight_ui.bg.bg.btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE)) + uiMap["dungeon_armor_fight_ui.bg.bg.desc_2"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_ARMOR_DESC_17, self.armorData:getRemianFarmCount(self.chapterId))) end return DungeonArmorFightUI \ No newline at end of file diff --git a/lua/app/userdata/dungeon/dungeon_armor_entity.lua b/lua/app/userdata/dungeon/dungeon_armor_entity.lua index 4a133e14..f5aea415 100644 --- a/lua/app/userdata/dungeon/dungeon_armor_entity.lua +++ b/lua/app/userdata/dungeon/dungeon_armor_entity.lua @@ -43,6 +43,14 @@ function DungeonArmorEntity:refreshInfoOnFarm(chapterId, result) self:setDirty() end +function DungeonArmorEntity:refreshFarmCount(chapterId, count) + if not count then + return + end + self.farmCount[chapterId] = count + self:setDirty() +end + -- 更新礼包状态 function DungeonArmorEntity:updateGift(giftInfo) DataManager.ShopData:initGift(PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT, giftInfo)