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