Merge pull request cocos#2699 from knoxHuang/master

fix fireball/issues/7316
OnlyForDream · May 17, 2018 · 02d1c10 · 02d1c10
2 parents 86acc1b + 820c269
commit 02d1c10
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/cocos2d/core/load-pipeline/pack-downloader.js b/cocos2d/core/load-pipeline/pack-downloader.js
@@ -91,13 +91,15 @@ module.exports = {
     },
 
     _doPreload (packUuid, packJson) {
-        var unpacker = globalUnpackers[packUuid];
-        if (!unpacker) {
-            unpacker = globalUnpackers[packUuid] = new JsonUnpacker();
+        var unpackerData = globalUnpackers[packUuid];
+        if (!unpackerData) {
+            unpackerData = globalUnpackers[packUuid] = new UnpackerData();
+            unpackerData.state = PackState.Downloading;
         }
-        if (unpacker.state !== PackState.Loaded) {
-            unpacker.read(packIndices[packUuid], packJson);
-            unpacker.state = PackState.Loaded;
+        if (unpackerData.state !== PackState.Loaded) {
+            unpackerData.unpacker = new Unpackers.JsonUnpacker();
+            unpackerData.unpacker.load(packIndices[packUuid], packJson);
+            unpackerData.state = PackState.Loaded;
         }
     },
 

diff --git a/cocos2d/particle/CCSGParticleSystem.js b/cocos2d/particle/CCSGParticleSystem.js
@@ -27,6 +27,7 @@
 
 var PNGReader = require('./CCPNGReader');
 var tiffReader = require('./CCTIFFReader');
+require('../core/platform/CCSAXParser.js');
 require('../compression/ZipUtils');
 
 // ideas taken from:

diff --git a/modules.json b/modules.json
@@ -46,8 +46,7 @@
     "name": "ParticleSystem",
     "entries": [
       "./cocos2d/particle/CCParticleSystem.js",
-      "./cocos2d/particle/CCParticleAsset.js",
-      "./cocos2d/core/platform/CCSAXParser.js"
+      "./cocos2d/particle/CCParticleAsset.js"
     ]
   },
   {