From 5f596eef04bda4dbf9a6401f0e83dd3dc343db64 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 12 Nov 2020 17:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E5=AE=9D=E9=98=81?= =?UTF-8?q?=E3=80=91bug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua | 2 +- .../~Lua/Modules/DynamicActivity/LingShouBaoGe.lua | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index 09b72599ca..a8a1f3ad6b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -223,7 +223,7 @@ function this.PageTabAdapter(tab, index, status) this.BindPageRedpot(index, redpot) end local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActType) - if id and id > 0 then + if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActType) then if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then tab:SetActive(GlobalActConfig[id].ShowArt == index) else diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index b4a4dc89ad..86706fca41 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -120,6 +120,9 @@ function LingShouBaoGe:SetData() bgName = artConfig[SpiritAnimalConfig[showData.monsterId].Live].Name local pos = SpiritAnimalConfig[showData.monsterId].Position local scale = SpiritAnimalConfig[showData.monsterId].Scale + if Live then + poolManager:UnLoadLive(bgName, Live) + end Live = poolManager:LoadLive(bgName, this.grid.transform, Vector3.one*scale, Vector2.New(pos[1],pos[2])) local leftTime = lotterySetting[singleRecruit.Id].DiamondBoxContain[1][2] - ActData.value @@ -280,6 +283,7 @@ function LingShouBaoGe:OnHide() if Live then poolManager:UnLoadLive(bgName, Live) end + Live = nil this.gameObject:SetActive(false) this.detail.gameObject:SetActive(false) if this.timer then @@ -292,6 +296,7 @@ function LingShouBaoGe:OnDestroy() if Live then poolManager:UnLoadLive(bgName, Live) end + Live = nil ActivityDetail.OnDestroy() end