diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e59f3799b7..c476c718e5 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -666,6 +666,8 @@ RedPointType = { GrowthPackage = 2015,--成长礼包!礼包!!礼包!!(重要的说三遍 和礼金区分) QianKunBox = 2016,--乾坤包囊 DynamicAct = 2017,--破阵诛仙 + DynamicActTask_MeiRi = 20169,--破阵诛仙每日任务 + DynamicActTask_MeiZhou = 20170,--破阵诛仙每周任务 DynamicActTask = 20171,--破阵诛仙任务 DynamicActRecharge = 20172,--破阵诛仙累充 WeekGiftPage = 2018, -- 每周礼包 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 899c8a98f1..391cef24ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -286,7 +286,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].ActId + CommonActPageManager.DynamicActType = tabs[index].Sort end subViewList[index].sub:OnShow(orginLayer) else diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 8c4b870b0c..1eb8c47dfd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -187,29 +187,12 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.SecretBox_Red1, RedPointType.SecretBox) --角色招募红点 -- RPData:SetParent(RedPointType.Recruit_Red, RedPointType.Recruit) - --普通召唤红点 - RPData:SetParent(RedPointType.Recruit_Normal, RedPointType.Recruit) - RPData:SetParent(RedPointType.Recruit_ShenJiang, RedPointType.Recruit) - RPData:SetParent(RedPointType.Recruit_Friend, RedPointType.Recruit) -- --运营红点 -- RPData:SetParent(RedPointType.GrowthGift, RedPointType.Operating) -- RPData:SetParent(RedPointType.CumulativeSignIn, RedPointType.Operating) -- RPData:SetParent(RedPointType.WeekGiftPage, RedPointType.Operating) -- RPData:SetParent(RedPointType.MonthGiftPage, RedPointType.Operating) -- --RPData:SetParent(RedPointType.MonthCard, RedPointType.Operating) - - --主题活动 - RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.TimeLimitWish, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.QianKunBox, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.DynamicActTask, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.DynamicActRecharge, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.Celebration, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.LingShouBaoGe, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.ShengXingYouLi, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.XiangYaoDuoBao, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.XinJiangLaiXi, RedPointType.DynamicActivity) - -- 好友红点 RPData:SetParent(RedPointType.Friend_GetAllReward, RedPointType.Friend_Reward) RPData:SetParent(RedPointType.Friend_Reward, RedPointType.Friend) @@ -244,7 +227,6 @@ function this.InitRedPointAllRelate() -- RPData:SetParent(RedPointType.ContinuityRecharge, RedPointType.Expert) -- RPData:SetParent(RedPointType.Expert_Expedition, RedPointType.Expert) -- RPData:SetParent(RedPointType.Expert_Slhj, RedPointType.Expert) - RPData:SetParent(RedPointType.Expert_LimitExchange, RedPointType.DynamicActivity) --战力排行 RPData:SetParent(RedPointType.WarPowerSort_Sort, RedPointType.WarPowerSort) --背包 @@ -475,6 +457,8 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.TimeLimitWish,OperatingManager.GetWishDrawRedPointStatus) RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed) + RPData:AddCheckFunc(RedPointType.DynamicActTask_MeiRi, OperatingManager.CheckDynamicActTaskRed) + RPData:AddCheckFunc(RedPointType.DynamicActTask_MeiZhou, OperatingManager.CheckDynamicActTaskRed) RPData:AddCheckFunc(RedPointType.DynamicActRecharge, OperatingManager.CheckLeiJiChongZhiRedData) RPData:AddCheckFunc(RedPointType.Celebration, DynamicActivityManager.SheJiCheckRedPoint) RPData:AddCheckFunc(RedPointType.LingShouBaoGe, DynamicActivityManager.LingShouUpCheckRed)