活动修改提交
parent
7a9100dfec
commit
06dfb74d33
|
@ -446,7 +446,7 @@ function this.GetActivityTableDataByPageInde(pageIndex)
|
||||||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityGroups,"PageType",pageIndex)
|
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityGroups,"PageType",pageIndex)
|
||||||
for i = 1 , #configs do
|
for i = 1 , #configs do
|
||||||
if configs[i].ActiveType > 0 then
|
if configs[i].ActiveType > 0 then
|
||||||
if not activityDic[configs[i].ActiveType] then
|
if not activityDic[configs[i].ActiveType] and (not configs[i].ShopData or configs[i].ShopData[1][1] ~= -9999) then
|
||||||
activityDic[configs[i].ActiveType] = configs[i]
|
activityDic[configs[i].ActiveType] = configs[i]
|
||||||
table.insert(activityGroupsData,configs[i])
|
table.insert(activityGroupsData,configs[i])
|
||||||
end
|
end
|
||||||
|
@ -457,7 +457,6 @@ function this.GetActivityTableDataByPageInde(pageIndex)
|
||||||
end
|
end
|
||||||
elseif configs[i].ShopData and configs[i].ShopData[1][1] == -9999 then
|
elseif configs[i].ShopData and configs[i].ShopData[1][1] == -9999 then
|
||||||
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
|
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
|
||||||
-- Log(GlobalActConfig[id].ShowArt.." "..tabs[index].ActId)
|
|
||||||
if id and id > 0 and ActivityGiftManager.IsQualifiled(ActivityTypeDef.DynamicAct) and GlobalActivity[id].ShowArt == configs[i].ActId then
|
if id and id > 0 and ActivityGiftManager.IsQualifiled(ActivityTypeDef.DynamicAct) and GlobalActivity[id].ShowArt == configs[i].ActId then
|
||||||
table.insert(activityGroupsData,configs[i])
|
table.insert(activityGroupsData,configs[i])
|
||||||
end
|
end
|
||||||
|
|
|
@ -226,7 +226,8 @@ function this.InitTaskData(curData,taskType,configName)
|
||||||
local allMissionData = TaskManager.GetTypeTaskList(taskType)
|
local allMissionData = TaskManager.GetTypeTaskList(taskType)
|
||||||
for i=1,#allListData do
|
for i=1,#allListData do
|
||||||
for j=1,#allMissionData do
|
for j=1,#allMissionData do
|
||||||
if allListData[i].Id == allMissionData[j].missionId and (allListData[i].Type == this.DynamicActType or this.DynamicActType == 0 ) then
|
LogGreen("this.DynamicActType:"..this.DynamicActType)
|
||||||
|
if allListData[i].Id == allMissionData[j].missionId and (this.DynamicActType == 0 or allListData[i].Type == this.DynamicActType) then
|
||||||
local data = {}
|
local data = {}
|
||||||
data.missionId = allMissionData[j].missionId
|
data.missionId = allMissionData[j].missionId
|
||||||
data.taskType = taskType
|
data.taskType = taskType
|
||||||
|
|
Loading…
Reference in New Issue