【主题活动】提交

dev_chengFeng
ZhangBiao 2021-07-26 12:29:13 +08:00
parent 11543e53a0
commit 1ba38242ad
3 changed files with 16 additions and 7 deletions

View File

@ -284,7 +284,7 @@ function this.OnPageTabChange(index)
if subViewList[index] and subViewList[index].config and subViewList[index].sub then if subViewList[index] and subViewList[index].config and subViewList[index].sub then
--每日每周任务页签拆分用 --每日每周任务页签拆分用
if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 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 end
subViewList[index].sub:OnShow(orginLayer) subViewList[index].sub:OnShow(orginLayer)
else else
@ -294,7 +294,7 @@ function this.OnPageTabChange(index)
subViewList[index].sub = SubUIManager.Open(subViewList[index].config,this.content.transform,tabs[index],index,this) 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 if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then
CommonActPageManager.DynamicActType = tabs[index].Sort CommonActPageManager.DynamicActType = tabs[index].Sort - 1
end end
subViewList[index].sub:OnShow(orginLayer) subViewList[index].sub:OnShow(orginLayer)
end end

View File

@ -445,12 +445,20 @@ function this.GetActivityTableDataByPageInde(pageIndex)
local activityDatas = {} local activityDatas = {}
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] and (not configs[i].ShopData or configs[i].ShopData[1][1] ~= -9999) then if not activityDic[configs[i].ActiveType] then
activityDic[configs[i].ActiveType] = configs[i] if configs[i].ShopData and configs[i].ShopData[1][1] == -9999 then
table.insert(activityGroupsData,configs[i]) 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 end
elseif configs[i].FunType > 0 then elseif configs[i].FunType > 0 then
if not activityDic[configs[i].FunType] then if not activityDic[configs[i].FunType] then
functionDic[configs[i].FunType] = configs[i] functionDic[configs[i].FunType] = configs[i]
table.insert(activityGroupsData,configs[i]) table.insert(activityGroupsData,configs[i])

View File

@ -224,6 +224,7 @@ end
function this.InitTaskData(curData,taskType,configName) function this.InitTaskData(curData,taskType,configName)
local allListData = ConfigManager.GetAllConfigsDataByKey(configName, "ActivityId", curData.activityId) local allListData = ConfigManager.GetAllConfigsDataByKey(configName, "ActivityId", curData.activityId)
local allMissionData = TaskManager.GetTypeTaskList(taskType) local allMissionData = TaskManager.GetTypeTaskList(taskType)
-- LogGreen("this.DynamicActType:"..this.DynamicActType)
for i=1,#allListData do for i=1,#allListData do
for j=1,#allMissionData do for j=1,#allMissionData do
-- LogGreen("this.DynamicActType:"..this.DynamicActType) -- LogGreen("this.DynamicActType:"..this.DynamicActType)