mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
remove loadingItem.deserializeInfo
This commit is contained in:
@@ -210,7 +210,7 @@ function loadUuid (item, callback) {
|
||||
return Object;
|
||||
};
|
||||
|
||||
var tdInfo = CC_JSB ? new cc.deserialize.Details() : (item.deserializeInfo || _tdInfo);
|
||||
var tdInfo = CC_JSB ? new cc.deserialize.Details() : _tdInfo;
|
||||
|
||||
var asset;
|
||||
try {
|
||||
@@ -221,6 +221,7 @@ function loadUuid (item, callback) {
|
||||
});
|
||||
}
|
||||
catch (e) {
|
||||
tdInfo.reset();
|
||||
var err = CC_JSB ? (e + '\n' + e.stack) : e.stack;
|
||||
callback( new Error('Uuid Loader: Deserialize asset [' + item.id + '] failed : ' + err) );
|
||||
return;
|
||||
|
||||
@@ -63,8 +63,6 @@ var AssetLibrary = {
|
||||
* @param {Boolean} options.readMainCache - Default is true. If false, the asset and all its depends assets will reload and create new instances from library.
|
||||
* @param {Boolean} options.writeMainCache - Default is true. If true, the result will cache to AssetLibrary, and MUST be unload by user manually.
|
||||
* @param {Asset} options.existingAsset - load to existing asset, this argument is only available in editor
|
||||
* @param {deserialize.Details} options.deserializeInfo - specified a DeserializeInfo object if you want,
|
||||
* this parameter is only available in editor.
|
||||
* @private
|
||||
*/
|
||||
loadAsset: function (uuid, callback, options) {
|
||||
@@ -77,9 +75,6 @@ var AssetLibrary = {
|
||||
id: uuid,
|
||||
type: 'uuid'
|
||||
};
|
||||
if (options && options.deserializeInfo) {
|
||||
item.deserializeInfo = options.deserializeInfo;
|
||||
}
|
||||
if (options && options.existingAsset) {
|
||||
item.existingAsset = options.existingAsset;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user