diff --git a/cocos2d/core/platform/CCAssetLibrary.js b/cocos2d/core/platform/CCAssetLibrary.js index a7117700b9..549abf303a 100644 --- a/cocos2d/core/platform/CCAssetLibrary.js +++ b/cocos2d/core/platform/CCAssetLibrary.js @@ -28,6 +28,7 @@ var callInNextTick = require('./utils').callInNextTick; var Loader = require('../load-pipeline/CCLoader'); var PackDownloader = require('../load-pipeline/pack-downloader'); var AutoReleaseUtils = require('../load-pipeline/auto-release-utils'); +var decodeUuid = require('../utils/decode-uuid'); /** * The asset library which managing loading/unloading assets in project. @@ -111,6 +112,9 @@ var AssetLibrary = { }, getImportedDir: function (uuid) { + if (CC_BUILD) { + uuid = decodeUuid(uuid); + } return _libraryBase + uuid.slice(0, 2) + '/' + uuid; }, diff --git a/cocos2d/core/sprites/CCSpriteFrame.js b/cocos2d/core/sprites/CCSpriteFrame.js index acfe73ee51..83906cd6c2 100644 --- a/cocos2d/core/sprites/CCSpriteFrame.js +++ b/cocos2d/core/sprites/CCSpriteFrame.js @@ -492,6 +492,9 @@ cc.SpriteFrame = cc.Class(/** @lends cc.SpriteFrame# */{ else { uuid = Editor.Utils.UuidCache.urlToUuid(url); } + if (exporting) { + uuid = Editor.Utils.UuidUtils.compressUuid(uuid, true); + } } var capInsets; if (this.insetLeft !== 0 || diff --git a/cocos2d/core/utils/decode-uuid.js b/cocos2d/core/utils/decode-uuid.js index 9b18e168da..b74f862a2d 100644 --- a/cocos2d/core/utils/decode-uuid.js +++ b/cocos2d/core/utils/decode-uuid.js @@ -33,6 +33,9 @@ var Indices = UuidTemplate.map(function (x, i) { return x === '-' ? NaN : i; }). // fcmR3XADNLgJ1ByKhqcC5Z -> fc991dd7-0033-4b80-9d41-c8a86a702e59 module.exports = function (base64) { + if (base64.length !== 22) { + return base64; + } UuidTemplate[0] = base64[0]; UuidTemplate[1] = base64[1]; for (var i = 2, j = 2; i < 22; i += 2) {