From 52e6cdd917070d7812c0b59ffd272904d3f7a413 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 27 Apr 2021 23:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=BA=A2=E7=82=B9=E3=80=91=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=AD=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC=E7=9A=84=E7=BA=A2?= =?UTF-8?q?=E7=82=B9=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=9C=A8=E9=99=90=E6=97=B6?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/ActivityGift/ActivityGiftManager.lua | 10 ++++++++++ .../Modules/DynamicActivity/ActivityMainPanel.lua | 14 ++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index e9cee73fb5..d0fc5c61f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -635,6 +635,16 @@ function this.ExpterActivityIsShowRedPoint(activeIndex) if expertRewardTabs.value >= value then return true end + elseif activeType == ActivityTypeDef.AccumulativeRechargeExper then + local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper) + if id and id > 0 then + local curActiveConfig = ConfigManager.TryGetConfigData(ConfigName.GlobalActivity,id) + if curActiveConfig and curActiveConfig.ShowArt == 1 then--1类型的活动是限时活动里的累计充值 + if expertRewardTabs.value >= value then + return true + end + end + end else if expertRewardTabs.value >= value then --Log("限时红点 --------------- true") diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index f5e50903e3..d4def3b00e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -91,6 +91,20 @@ function ActivityMainPanel:OnOpen(_activityType,_index) this.activityType = _activityType DynamicActivityManager.curActivityType = this.activityType tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType) + --累计充值特殊判断 + for i = 1, #tabs do + if tabs[i] and tabs[i].ActiveType > 0 then + local id = ActivityGiftManager.IsActivityTypeOpen(tabs[i].ActiveType) + if id and id > 0 then + local curActiveConfig = ConfigManager.TryGetConfigData(ConfigName.GlobalActivity,id) + if curActiveConfig and curActiveConfig.ShowArt == 3 then--3类型的活动不是限时活动里的累计充值 + table.remove(tabs,i) + break + end + end + end + end + --累计充值特殊判断结束 _CurPageIndex = 0 if _index and _index > 0 then self:CheckActOpen(_index)