Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

avoid using persistNodeList directly #8314

Merged
merged 2 commits into from Mar 2, 2021
Merged

avoid using persistNodeList directly #8314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1259c6c
avoid using persistNodeList directly
holycanvas Mar 2, 2021
169a785
fix ci
holycanvas Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cocos2d/core/CCDirector.js
View file
Open in desktop
Expand Up @@ -452,7 +452,7 @@ cc.Director.prototype = {
if (!CC_EDITOR) {
// auto release assets
CC_BUILD && CC_DEBUG && console.time('AutoRelease');
cc.assetManager._releaseManager._autoRelease(oldScene, scene, persistNodeList);
cc.assetManager._releaseManager._autoRelease(oldScene, scene, game._persistRootNodes);
CC_BUILD && CC_DEBUG && console.timeEnd('AutoRelease');
}

Expand Down
4 changes: 2 additions & 2 deletions cocos2d/core/asset-manager/releaseManager.js
View file
Open in desktop
Expand Up @@ -181,8 +181,8 @@ var releaseManager = {
var sceneDeps = dependUtil._depends.get(newScene._id);
sceneDeps && (sceneDeps.persistDeps = []);
// transfer refs from persist nodes to new scene
for (let i = 0, l = persistNodes.length; i < l; i++) {
var node = persistNodes[i];
for (let key in persistNodes) {
var node = persistNodes[key];
var deps = _persistNodeDeps.get(node.uuid);
for (let i = 0, l = deps.length; i < l; i++) {
var dependAsset = assets.get(deps[i]);
Expand Down
11 changes: 6 additions & 5 deletions test/qunit/unit-es5/test-finalizer.js
View file
Open in desktop
Expand Up @@ -197,7 +197,7 @@ test('AutoRelease', function () {

cc.assetManager.dependUtil._depends.add('scene 1', {deps: ['AAA', 'BBB', 'CCC', 'DDD']});
cc.assetManager.dependUtil._depends.add('scene 2', {deps: ['BBB', 'CCC']});
cc.assetManager._releaseManager._autoRelease(scene1, scene2, []);
cc.assetManager._releaseManager._autoRelease(scene1, scene2, {});
strictEqual(cc.assetManager.assets.count, 2, 'should equal to 2');
strictEqual(texB.refCount, 1, 'should equal to 1');
strictEqual(texC.refCount, 1, 'should equal to 1');
Expand All @@ -217,7 +217,7 @@ test('autoRelease_polyfill', function () {
cc.assetManager.assets.add('AAA', texA);
cc.loader.setAutoRelease(texA, true);
strictEqual(cc.assetManager.assets.count, 1, 'should equal to 1');
cc.assetManager._releaseManager._autoRelease(scene1, scene2, []);
cc.assetManager._releaseManager._autoRelease(scene1, scene2, {});
strictEqual(cc.assetManager.assets.count, 0, 'should equal to 0');
cc.assetManager._releaseManager.tryRelease = originalRelease;
});
Expand All @@ -241,16 +241,17 @@ test('persistNode', function () {
var persistNode = new cc.Node();
persistNode.addComponent(cc.Sprite).spriteFrame = sp;
cc.assetManager._releaseManager._addPersistNodeRef(persistNode);

var persistNodes = {};
persistNodes[persistNode.uuid] = persistNode;
cc.assetManager.dependUtil._depends.add('scene 1', {deps: ['AAA']});
cc.assetManager.dependUtil._depends.add('scene 2', {deps: []});
cc.assetManager._releaseManager._autoRelease(scene1, scene2, [persistNode]);
cc.assetManager._releaseManager._autoRelease(scene1, scene2, persistNodes);
strictEqual(cc.assetManager.assets.count, 1, 'should equal to 1');
strictEqual(cc.assetManager.assets.get('AAA'), sp, 'should equal to spriteFrame');
strictEqual(sp.refCount, 2, 'should equal to 2');
cc.assetManager._releaseManager._removePersistNodeRef(persistNode);
strictEqual(sp.refCount, 1, 'should equal to 1');
cc.assetManager._releaseManager._autoRelease(scene2, scene3, []);
cc.assetManager._releaseManager._autoRelease(scene2, scene3, {});
strictEqual(cc.assetManager.assets.count, 0, 'should equal to 0');
cc.assetManager._releaseManager.tryRelease = originalRelease;
});
Expand Down