From 6af5bad6595dd78c52ec14edcd79f5ebf683b7a8 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Wed, 22 Oct 2025 17:32:13 +0800 Subject: [PATCH] fix bug --- lua/app/common/sdk_manager.lua | 2 +- lua/app/global/global_func.lua | 3 +++ lua/app/module/hero/hero_manager.lua | 12 ++++++++++++ lua/app/module/task/task_manager.lua | 16 ++++++++++++++-- .../act_seven_day/component/task_comp.lua | 2 +- lua/app/ui/battle/battle_base_ui.lua | 2 +- lua/app/ui/battle/battle_skill_select_comp.lua | 3 ++- lua/app/ui/idle/idle_drop_ui.lua | 4 +--- lua/app/ui/summon/cell/summon_reward_cell.lua | 2 +- lua/app/ui/task/task_main_ui.lua | 3 +++ lua/app/userdata/bag/item_entity.lua | 1 + lua/app/userdata/payment/payment_data.lua | 1 + lua/app/userdata/summon/summon_data.lua | 3 ++- 13 files changed, 43 insertions(+), 11 deletions(-) diff --git a/lua/app/common/sdk_manager.lua b/lua/app/common/sdk_manager.lua index 17484f61..90ef4bc7 100644 --- a/lua/app/common/sdk_manager.lua +++ b/lua/app/common/sdk_manager.lua @@ -465,7 +465,7 @@ end function SDKManager:adRewradAd(noReport) -- 看广告 - ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.AD_WATCH_NUM) + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_WATCH_AD) if not noReport then DataManager.PlayerData:addAdCount() BIReport:postAdEvent() diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 2303ba55..9e304599 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -380,6 +380,9 @@ function GFunc.getTaskDesc(taskType, taskTarget) -- return I18N:getText("task_type", taskType, "desc", grading) -- local curScore = DataManager.ArenaData:getGradingScore(taskTarget) return I18N:getText("task_type", taskType, "desc", taskTarget) + elseif taskType == GConst.TaskConst.TASK_TYPE.X_PASS_CHAPTER then + local str = DataManager.ChapterData:getChapterNameXYMode(taskTarget) + return I18N:getText("task_type", taskType, "desc", str) elseif taskType == GConst.TaskConst.TASK_TYPE.X_DUNGEON_ARMOR then -- 防具副本显示章节和关卡 local cfg = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR):getConfig(taskTarget) diff --git a/lua/app/module/hero/hero_manager.lua b/lua/app/module/hero/hero_manager.lua index be1ca050..058242cb 100644 --- a/lua/app/module/hero/hero_manager.lua +++ b/lua/app/module/hero/hero_manager.lua @@ -176,6 +176,18 @@ function HeroManager:getSkillRogueDesc(skillId, value) return I18N:getText("skill_rogue", skillId, "desc", str) end +function HeroManager:getSkillRogueDesc2(skillId, value) + local cfg = ConfigManager:getConfig("skill_rogue")[skillId] + if not cfg then + return GConst.EMPTY_STRING + end + local str + if cfg.attr then + str = GFunc.getFinalBuffValue(cfg.attr.type, value) + end + return I18N:getText("skill_rogue", skillId, "rougedesc", str) +end + function HeroManager:getSkillRogueDescEntry(skillId, entry) local cfg = ConfigManager:getConfig("skill_rogue")[skillId] if not cfg then diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index 2b6fd159..4c0ddb43 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -450,11 +450,11 @@ function TaskManager:gotoMainShopUI() end function TaskManager:gotoMainShopGemUI() - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GEM_STORE}) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GEM_STORE}) end function TaskManager:gotoMainShopGoldUI() - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GOLD_STORE}) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GOLD_STORE}) end function TaskManager:gotoMainHeroUI() @@ -462,18 +462,30 @@ function TaskManager:gotoMainHeroUI() end function TaskManager:gotoSummonUI() + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SUMMON_OPEN) then + return + end ModuleManager.SummonManager:showSummonMainUI() end function TaskManager:gotoArenaUI() + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ARENA) then + return + end ModuleManager.ArenaManager:showArenaUI() end function TaskManager:gotoDailyChallengeUI() + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.DAILY_CHALLENGE) then + return + end ModuleManager.DailyChallengeManager:showDailyChallengeUI() end function TaskManager:gotoTalentUI() + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TALENT_OPEN) then + return + end EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE, {page = GConst.MainCityConst.BOTTOM_PAGE.COMPANY, companyIdx = 1}) end diff --git a/lua/app/ui/activity/act_seven_day/component/task_comp.lua b/lua/app/ui/activity/act_seven_day/component/task_comp.lua index b3ef470d..3dbb9fc5 100755 --- a/lua/app/ui/activity/act_seven_day/component/task_comp.lua +++ b/lua/app/ui/activity/act_seven_day/component/task_comp.lua @@ -44,7 +44,7 @@ function TaskComp:refresh(parentUI, day, period) end) else self.rewardCells[id]:hideFrameAnimation() - self.rewardCells[id]:removeClickListener() + self.rewardCells[id]:clearClickListener() end end diff --git a/lua/app/ui/battle/battle_base_ui.lua b/lua/app/ui/battle/battle_base_ui.lua index 7ebb0404..9a588cf1 100644 --- a/lua/app/ui/battle/battle_base_ui.lua +++ b/lua/app/ui/battle/battle_base_ui.lua @@ -18,7 +18,7 @@ local SIDE_DEF = GConst.BattleConst.SIDE_DEF local CacheVector2 = CS.UnityEngine.Vector2(0, 0) local DEFAULT_X = 10000 local CACHE_SKILL_POS_1 = {x = 10, y = 360} -local CACHE_SKILL_POS_2 = {x = 10, y = 420} +local CACHE_SKILL_POS_2 = {x = 10, y = 470} local MAX_LASTSIBLING_TYPE = { [8] = true, [9] = true, diff --git a/lua/app/ui/battle/battle_skill_select_comp.lua b/lua/app/ui/battle/battle_skill_select_comp.lua index d397088d..d9fbc8a7 100644 --- a/lua/app/ui/battle/battle_skill_select_comp.lua +++ b/lua/app/ui/battle/battle_skill_select_comp.lua @@ -112,7 +112,8 @@ function BattleSkillSelectComp:refreshBtns() cfgAdCount = GFunc.getConstIntValue("daily_challenge_ads_refresh_rogue_limit") end local talentCount = DataManager.TalentData:getSkillRefreshCount() - local adCount = battleController.battleData:getADRefreshSkillCount() + talentCount + cfgAdCount = cfgAdCount + talentCount + local adCount = battleController.battleData:getADRefreshSkillCount() if cfgAdCount > adCount then adBtn:setActive(true) else diff --git a/lua/app/ui/idle/idle_drop_ui.lua b/lua/app/ui/idle/idle_drop_ui.lua index e22ffb06..93294305 100644 --- a/lua/app/ui/idle/idle_drop_ui.lua +++ b/lua/app/ui/idle/idle_drop_ui.lua @@ -81,9 +81,7 @@ function IdleDropUI:onLoadRootComplete() self.adTimesTx = uiMap["idle_drop_ui.bg.ad_times_tx"] self.quickTimesTx = uiMap["idle_drop_ui.bg.quick_times_tx"] self.adBtn:addClickListener(function() - SDKManager:showFullScreenAds(BIReport.ADS_CLICK_TYPE.IDLE_QUICK_DROP, function() - ModuleManager.IdleManager:getIdleQuickRewrad(true) - end) + ModuleManager.IdleManager:getIdleQuickRewrad(true) end) self.privilegeBtn = uiMap["idle_drop_ui.bg.privilege_btn"] self.privilegeBtn:addClickListener(function() diff --git a/lua/app/ui/summon/cell/summon_reward_cell.lua b/lua/app/ui/summon/cell/summon_reward_cell.lua index d9a986ff..5163b398 100755 --- a/lua/app/ui/summon/cell/summon_reward_cell.lua +++ b/lua/app/ui/summon/cell/summon_reward_cell.lua @@ -30,7 +30,7 @@ function SummonRewardCell:refresh(reward, index, parentUI) self.bg:setSprite(GConst.ATLAS_PATH.ICON_HERO_SUMMON, "summon_card_b_" .. cfg.qlt) self.bg1:setSprite(GConst.ATLAS_PATH.UI_SUMMON, "summon_card_" .. cfg.qlt) self.txName:setText(ModuleManager.HeroManager:getHeroName(reward.item.id)) - self.txCount:setText("x" .. reward.item.count) + -- self.txCount:setText("x" .. reward.item.count) self:getBaseObject():setActive(true) self.animator:SetTrigger("t_open") self.baseObject:performWithDelayGlobal(function() diff --git a/lua/app/ui/task/task_main_ui.lua b/lua/app/ui/task/task_main_ui.lua index 381c0ae8..8a624709 100644 --- a/lua/app/ui/task/task_main_ui.lua +++ b/lua/app/ui/task/task_main_ui.lua @@ -177,6 +177,9 @@ function TaskMainUI:refreshDaily() end) elseif DataManager.DailyTaskData:isStageReceived(stageId) then self.boxBtnSpines[i]:playAnim("idle02", true, false) + item:addClickListener(function() + ModuleManager.TipsManager:showRewardsTips(DataManager.DailyTaskData:getStageReward(stageId), nil, item) + end) else self.boxBtnSpines[i]:playAnim("idle01", true, false) item:addClickListener(function() diff --git a/lua/app/userdata/bag/item_entity.lua b/lua/app/userdata/bag/item_entity.lua index b8e1bcf6..19eeb242 100644 --- a/lua/app/userdata/bag/item_entity.lua +++ b/lua/app/userdata/bag/item_entity.lua @@ -56,6 +56,7 @@ function ItemEntity:checkForceLockAndAddNum() -- local fragmentId = DataManager.ForceData:getForceItemIdByQlt(self:getId()) if heroEntity:getLv() <= 0 then heroEntity:setLv(1 ,true) + self.data.num = self.data.num - 1 -- BIReport:postForceUnlock(self:getId()) end -- 不转换万能碎片 diff --git a/lua/app/userdata/payment/payment_data.lua b/lua/app/userdata/payment/payment_data.lua index c9f6a242..fb73aea9 100755 --- a/lua/app/userdata/payment/payment_data.lua +++ b/lua/app/userdata/payment/payment_data.lua @@ -74,6 +74,7 @@ function PaymentData:addPayment(rechargeId) self.data.payAverage = self.data.payTotal / self.data.payTotalCount self.payCount[rechargeId] = (self.payCount[rechargeId] or 0) + 1 -- DataManager.PlayerData:addPayScore(cfg.score) + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_BUY_ANYONE) if EDITOR_MODE then Logger.logHighlight("消费总额：" .. tostring(self:getPayTotal())) diff --git a/lua/app/userdata/summon/summon_data.lua b/lua/app/userdata/summon/summon_data.lua index b604c82d..91673174 100644 --- a/lua/app/userdata/summon/summon_data.lua +++ b/lua/app/userdata/summon/summon_data.lua @@ -196,7 +196,8 @@ end --@region 红点 function SummonData:hasSummonCostRedPoint() - return self:hasSummonFree(1) or self:hasSummonFree(2) or self:hasSummonCost1() or self:hasSummonCost2() + -- return self:hasSummonFree(1) or self:hasSummonFree(2) or self:hasSummonCost1() or self:hasSummonCost2() + return self:hasSummonFree(1) or self:hasSummonCost1() end function SummonData:hasSummonCost1()