diff --git a/lua/app/module/battle/battle_manager.lua b/lua/app/module/battle/battle_manager.lua index 0443a30b..a7d5e0cb 100644 --- a/lua/app/module/battle/battle_manager.lua +++ b/lua/app/module/battle/battle_manager.lua @@ -79,7 +79,7 @@ end function BattleManager:rspSkillRefresh(result) if result.err_code == GConst.ERROR_STR.SUCCESS then - if self.battleController then + if self.battleController and result.reqData then self.battleController.battleData:addRefreshSkillCount(result.reqData.ad) end EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.SKILL_REFRESH_SUCC) diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index 918e786f..d90a7dd7 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -51,6 +51,10 @@ end function ChapterManager:startFightFinish(result) if result.err_code == GConst.ERROR_STR.SUCCESS then + if not result.reqData then + return + end + local params = {} if result.reqData.isTrail then params.atkFormation = DataManager.ChapterData:getCacheTrailAtkInfo() @@ -95,6 +99,10 @@ end function ChapterManager:endFightFinish(result) if result.err_code == GConst.ERROR_STR.SUCCESS then + if not result.reqData then + return + end + local reqData = result.reqData local maxChapter = DataManager.ChapterData:getNewChapterId() local rewards = {} diff --git a/lua/app/module/commerce/commerce_manager.lua b/lua/app/module/commerce/commerce_manager.lua index 8e47aba2..b8772143 100644 --- a/lua/app/module/commerce/commerce_manager.lua +++ b/lua/app/module/commerce/commerce_manager.lua @@ -61,7 +61,7 @@ function CommerceManager:onBuyArenaTicketFinish(data) return end - if data.reqData.ad then + if data.reqData and data.reqData.ad then -- 激励视频 DataManager.PlayerData:addArenaTicketAdBuyCount() else diff --git a/lua/app/module/daily_challenge/daily_challenge_manager.lua b/lua/app/module/daily_challenge/daily_challenge_manager.lua index d0d6a064..c196ea15 100644 --- a/lua/app/module/daily_challenge/daily_challenge_manager.lua +++ b/lua/app/module/daily_challenge/daily_challenge_manager.lua @@ -91,6 +91,9 @@ end function DailyChallengeManager:endChallengeFinish(result) if result.err_code == GConst.ERROR_STR.SUCCESS then + if not result.reqData then + return + end local reqData = result.reqData local rewards = result.rewards ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE, rewards, reqData.combatReport) diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index c9b6d3d3..bcd2f206 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -183,7 +183,7 @@ end function DungeonManager:respEndChallengeShards(result) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.DungeonData:initDungeonShards(result.shards_challenge) - ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, result.rewards, result.reqData.combatReport) + ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, result.rewards, result.reqData and result.reqData.combatReport or {}) end end diff --git a/lua/app/module/formation/formation_manager.lua b/lua/app/module/formation/formation_manager.lua index a8783d8d..0916eb3c 100644 --- a/lua/app/module/formation/formation_manager.lua +++ b/lua/app/module/formation/formation_manager.lua @@ -21,7 +21,9 @@ function FormationManager:upHeroToStageFormationFinish(result) data.formation, data.formation_lv, data.formation_atk, data.formation_hp = DataManager.FormationData:getStageFormationBIStr() data.formation_lv = nil CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) - BIReport:postHeroOpt(result.reqData.id, BIReport.HERO_OPT_TYPE.FORMATION) + if result.reqData then + BIReport:postHeroOpt(result.reqData.id, BIReport.HERO_OPT_TYPE.FORMATION) + end end end @@ -37,7 +39,9 @@ end function FormationManager:rspArenaFormation(result) if result.err_code == GConst.ERROR_STR.SUCCESS then - DataManager.FormationData:initArena(result.reqData.attack_heroIds, result.reqData.defend_heroIds) + if result.reqData then + DataManager.FormationData:initArena(result.reqData.attack_heroIds, result.reqData.defend_heroIds) + end end end diff --git a/lua/app/module/tutorial/tutorial_manager.lua b/lua/app/module/tutorial/tutorial_manager.lua index bbeba189..a0857104 100644 --- a/lua/app/module/tutorial/tutorial_manager.lua +++ b/lua/app/module/tutorial/tutorial_manager.lua @@ -28,7 +28,7 @@ end function TutorialManager:sendTutorialIdFinish(result) if result.err_code == GConst.ERROR_STR.SUCCESS then - if result.reqData.id then + if result.reqData and result.reqData.id then BIReport:postTutorialStep(result.reqData.id) end diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index d2aab353..ccefdfe2 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -332,7 +332,9 @@ function BattleResultUI:refreshArenaGradingSpine(gradingId, isUp) self.arenaSpine:setLocalScale(0.8, 0.8, 1) self.arenaSpine:setSkin(DataManager.ArenaData:getGradingNumName(gradingId)) self.arenaSpine:playAnimComplete("born", false, false, function() - self.arenaSpine:playAnim("idle", true, false) + if self.arenaSpine then + self.arenaSpine:playAnim("idle", true, false) + end end) end) if isUp then