From 838473cdcb27a87ac744a950d81033782a5682ac Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Thu, 9 Oct 2025 17:02:59 +0800 Subject: [PATCH 1/3] . --- lua/app/ui/idle/idle_drop_ui.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/lua/app/ui/idle/idle_drop_ui.lua b/lua/app/ui/idle/idle_drop_ui.lua index 0cd88a1b..01a71b64 100644 --- a/lua/app/ui/idle/idle_drop_ui.lua +++ b/lua/app/ui/idle/idle_drop_ui.lua @@ -91,9 +91,6 @@ function IdleDropUI:onLoadRootComplete() uiMap["idle_drop_ui.bg.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC)) uiMap["idle_drop_ui.bg.bg1.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_3)) uiMap["idle_drop_ui.bg.bg1.desc_tx_1"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_3)) - uiMap["idle_drop_ui.bg.bg1"]:addClickListener(function() - self:closeUI() - end) self.fightRoot = self.uiMap["idle_drop_ui.bg.fight_root"] From acc06f613a459d901b28bd5b4d3c61f0d746d441 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Thu, 9 Oct 2025 19:57:12 +0800 Subject: [PATCH 2/3] fix bug --- lua/app/module/chapter/chapter_manager.lua | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index 0fe7af59..4df36fd2 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -158,23 +158,23 @@ function ChapterManager:endFightFinish(result) -- 试玩 local fightChapterId = result.reqData.chapter_id or 0 - if not reqData.win and DataManager.ShopData:getIntroductGiftTriggerTime() > 0 then -- 入门礼包触发过后, 触发试玩 - if fightChapterId >= GConst.HeroConst.TRIAL_HERO_MIN_CHAPTER and fightChapterId <= GConst.HeroConst.TRIAL_HERO_MAX_CHAPTER then - DataManager.ChapterData:cacheTrailHeroIdAndChapterId(GConst.HeroConst.TRIAL_HERO_ID, fightChapterId) - else - DataManager.ChapterData:cacheTrailHeroIdAndChapterId() - end - else - DataManager.ChapterData:cacheTrailHeroIdAndChapterId() - end + -- if not reqData.win and DataManager.ShopData:getIntroductGiftTriggerTime() > 0 then -- 入门礼包触发过后, 触发试玩 + -- if fightChapterId >= GConst.HeroConst.TRIAL_HERO_MIN_CHAPTER and fightChapterId <= GConst.HeroConst.TRIAL_HERO_MAX_CHAPTER then + -- DataManager.ChapterData:cacheTrailHeroIdAndChapterId(GConst.HeroConst.TRIAL_HERO_ID, fightChapterId) + -- else + -- DataManager.ChapterData:cacheTrailHeroIdAndChapterId() + -- end + -- else + -- DataManager.ChapterData:cacheTrailHeroIdAndChapterId() + -- end -- 第二章战斗结算,触发成长礼包 - if result.reqData.chapter_id == GConst.ShopConst.INTRODUCTORY_GIFT_TRIGGER_CHAPTER_ID then - DataManager.ShopData:onTriggerIntroductGift() - end + -- if result.reqData.chapter_id == GConst.ShopConst.INTRODUCTORY_GIFT_TRIGGER_CHAPTER_ID then + -- DataManager.ShopData:onTriggerIntroductGift() + -- end if not reqData.win then - DataManager.ShopData:markPopLastChapterActGift() + -- DataManager.ShopData:markPopLastChapterActGift() if DataManager.ChapterData:getChapterFightCount(fightChapterId) == 1 then -- 首次失败上报 BIReport:postFirstDayGradeFailEvent(fightChapterId) end From 578124257e87322c9c73480af094abc7f647363e Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Fri, 10 Oct 2025 15:13:55 +0800 Subject: [PATCH 3/3] . --- lua/app/module/chapter/chapter_manager.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index 4df36fd2..47d9f05b 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -58,7 +58,7 @@ function ChapterManager:startFightFinish(result) local params = {} if result.reqData.isTrail then params.atkFormation = DataManager.ChapterData:getCacheTrailAtkInfo() - DataManager.ShopData:checkPopIntroductGift() -- 标记可弹窗 + -- DataManager.ShopData:checkPopIntroductGift() -- 标记可弹窗 end ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.STAGE, params) @@ -136,9 +136,9 @@ function ChapterManager:endFightFinish(result) data.max_chapter = DataManager.ChapterData:getMaxChapterId() CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) -- 标记可弹出新手礼包 - if maxChapter == 1 then - DataManager.ShopData:markPopUpGiftForBeginnerGift() - end + -- if maxChapter == 1 then + -- DataManager.ShopData:markPopUpGiftForBeginnerGift() + -- end -- 新章节通关，尝试解锁新功能 DataManager:tryOpenModules() -- 更新每日挑战数据 @@ -148,7 +148,7 @@ function ChapterManager:endFightFinish(result) -- 更新副本活动 DataManager.DungeonData:setDirty() -- 章节通关 标记可弹出章节礼包 - DataManager.ShopData:markPopUpGiftForActChapterStore(maxChapter) + -- DataManager.ShopData:markPopUpGiftForActChapterStore(maxChapter) ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_PASS_CHAPTER) -- 章节通关 检查是否要弹出功能解锁界面 DataManager.PlayerData:checkIfCanShowModuleUnlock(maxChapter)