From 1ba38242adc09dc20c82d25e573e0d7da0a23a98 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 26 Jul 2021 12:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivity/ActivityMainPanel.lua | 4 ++-- .../DynamicActivity/DynamicActivityManager.lua | 18 +++++++++++++----- .../NewActivity/CommonActPageManager.lua | 1 + 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 2e646ca488..e3427273a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 67580a1ac6..0c98c6fcf5 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -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]) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index c70a33962b..53c479840e 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -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)