From 70335a82f47c162dc8b916748bab0b17cbbaa49d Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 15 Dec 2016 16:32:52 +0800 Subject: [PATCH 1/3] Fix getResWithUrl issue --- cocos2d/core/load-pipeline/CCLoader.js | 2 +- cocos2d/core/platform/CCAssetLibrary.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos2d/core/load-pipeline/CCLoader.js b/cocos2d/core/load-pipeline/CCLoader.js index 0608a322c6..afb5a892c2 100644 --- a/cocos2d/core/load-pipeline/CCLoader.js +++ b/cocos2d/core/load-pipeline/CCLoader.js @@ -45,7 +45,7 @@ function getResWithUrl (res) { if (typeof res === 'object') { result = res; if (res.url) { - return res.url; + return result; } else { id = res.uuid; diff --git a/cocos2d/core/platform/CCAssetLibrary.js b/cocos2d/core/platform/CCAssetLibrary.js index 2188882c92..e5f2346d29 100644 --- a/cocos2d/core/platform/CCAssetLibrary.js +++ b/cocos2d/core/platform/CCAssetLibrary.js @@ -88,7 +88,7 @@ var AssetLibrary = { Editor.error('Sorry, the scene data of "%s" is corrupted!', uuid); } else { - // We know scene is a raw asset, so we can pass uuid to this API directly + // We know scene is not a raw asset, so we can pass uuid to this API directly asset.scene.dependAssets = AutoReleaseUtils.getDependsRecursively(uuid); } } @@ -225,7 +225,7 @@ var AssetLibrary = { } else { if (asset.constructor === cc.SceneAsset) { - // We know scene is a raw asset, so we can pass uuid to this API directly + // We know scene is not a raw asset, so we can pass uuid to this API directly asset.scene.dependAssets = AutoReleaseUtils.getDependsRecursively(randomUuid); } if (CC_EDITOR || isScene(asset)) { From cf6440dbe25a1826fa63e3f996b55bcbc340b540 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 15 Dec 2016 16:49:17 +0800 Subject: [PATCH 2/3] Fix pack downloader uuid issue --- cocos2d/core/load-pipeline/pack-downloader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/load-pipeline/pack-downloader.js b/cocos2d/core/load-pipeline/pack-downloader.js index 3b803080c3..4c78e50b19 100644 --- a/cocos2d/core/load-pipeline/pack-downloader.js +++ b/cocos2d/core/load-pipeline/pack-downloader.js @@ -142,7 +142,7 @@ module.exports = { * @returns {Boolean} specify whether loaded by pack */ load: function (item, callback) { - var uuid = item.id; + var uuid = item.uuid; var packUuid = uuidToPack[uuid]; if (!packUuid) { return false; From 01d199a76d970104e438f076323767af9a99df77 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 15 Dec 2016 16:58:34 +0800 Subject: [PATCH 3/3] Add warning for using id in resources item --- cocos2d/core/load-pipeline/CCLoader.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cocos2d/core/load-pipeline/CCLoader.js b/cocos2d/core/load-pipeline/CCLoader.js index afb5a892c2..e1691a56e5 100644 --- a/cocos2d/core/load-pipeline/CCLoader.js +++ b/cocos2d/core/load-pipeline/CCLoader.js @@ -199,7 +199,13 @@ JS.mixin(CCLoader.prototype, { _sharedResources.length = 0; for (var i = 0; i < resources.length; ++i) { - var res = getResWithUrl(resources[i]); + var resource = resources[i]; + // Backward compatibility + if (resource && resource.id) { + cc.warn('Sorry, you shouldn\'t use id as item identity any more, please use url or uuid instead, the current id is being set as url: ' + resource.id); + resource.url = resource.url || resource.id; + } + var res = getResWithUrl(resource); if (!res.url && !res.uuid) continue; var item = this.getItem(res.url);