diff --git a/lua/app/ui/task/task_main_ui.lua b/lua/app/ui/task/task_main_ui.lua index 3a9f4613..b8593ab5 100644 --- a/lua/app/ui/task/task_main_ui.lua +++ b/lua/app/ui/task/task_main_ui.lua @@ -137,7 +137,12 @@ function TaskMainUI:initDailyTaskAdCell() if DataManager.DailyTaskData:getDailyTaskCanClaimTask(taskId) then ModuleManager.TaskManager:claimDailyTask(taskId) else - ModuleManager.ShopManager:showBoxHeroUI() + local reward = DataManager.DailyTaskData:getDailyTaskAdReward() + if reward and reward[1] then + local rewardId = GFunc.getRewardId(reward[1]) + local rewardType = GFunc.getRewardType(reward[1]) + ModuleManager.TipsManager:showRewardTips(rewardId, rewardType, self.dailyTaskAdCellBox) + end end end) self.dailyTaskAdCellBoxInfo = self.uiMap["task_main_ui.bg.daily.task_ad_cell.box.info"] @@ -153,7 +158,12 @@ function TaskMainUI:initDailyTaskFinalCell() if DataManager.DailyTaskData:getDailyTaskCanClaimTask(taskId) then ModuleManager.TaskManager:claimDailyTask(taskId) else - ModuleManager.ShopManager:showBoxHeroUI() + local reward = DataManager.DailyTaskData:getDailyTaskFinalReward() + if reward and reward[1] then + local rewardId = GFunc.getRewardId(reward[1]) + local rewardType = GFunc.getRewardType(reward[1]) + ModuleManager.TipsManager:showRewardTips(rewardId, rewardType, self.dailyTaskFinalCellBox) + end end end) self.dailyTaskFinalCellBoxInfo = self.uiMap["task_main_ui.bg.daily.task_final_cell.box.info"] diff --git a/lua/app/userdata/task/daily_task_data.lua b/lua/app/userdata/task/daily_task_data.lua index 53d3907a..dea2de24 100644 --- a/lua/app/userdata/task/daily_task_data.lua +++ b/lua/app/userdata/task/daily_task_data.lua @@ -145,10 +145,28 @@ function DailyTaskData:getDailyResetTime() return 86400 - Time:getServerTime() % 86400 end +function DailyTaskData:getDailyTaskAdReward() + local task = self.dailyTasks[DAILY_TASK_AD_ID] + if task == nil then + return nil + end + local cfg = self:getTaskCfg() + return cfg[task.taskId].reward +end + function DailyTaskData:getDailyTaskAdId() return DAILY_TASK_AD_ID end +function DailyTaskData:getDailyTaskFinalReward() + local task = self.dailyTasks[DAILY_TASK_FINAL_ID] + if task == nil then + return nil + end + local cfg = self:getTaskCfg() + return cfg[task.taskId].reward +end + function DailyTaskData:getDailyTaskFinalId() return DAILY_TASK_FINAL_ID end