Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
gaoxin 2020-08-26 20:20:53 +08:00
commit 8b0c138f68
1 changed files with 18 additions and 8 deletions

View File

@ -146,7 +146,13 @@ end
function this.GetAllRewardData()
local temp ={}
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
return temp
end
local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
if not this.rewardData[activityId] then
return temp
end
for i, v in pairs(this.rewardData[activityId]) do
if i ~= 0 then
table.insert(temp,v)
@ -180,14 +186,18 @@ function this.GetQinglongTaskData(_curtype)
local curtype = _curtype + 1
local temp = TaskManager.GetTypeTaskList(TaskTypeDef.TreasureOfSomeBody)
local task = {}
local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
for k,v in ipairs(temp) do
if taskData[activityId][curtype][v.missionId] then
taskData[activityId][curtype][v.missionId].progress = v.progress
taskData[activityId][curtype][v.missionId].state = v.state
table.insert(task, taskData[activityId][curtype][v.missionId])
end
end
if ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
for k,v in ipairs(temp) do
if taskData[activityId] and taskData[activityId][curtype] and taskData[activityId][curtype][v.missionId] then
if taskData[activityId][curtype][v.missionId] then
taskData[activityId][curtype][v.missionId].progress = v.progress
taskData[activityId][curtype][v.missionId].state = v.state
table.insert(task, taskData[activityId][curtype][v.missionId])
end
end
end
end
-- LogBlue("每周任务个数:"..#task)
return task
end