From 5d482f0e6825bf42406244763e9bf2def552c25a Mon Sep 17 00:00:00 2001 From: Santy-Wang Date: Sat, 12 Dec 2020 11:34:34 +0800 Subject: [PATCH] revert part of #7665 (#7939) * refine image asset auto releasing * refine --- cocos/core/asset-manager/release-manager.ts | 7 ++----- cocos/core/assets/asset.ts | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cocos/core/asset-manager/release-manager.ts b/cocos/core/asset-manager/release-manager.ts index 97755ff8bd..1865871f14 100644 --- a/cocos/core/asset-manager/release-manager.ts +++ b/cocos/core/asset-manager/release-manager.ts @@ -36,6 +36,7 @@ import { assets, references } from './shared'; import { legacyCC } from '../global-exports'; import { ImageAsset } from '../assets/image-asset'; import { TextureBase } from '../assets/texture-base'; +import { callInNextTick } from '../utils/misc'; function visitAsset (asset: Asset, deps: string[]) { // Skip assets generated programmatically or by user (e.g. label texture) @@ -210,14 +211,10 @@ class ReleaseManager { this._toDelete.add(asset._uuid, asset); if (!this._eventListener) { this._eventListener = true; - legacyCC.director.once(legacyCC.Director.EVENT_AFTER_DRAW, this._freeAssets, this); + callInNextTick(this._freeAssets.bind(this)); } } - public removeFromDeleteQueue (asset: Asset): void { - this._toDelete.remove(asset._uuid); - } - private _freeAssets () { this._eventListener = false; this._toDelete.forEach((asset) => { diff --git a/cocos/core/assets/asset.ts b/cocos/core/assets/asset.ts index 51d4384005..f9e5e381f0 100644 --- a/cocos/core/assets/asset.ts +++ b/cocos/core/assets/asset.ts @@ -264,7 +264,6 @@ export class Asset extends Eventify(CCObject) { */ public addRef (): Asset { this._ref++; - legacyCC.assetManager._releaseManager.removeFromDeleteQueue(this); return this; }