diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index 048cbbc1..ec539378 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -54,7 +54,11 @@ function ChapterManager:endFight(id, combatReport) DataManager.ChapterData:goNextChapter() end GFunc.addRewards(result.rewards, BIReport.ITEM_GET_TYPE.FIGHT_END) - ModuleManager.BattleManager:showBattleResultUI(result.rewards, combatReport) + local newRewards = {} + if result.rewards then + GFunc.mergeRewards2(result.rewards, newRewards) + end + ModuleManager.BattleManager:showBattleResultUI(newRewards, combatReport) DataManager.ChapterData:init(result.chapterData, true) DataManager.ChapterData:setDirty() end diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index 7559d85b..e3f1614b 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -97,6 +97,7 @@ function HeroCell:setGray(isGray) if self.isGray == isGray then return end + self.isGray = isGray self.icon:setImageGray(isGray) self.matchImg:setImageGray(isGray) end