From 9d398707e0de3876d815b61c65ec08ecda85051a Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 19 May 2023 16:51:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=9D=E7=AE=B1tips?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/task/task_main_ui.lua | 14 ++++++++++++-- lua/app/userdata/task/daily_task_data.lua | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) 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 From af59a3f9a261876ceb78afc0f3d5b39b3571a4e4 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 19 May 2023 17:05:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=93=E5=8A=9B=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=BC=B9=E5=87=BA=E6=9D=A5=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E4=BD=93=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/chapter/chapter_manager.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index 831a3aae..82dadaa6 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -32,8 +32,9 @@ function ChapterManager:startFight() if cost then vitCostNum = GFunc.getRewardNum(cost) end - if vitCostNum > DataManager.BagData.ItemData:getVit() then + if vitCostNum > DataManager.BagData.ItemData:getVit() then -- 体力不足 GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT) + ModuleManager.CommerceManager:showBuyVitUI() return end local parmas = { From 502f35bf2e1c22f6bc87c1f415d564412943e9cf Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 19 May 2023 17:08:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=93=E5=8A=9B=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E5=BE=97=E6=97=B6=E5=80=99=E5=BC=B9=E5=87=BA=E6=9D=A5=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E4=BD=93=E5=8A=9B=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/idle/idle_manager.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/app/module/idle/idle_manager.lua b/lua/app/module/idle/idle_manager.lua index 87899313..5d7723b0 100644 --- a/lua/app/module/idle/idle_manager.lua +++ b/lua/app/module/idle/idle_manager.lua @@ -45,6 +45,9 @@ function IdleManager:getIdleQuickRewrad(isAd) local costId = GFunc.getRewardId(cost) local costNum = GFunc.getRewardNum(cost) if not GFunc.checkCost(costId, costNum, true) then + if costId == GConst.ItemConst.ITEM_ID_VIT then + ModuleManager.CommerceManager:showBuyVitUI() + end return end local args = {