From b7d7b3270aa5f9bb6f7aafb24eae1c25ca85fb5f Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 22 Jul 2021 10:36:35 +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=E5=88=86=E9=A1=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Recruit/RecruitPanelNew.prefab | 6 +++--- .../DynamicActivity/ActivityMainPanel.lua | 10 +++++++++- .../~Lua/Modules/NewActivity/CommonActPage.lua | 16 ++++++++++------ .../Modules/NewActivity/CommonActPageManager.lua | 3 ++- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab index d7584eeb8b..9e0b81b55f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab @@ -934,7 +934,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1189879797113255339} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -11256,7 +11256,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2671413894708845251} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -21578,7 +21578,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3915160258044306129} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index c063bed004..694864d937 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -272,6 +272,10 @@ function this.OnPageTabChange(index) subViewList[_CurPageIndex].sub:OnClose() end if subViewList[index] and subViewList[index].config and subViewList[index].sub then + --每日每周任务页签拆分用 + if tabs[index].ShopData[1][1] == -9999 then + CommonActPageManager.DynamicActType = tabs[index].ActId + end subViewList[index].sub:OnShow(orginLayer) else subViewList[index] = {} @@ -279,8 +283,12 @@ function this.OnPageTabChange(index) if tabs[index].UIName then subViewList[index].config = SubUIConfig[tabs[index].UIName[1]] subViewList[index].sub = SubUIManager.Open(subViewList[index].config,this.content.transform,tabs[index],index,this) + --每日每周任务页签拆分用 + if tabs[index].ShopData[1][1] == -9999 then + CommonActPageManager.DynamicActType = tabs[index].ActId + end subViewList[index].sub:OnShow(orginLayer) - end + end end if tabs[index].UpView and #tabs[index].UpView > 0 then this.upView:OnOpen({showType = tabs[index].UpView[1][1], panelType = tabs[index].UpView[2] }) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index 9c77e2a3dd..389d02ebf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -76,21 +76,25 @@ function CommonActPage:OnShow(_sortingOrder) self.sortingOrder = _sortingOrder or self.sortingOrder self.actId = self.actConfig.ActId self.actType = self.actConfig.ActiveType + --每日每周任务页签拆分用 + if self.actConfig.ShopData[1][1] == -9999 then + self.actType = 20000 + end if self.actConfig.IfBack == 1 then - if self.actConfig.ActiveType > 0 then - local id = ActivityGiftManager.IsActivityTypeOpen(self.actConfig.ActiveType) + if self.actType > 0 then + local id = ActivityGiftManager.IsActivityTypeOpen(self.actType) if id and id > 0 then self.actId = id local actConfig - local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType) + local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actType) if not actConfig then - actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType) + actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actType) end if actConfig then self.actConfig = actConfig end else - LogRed("活动类型:"..tostring(self.actConfig.ActiveType).."的活动未开启") + LogRed("活动类型:"..tostring(self.actType).."的活动未开启") end end end @@ -165,7 +169,7 @@ function CommonActPage:OnShow(_sortingOrder) end --刷新数据 function CommonActPage:RefreshData(isUpdata,isTop,isAni) - self.ActData = CommonActPageManager.GetData(self.actConfig.ActiveType) + self.ActData = CommonActPageManager.GetData(self.actType) if self.actConfig.RpType > 0 then CheckRedPointStatus(self.actConfig.RpType) end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 9bb9401a15..11916355d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -3,6 +3,7 @@ local this = CommonActPageManager local dataList = {} this.TaSuiLingXiaoMsg = nil this.TaSuiLingXiaoHistoryDmg = 0 +this.DynamicActType = 1 function this.Initialize() end @@ -243,7 +244,7 @@ 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 then + if allListData[i].Id == allMissionData[j].missionId and allListData[i].Type == this.DynamicActType then local data = {} data.missionId = allMissionData[j].missionId data.taskType = taskType