【主题活动】提交
parent
11543e53a0
commit
1ba38242ad
|
@ -284,7 +284,7 @@ function this.OnPageTabChange(index)
|
|||
if subViewList[index] and subViewList[index].config and subViewList[index].sub then
|
||||
--每日每周任务页签拆分用
|
||||
if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then
|
||||
CommonActPageManager.DynamicActType = tabs[index].Sort
|
||||
CommonActPageManager.DynamicActType = tabs[index].Sort - 1
|
||||
end
|
||||
subViewList[index].sub:OnShow(orginLayer)
|
||||
else
|
||||
|
@ -294,7 +294,7 @@ function this.OnPageTabChange(index)
|
|||
subViewList[index].sub = SubUIManager.Open(subViewList[index].config,this.content.transform,tabs[index],index,this)
|
||||
--每日每周任务页签拆分用
|
||||
if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then
|
||||
CommonActPageManager.DynamicActType = tabs[index].Sort
|
||||
CommonActPageManager.DynamicActType = tabs[index].Sort - 1
|
||||
end
|
||||
subViewList[index].sub:OnShow(orginLayer)
|
||||
end
|
||||
|
|
|
@ -445,12 +445,20 @@ function this.GetActivityTableDataByPageInde(pageIndex)
|
|||
local activityDatas = {}
|
||||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityGroups,"PageType",pageIndex)
|
||||
for i = 1 , #configs do
|
||||
if configs[i].ActiveType > 0 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]
|
||||
table.insert(activityGroupsData,configs[i])
|
||||
if configs[i].ActiveType > 0 then
|
||||
if not activityDic[configs[i].ActiveType] then
|
||||
if configs[i].ShopData and configs[i].ShopData[1][1] == -9999 then
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
|
||||
if id and id > 0 and ActivityGiftManager.IsQualifiled(ActivityTypeDef.DynamicAct) and GlobalActivity[id].ShowArt == configs[i].ActId then
|
||||
activityDic[configs[i].ActiveType] = configs[i]
|
||||
table.insert(activityGroupsData,configs[i])
|
||||
end
|
||||
else
|
||||
activityDic[configs[i].ActiveType] = configs[i]
|
||||
table.insert(activityGroupsData,configs[i])
|
||||
end
|
||||
end
|
||||
elseif configs[i].FunType > 0 then
|
||||
elseif configs[i].FunType > 0 then
|
||||
if not activityDic[configs[i].FunType] then
|
||||
functionDic[configs[i].FunType] = configs[i]
|
||||
table.insert(activityGroupsData,configs[i])
|
||||
|
|
|
@ -224,6 +224,7 @@ end
|
|||
function this.InitTaskData(curData,taskType,configName)
|
||||
local allListData = ConfigManager.GetAllConfigsDataByKey(configName, "ActivityId", curData.activityId)
|
||||
local allMissionData = TaskManager.GetTypeTaskList(taskType)
|
||||
-- LogGreen("this.DynamicActType:"..this.DynamicActType)
|
||||
for i=1,#allListData do
|
||||
for j=1,#allMissionData do
|
||||
-- LogGreen("this.DynamicActType:"..this.DynamicActType)
|
||||
|
|
Loading…
Reference in New Issue