diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 13afd5b8..fcd007ee 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -971,6 +971,7 @@ local LocalizationGlobalConst = FUND_CHAPTER_TAG_DESC_21 = "FUND_CHAPTER_TAG_DESC_21", FUND_CHAPTER_TAG_DESC_22 = "FUND_CHAPTER_TAG_DESC_22", TALENT_HELP = "TALENT_HELP", + RECOMMENDED_POWER = "RECOMMENDED_POWER", } 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 79676c77..028a79c0 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -971,6 +971,7 @@ local localization_global = ["FUND_CHAPTER_TAG_DESC_21"] = "关卡基金21", ["FUND_CHAPTER_TAG_DESC_22"] = "关卡基金22", ["TALENT_HELP"] = "天赋帮助", + ["RECOMMENDED_POWER"] = "推荐战斗力：{0}", } return localization_global \ No newline at end of file diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index 7afa4eb6..df1afd44 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -508,6 +508,7 @@ TaskManager.gotoFunc = { [GConst.TaskConst.TASK_TYPE.X_USE_SKILL] = TaskManager.gotoMainUI, [GConst.TaskConst.TASK_TYPE.DAILY_TASK_WATCH_AD_SPECIAL] = TaskManager.gotoMainShopUI, [GConst.TaskConst.TASK_TYPE.X_HERO_MAX_LV_REACH] = TaskManager.gotoMainHeroUI, + [GConst.TaskConst.TASK_TYPE.X_PASS_CHAPTER] = TaskManager.gotoMainUI, [GConst.TaskConst.TASK_TYPE.X_VIT_COST] = TaskManager.gotoMainUI, [GConst.TaskConst.TASK_TYPE.X_NEW_HERO_GOT] = TaskManager.gotoSummonUI, [GConst.TaskConst.TASK_TYPE.X_ARENA_CHALLENGE] = TaskManager.gotoArenaUI, diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index c22a6009..40b87fa5 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -476,8 +476,10 @@ end function BattleResultUI:refreshDoubleNode() if self.battleType ~= GConst.BattleConst.BATTLE_TYPE.STAGE and self.battleType ~= GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE then self.doubleNode:setActive(false) + self.continue:setActive(true) return end + self.continue:setActive(false) if self.battleType == GConst.BattleConst.BATTLE_TYPE.STAGE then if not DataManager.ChapterData:canAdDouble() then self.doubleNode:setActive(false) diff --git a/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua b/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua index a4841944..3ff4355c 100644 --- a/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua +++ b/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua @@ -71,14 +71,13 @@ function DungeonGoldCell:refresh(index) local challengeId = DataManager.DungeonDailyData.GoldData:getChallengeId() local chapterName = DataManager.DungeonDailyData.GoldData:getChapterName(chapterInfo.id) self.stageTx:setText(chapterName) - -- local curPower = DataManager.PlayerData:getSelfEntity():getShowPower(ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON) - -- local curPower = DataManager.HeroData:getShowPower() - -- local chapterPower = chapterInfo.cfg.power - -- if curPower >= chapterPower then - -- self.powerTx:setText("" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.getPowerShow(chapterPower)) .. "") - -- else - -- self.powerTx:setText("" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.getPowerShow(chapterPower)) .. "") - -- end + local curPower = DataManager.HeroData:getShowPower() + local chapterPower = chapterInfo.cfg.power + if curPower >= chapterPower then + self.powerTx:setText("" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.num2Str(chapterPower, 2)) .. "") + else + self.powerTx:setText("" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.num2Str(chapterPower, 2)) .. "") + end local rewardsCount = #self.rewardList for i = 1, rewardsCount do table.remove(self.rewardList) diff --git a/lua/app/ui/dungeon/cell/dungeon_material_cell.lua b/lua/app/ui/dungeon/cell/dungeon_material_cell.lua index de66b07c..2de4364b 100644 --- a/lua/app/ui/dungeon/cell/dungeon_material_cell.lua +++ b/lua/app/ui/dungeon/cell/dungeon_material_cell.lua @@ -72,14 +72,13 @@ function DungeonMaterialCell:refresh(index) local challengeId = DataManager.DungeonDailyData.MaterialData:getChallengeId() local chapterName = DataManager.DungeonDailyData.MaterialData:getChapterName(chapterInfo.id) self.stageTx:setText(chapterName) - -- local curPower = DataManager.PlayerData:getSelfEntity():getShowPower(ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON) - -- local curPower = DataManager.HeroData:getShowPower() - -- local chapterPower = chapterInfo.cfg.power - -- if curPower >= chapterPower then - -- self.powerTx:setText("" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.getPowerShow(chapterPower)) .. "") - -- else - -- self.powerTx:setText("" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.getPowerShow(chapterPower)) .. "") - -- end + local curPower = DataManager.HeroData:getShowPower() + local chapterPower = chapterInfo.cfg.power + if curPower >= chapterPower then + self.powerTx:setText("" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.num2Str(chapterPower, 2)) .. "") + else + self.powerTx:setText("" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.num2Str(chapterPower, 2)) .. "") + end local rewardsCount = #self.rewardList for i = 1, rewardsCount do table.remove(self.rewardList) diff --git a/lua/app/ui/gm/gm_tool_ui.lua b/lua/app/ui/gm/gm_tool_ui.lua index f3603979..dd83eb3f 100644 --- a/lua/app/ui/gm/gm_tool_ui.lua +++ b/lua/app/ui/gm/gm_tool_ui.lua @@ -95,7 +95,7 @@ function GMToolUI:onRefresh() skipTutorialCheck:setActive(LocalData:getTutorialSkip() > 0) end) - skipPopCheck:setActive(LocalData:getTutorialSkip() > 0) + skipPopCheck:setActive(LocalData:getFuncOpenPopSkip() > 0) skipPopBtn:addClickListener(function() if LocalData:getFuncOpenPopSkip() == 0 then LocalData:setFuncOpenPopSkip(1) diff --git a/lua/app/userdata/activity/act_sprint/act_sprint_data.lua b/lua/app/userdata/activity/act_sprint/act_sprint_data.lua index 69241306..8cd99b9e 100644 --- a/lua/app/userdata/activity/act_sprint/act_sprint_data.lua +++ b/lua/app/userdata/activity/act_sprint/act_sprint_data.lua @@ -158,11 +158,11 @@ function ActSprintData:hasRedPoint(ignoreExchange) end -- 兑换商店 - if not ignoreExchange then - if self:hasExchangeRp() then - return true - end - end + -- if not ignoreExchange then + -- if self:hasExchangeRp() then + -- return true + -- end + -- end if self:hasStandardRp() then return true diff --git a/lua/app/userdata/bag/item_entity.lua b/lua/app/userdata/bag/item_entity.lua index 19eeb242..2d343170 100644 --- a/lua/app/userdata/bag/item_entity.lua +++ b/lua/app/userdata/bag/item_entity.lua @@ -55,7 +55,7 @@ function ItemEntity:checkForceLockAndAddNum() -- local qlt = DataManager.HeroData:getHeroQlt(self:getId()) -- local fragmentId = DataManager.ForceData:getForceItemIdByQlt(self:getId()) if heroEntity:getLv() <= 0 then - heroEntity:setLv(1 ,true) + DataManager.HeroData:setHeroLv(self:getId(), 1) self.data.num = self.data.num - 1 -- BIReport:postForceUnlock(self:getId()) end diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua index 37b96c9f..b58c4fb8 100644 --- a/lua/app/userdata/hero/hero_data.lua +++ b/lua/app/userdata/hero/hero_data.lua @@ -147,9 +147,6 @@ function HeroData:setHeroLv(id, lv) if activeBefore then BIReport:postHeroOpt(id, BIReport.HERO_OPT_TYPE.LEVEL_UP) else - if not entity:getUnlcokChapter() then - BIReport:postHeroOpt(id, BIReport.HERO_OPT_TYPE.UNLOCK) - end BIReport:postHeroOpt(id, BIReport.HERO_OPT_TYPE.ACTIVE) end