refine loadSubpackage (cocos#2924)

fangguanya · Jun 29, 2018 · 48496e6 · 48496e6
1 parent 1d30cf8
commit 48496e6
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/cocos2d/core/load-pipeline/downloader.js b/cocos2d/core/load-pipeline/downloader.js
@@ -360,7 +360,17 @@ Downloader.prototype.handle = function (item, callback) {
 Downloader.prototype.loadSubpackage = function (name, completeCallback) {
     let pac = this._subpackages[name];
     if (pac) {
-        downloadScript({url: pac.path}, completeCallback);
+        if (pac.loaded) {
+            if (completeCallback) completeCallback();
+        }
+        else {
+            downloadScript({url: pac.path}, function (err) {
+                if (!err) {
+                    pac.loaded = true;
+                }
+                if (completeCallback) completeCallback(err);
+            });
+        }
     }
     else if (completeCallback) {
         completeCallback(new Error(`Can't find subpackage ${name}`));