From 7f64948c2d44aa73c1ae45eefb00e6187095b5b5 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 2 Nov 2020 22:09:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=88=98=E6=96=97=E7=95=8C=E9=9D=A2=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=9B=9E=E6=94=B6=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 4 ++-- .../ManagedResources/~Lua/Modules/Battle/View/BattleView.lua | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index f6b5b62851..1976052f5f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -792,14 +792,14 @@ function this.AddDelayRecycleRes(path, go, delayTime, delayFunc) end function this.RecycleAllDelayRes() - --立即回收延迟列表上的资源 for k, v in pairs(this._delayRecycleList) do for i=1, #v do + Util.SetGray(v[i], false) poolManager:UnLoadAsset(k, v[i], PoolManager.AssetType.GameObject) end - this._delayRecycleList[k] = nil end + this._delayRecycleList = {} end --++++++++++++++ diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index b75b99557b..a7cb7ebea6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -891,6 +891,9 @@ function this:OnClose() delayRecycleList[k] = nil end + -- 回收所有延迟资源 + BattleManager.RecycleAllDelayRes() + BattlePool.Clear() poolManager:ClearPool() @@ -902,6 +905,7 @@ function this:OnClose() BattleManager.StopBattle() this.ClearBattleEvent() + end --界面销毁时调用(用于子类重写)