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

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

Browse Source
This commit is contained in:
xiekaidong 2023-05-19 18:00:05 +08:00
commit 58d366ba9d
4 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,8 +32,9 @@ function ChapterManager:startFight()
if cost then if cost then
vitCostNum = GFunc.getRewardNum(cost) vitCostNum = GFunc.getRewardNum(cost)
end end
if vitCostNum > DataManager.BagData.ItemData:getVit() then if vitCostNum > DataManager.BagData.ItemData:getVit() then -- 体力不足
GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT) GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT)
ModuleManager.CommerceManager:showBuyVitUI()
return return
end end
local parmas = { local parmas = {

3
lua/app/module/idle/idle_manager.lua
View File

@ -45,6 +45,9 @@ function IdleManager:getIdleQuickRewrad(isAd)
local costId = GFunc.getRewardId(cost) local costId = GFunc.getRewardId(cost)
local costNum = GFunc.getRewardNum(cost) local costNum = GFunc.getRewardNum(cost)
if not GFunc.checkCost(costId, costNum, true) then if not GFunc.checkCost(costId, costNum, true) then
if costId == GConst.ItemConst.ITEM_ID_VIT then
ModuleManager.CommerceManager:showBuyVitUI()
end
return return
end end
local args = { local args = {

14
lua/app/ui/task/task_main_ui.lua
View File

@ -137,7 +137,12 @@ function TaskMainUI:initDailyTaskAdCell()
if DataManager.DailyTaskData:getDailyTaskCanClaimTask(taskId) then if DataManager.DailyTaskData:getDailyTaskCanClaimTask(taskId) then
ModuleManager.TaskManager:claimDailyTask(taskId) ModuleManager.TaskManager:claimDailyTask(taskId)
else 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
end) end)
self.dailyTaskAdCellBoxInfo = self.uiMap["task_main_ui.bg.daily.task_ad_cell.box.info"] 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 if DataManager.DailyTaskData:getDailyTaskCanClaimTask(taskId) then
ModuleManager.TaskManager:claimDailyTask(taskId) ModuleManager.TaskManager:claimDailyTask(taskId)
else 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
end) end)
self.dailyTaskFinalCellBoxInfo = self.uiMap["task_main_ui.bg.daily.task_final_cell.box.info"] self.dailyTaskFinalCellBoxInfo = self.uiMap["task_main_ui.bg.daily.task_final_cell.box.info"]

18
lua/app/userdata/task/daily_task_data.lua
View File

@ -145,10 +145,28 @@ function DailyTaskData:getDailyResetTime()
return 86400 - Time:getServerTime() % 86400 return 86400 - Time:getServerTime() % 86400
end 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() function DailyTaskData:getDailyTaskAdId()
return DAILY_TASK_AD_ID return DAILY_TASK_AD_ID
end 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() function DailyTaskData:getDailyTaskFinalId()
return DAILY_TASK_FINAL_ID return DAILY_TASK_FINAL_ID
end end