puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_hero' into dev_hero_2

Browse Source
This commit is contained in:
puxuan 2025-10-10 15:20:02 +08:00
commit 691d3f20bc
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lua/app/module/chapter/chapter_manager.lua
View File

@ -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)
@ -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