From 7f7a534a2f7d63ad629ce3bfd07aa3e0cfbb4c46 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 23 Jun 2021 15:11:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e7352701e74798d1d01c5e8318458dc251643fb4) --- .../Modules/DynamicActivity/ActivityMainPanel.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index a25dde21e3..2e1bcab490 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -210,7 +210,17 @@ function this.PageTabAdapter(tab, index, status) if tabs[index].IfBack == 1 then if tabs[index].ActiveType > 0 then local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActiveType) - isshow = id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) and (tabs[index].ActiveType == ActivityTypeDef.DynamicAct or tabs[index].ActiveType == ActivityTypeDef.LimitUpHero or not GlobalActConfig[id].ShowArt or GlobalActConfig[id].ShowArt < 1 or GlobalActConfig[id].ShowArt == this.activityType) + if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) then + if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then + if tabs[index].ActiveType == ActivityTypeDef.DynamicAct or tabs[index].ActiveType == ActivityTypeDef.LimitUpHero then + isshow = true + elseif GlobalActConfig[id].ShowArt == this.activityType then + isshow = true + end + else + isshow = true + end + end elseif tabs[index].FunType > 0 then isshow = ActTimeCtrlManager.SingleFuncState(tabs[index].FunType) else