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

修复任务没开启前会显示任务完成得toast

Browse Source
This commit is contained in:
chenxi 2023-05-29 12:05:26 +08:00
parent 6c4e4da30a
commit 85cdf222c6
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/common/event_manager.lua
View File

@ -23,9 +23,9 @@ EventManager.CUSTOM_EVENT = {
SHOW_ELIMINATION_TUTORAIL = "SHOW_ELIMINATION_TUTORAIL", SHOW_ELIMINATION_TUTORAIL = "SHOW_ELIMINATION_TUTORAIL",
BOARD_FILL_OVER = "BOARD_FILL_OVER", BOARD_FILL_OVER = "BOARD_FILL_OVER",
LOGIN_REQ_SUCCESS = "LOGIN_REQ_SUCCESS", LOGIN_REQ_SUCCESS = "LOGIN_REQ_SUCCESS",
DAILY_TASK_ADD_PROGRESS = "DAILY_TASK_ADD_PROGRESS", DAILY_TASK_COMPLETE = "DAILY_TASK_COMPLETE", -- 每日任务完成
BOSS_ENTER_ANI_OVER = "BOSS_ENTER_ANI_OVER", BOSS_ENTER_ANI_OVER = "BOSS_ENTER_ANI_OVER",
TIME_TRIGGERED_NEW_EMAIL = "TIME_TRIGGERED_NEW_EMAIL", -- 邮件到时间请求是否有新邮件 TIME_TRIGGERED_NEW_EMAIL = "TIME_TRIGGERED_NEW_EMAIL", -- 邮件到时间请求是否有新邮件
SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC", SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC",
-- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN",
-- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER"

6
lua/app/module/task/task_manager.lua
View File

@ -2,8 +2,10 @@ local TaskManager = class("TaskManager", BaseModule)
local BATTLE_TASK_FIELD = GConst.BattleConst.BATTLE_TASK_FIELD local BATTLE_TASK_FIELD = GConst.BattleConst.BATTLE_TASK_FIELD
function TaskManager:init() function TaskManager:init()
self:addEventListener(EventManager.CUSTOM_EVENT.DAILY_TASK_ADD_PROGRESS, function(id, taskId, from, to) self:addEventListener(EventManager.CUSTOM_EVENT.DAILY_TASK_COMPLETE, function(id, taskId, from, to)
ModuleManager.TaskToastManager:showToast(id, taskId, from, to) if DataManager.DailyTaskData:getIsOpen() then
ModuleManager.TaskToastManager:showToast(id, taskId, from, to)
end
end) end)
self:addEventListener(EventManager.CUSTOM_EVENT.UI_SHOW_COMPLETE, function() self:addEventListener(EventManager.CUSTOM_EVENT.UI_SHOW_COMPLETE, function()
ModuleManager.TaskToastManager:checkOnOpenUI() ModuleManager.TaskToastManager:checkOnOpenUI()

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

@ -321,7 +321,7 @@ function DailyTaskData:addTaskProgress(task, taskType, count)
local can = self:getIfCanClaimTask(task) local can = self:getIfCanClaimTask(task)
task.progress = task.progress + count task.progress = task.progress + count
if not can and self:getIfCanClaimTask(task) then if not can and self:getIfCanClaimTask(task) then
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DAILY_TASK_ADD_PROGRESS, task.id, task.taskId, currProgress, task.needProgress) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DAILY_TASK_COMPLETE, task.id, task.taskId, currProgress, task.needProgress)
if task.type == 1 and task.reset == 1 and taskType ~= GConst.TaskConst.TASK_TYPE.COMPLETED_DALY_TASK then if task.type == 1 and task.reset == 1 and taskType ~= GConst.TaskConst.TASK_TYPE.COMPLETED_DALY_TASK then
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.COMPLETED_DALY_TASK) ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.COMPLETED_DALY_TASK)
end end