diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 4e0e0c6690..67580a1ac6 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -446,7 +446,7 @@ function this.GetActivityTableDataByPageInde(pageIndex) 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] 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]) end @@ -457,7 +457,6 @@ function this.GetActivityTableDataByPageInde(pageIndex) end elseif configs[i].ShopData and configs[i].ShopData[1][1] == -9999 then 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 table.insert(activityGroupsData,configs[i]) end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 5cac5fbce0..dd6e5ce6fd 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -226,7 +226,8 @@ function this.InitTaskData(curData,taskType,configName) local allMissionData = TaskManager.GetTypeTaskList(taskType) for i=1,#allListData 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 = {} data.missionId = allMissionData[j].missionId data.taskType = taskType