Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
8b0c138f68
|
@ -146,7 +146,13 @@ end
|
||||||
|
|
||||||
function this.GetAllRewardData()
|
function this.GetAllRewardData()
|
||||||
local temp ={}
|
local temp ={}
|
||||||
|
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||||
|
return temp
|
||||||
|
end
|
||||||
local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
|
local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
|
||||||
|
if not this.rewardData[activityId] then
|
||||||
|
return temp
|
||||||
|
end
|
||||||
for i, v in pairs(this.rewardData[activityId]) do
|
for i, v in pairs(this.rewardData[activityId]) do
|
||||||
if i ~= 0 then
|
if i ~= 0 then
|
||||||
table.insert(temp,v)
|
table.insert(temp,v)
|
||||||
|
@ -180,12 +186,16 @@ function this.GetQinglongTaskData(_curtype)
|
||||||
local curtype = _curtype + 1
|
local curtype = _curtype + 1
|
||||||
local temp = TaskManager.GetTypeTaskList(TaskTypeDef.TreasureOfSomeBody)
|
local temp = TaskManager.GetTypeTaskList(TaskTypeDef.TreasureOfSomeBody)
|
||||||
local task = {}
|
local task = {}
|
||||||
local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
|
if ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||||
for k,v in ipairs(temp) do
|
local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
|
||||||
if taskData[activityId][curtype][v.missionId] then
|
for k,v in ipairs(temp) do
|
||||||
taskData[activityId][curtype][v.missionId].progress = v.progress
|
if taskData[activityId] and taskData[activityId][curtype] and taskData[activityId][curtype][v.missionId] then
|
||||||
taskData[activityId][curtype][v.missionId].state = v.state
|
if taskData[activityId][curtype][v.missionId] then
|
||||||
table.insert(task, taskData[activityId][curtype][v.missionId])
|
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
|
||||||
end
|
end
|
||||||
-- LogBlue("每周任务个数:"..#task)
|
-- LogBlue("每周任务个数:"..#task)
|
||||||
|
|
Loading…
Reference in New Issue