Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
b9cc475e6d
|
@ -768,4 +768,33 @@ function this.CheckPoZhenZhuXianTaskRed()
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
function this.InitLeiJiChongZhiData()
|
||||||
|
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_recharge)
|
||||||
|
if (not id) or id == 0 then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.pozhenzhuxian_recharge) then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
this.allData = {}
|
||||||
|
local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", id)
|
||||||
|
LogBlue("#allListData:"..#allListData)
|
||||||
|
local allMissionData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.pozhenzhuxian_recharge).mission
|
||||||
|
LogBlue("#allMissionData"..#allMissionData)
|
||||||
|
for i=1,#allListData do
|
||||||
|
for j=1,#allMissionData do
|
||||||
|
if allListData[i].Id == allMissionData[j].missionId then
|
||||||
|
local data = {}
|
||||||
|
data.id = allMissionData[j].missionId
|
||||||
|
data.progress = allMissionData[j].progress
|
||||||
|
data.state = allMissionData[j].state
|
||||||
|
data.value = allListData[i].Values[1][1]
|
||||||
|
data.reward = allListData[i].Reward
|
||||||
|
data.jump = allListData[i].Jump[1]
|
||||||
|
table.insert(this.allData,data)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return this.allData
|
||||||
|
end
|
||||||
return this
|
return this
|
Loading…
Reference in New Issue