diff --git a/cocos2d/core/platform/CCAssetLibrary.js b/cocos2d/core/platform/CCAssetLibrary.js index 7326a7a175..28cc302f17 100644 --- a/cocos2d/core/platform/CCAssetLibrary.js +++ b/cocos2d/core/platform/CCAssetLibrary.js @@ -94,7 +94,8 @@ var AssetLibrary = { * @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 {Boolean} options.recordAssets - Default is false. If true, tracking statistics associated with the assets which needs to preload(All the assets contains "urls" but dont have "_rawFiles") - * @param {deserialize.Details} options.deserializeInfo - specified a DeserializeInfo object if you want + * @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) { diff --git a/cocos2d/particle/CCParticleSystem.js b/cocos2d/particle/CCParticleSystem.js index 9da59d4938..a28caa9c34 100644 --- a/cocos2d/particle/CCParticleSystem.js +++ b/cocos2d/particle/CCParticleSystem.js @@ -820,8 +820,8 @@ var ParticleSystem = cc.Class({ self.node.destroy(); }; } - else { - sgNode.onExit = null; + else if (sgNode.hasOwnProperty('onExit')) { + sgNode.onExit = _ccsg.Node.prototype.onExit; } } }