diff --git a/cocos2d/core/load-pipeline/CCLoader.js b/cocos2d/core/load-pipeline/CCLoader.js index b3a6a7bc39..5f72dc5ec2 100644 --- a/cocos2d/core/load-pipeline/CCLoader.js +++ b/cocos2d/core/load-pipeline/CCLoader.js @@ -525,8 +525,9 @@ JS.mixin(CCLoader.prototype, { // override removeItem: function (key) { - this._baseRemoveItem(key); + var removed = this._baseRemoveItem(key); delete this._autoReleaseSetting[key]; + return removed; }, /** diff --git a/cocos2d/core/load-pipeline/auto-release-utils.js b/cocos2d/core/load-pipeline/auto-release-utils.js index 60af8f90f7..491463dd2d 100644 --- a/cocos2d/core/load-pipeline/auto-release-utils.js +++ b/cocos2d/core/load-pipeline/auto-release-utils.js @@ -19,20 +19,17 @@ function release (loader, key, nextSceneAssets) { if (!nextSceneAssets || nextSceneAssets.indexOf(key) === -1) { var item = loader.getItem(key); if (item) { - loader.removeItem(key); + var removed = loader.removeItem(key); console.log('auto release: ' + key); // TODO: Audio var asset = item.content; if (asset instanceof cc.Texture2D) { cc.textureCache.removeTextureForKey(item.url); } - //else if (asset instanceof cc.SpriteFrame) { - // // for the "Temporary solution" in deserialize.js - // console.log('release sprite frame: ' + key); - // if (CC_JSB) { - // asset.release(); - // } - //} + else if (CC_JSB && asset instanceof cc.SpriteFrame && removed) { + // for the "Temporary solution" in deserialize.js + asset.release(); + } } } } diff --git a/cocos2d/core/load-pipeline/pipeline.js b/cocos2d/core/load-pipeline/pipeline.js index 27e962969d..5358ed4f2b 100644 --- a/cocos2d/core/load-pipeline/pipeline.js +++ b/cocos2d/core/load-pipeline/pipeline.js @@ -509,6 +509,7 @@ JS.mixin(Pipeline.prototype, { this.flowOut(item); } this._items.removeItem(url); + return true; } else { return false; diff --git a/jsb/jsb-tex-sprite-frame.js b/jsb/jsb-tex-sprite-frame.js index 448e46e983..769d1704fc 100644 --- a/jsb/jsb-tex-sprite-frame.js +++ b/jsb/jsb-tex-sprite-frame.js @@ -32,6 +32,7 @@ require('../cocos2d/core/assets/CCAsset'); // cc.SpriteFrameAnimation = cc.Animation; // cc.textureCache.cacheImage + cc.textureCache._textures = {}; cc.textureCache.cacheImage = function (key, texture) { if (texture instanceof cc.Texture2D) { @@ -75,7 +76,6 @@ prototype.textureLoaded = function () { return this.getTexture() !== null; }; -// cc.SpriteFrame prototype._ctor = function (filename, rect, rotated, offset, originalSize) { this._name = ''; if (filename !== undefined) {