From 7ba5a72a607a037c024051097ecb21ecab122a43 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Sun, 5 Jan 2020 12:29:29 +0800
Subject: [PATCH] Update progressbar

---
 libs/loader.js | 34 +++++++++++++++++++++++-----------
 libs/utils.js  | 11 ++++++++---
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/libs/loader.js b/libs/loader.js
index 321a6024..1804c82f 100644
--- a/libs/loader.js
+++ b/libs/loader.js
@@ -50,6 +50,7 @@ loader.prototype._loadIcons = function () {
 }
 
 loader.prototype._loadMaterialImages = function (callback) {
+    this._setStartLoadTipText("正在加载资源文件...");
     if (main.useCompress) {
         this.loadImagesFromZip('project/images/materials.zip', core.materials, core.material.images, callback);
     } else {
@@ -64,6 +65,7 @@ loader.prototype._loadExtraImages = function (callback) {
     if (images.indexOf("hero.png") < 0)
         images.push("hero.png");
 
+    this._setStartLoadTipText("正在加载图片文件...");
     if (main.useCompress) {
         this.loadImagesFromZip('project/images/images.zip', images, core.material.images.images, callback);
     } else {
@@ -86,6 +88,7 @@ loader.prototype._loadAutotiles = function (callback) {
 
         callback();
     }
+    this._setStartLoadTipText("正在加载自动元件...");
     if (main.useCompress) {
         this.loadImagesFromZip('project/images/autotiles.zip', keys, autotiles, _callback);
     } else {
@@ -109,6 +112,7 @@ loader.prototype._loadTilesets = function (callback) {
         }
         callback();
     }
+    this._setStartLoadTipText("正在加载额外素材...");
     if (main.useCompress) {
         this.loadImagesFromZip('project/images/tilesets.zip', core.tilesets, core.material.images.tilesets, _callback);
     } else {
@@ -125,16 +129,16 @@ loader.prototype.loadImages = function (names, toSave, callback) {
     for (var i = 0; i < names.length; i++) {
         this.loadImage(names[i], function (id, image) {
             core.loader._setStartLoadTipText('正在加载图片 ' + id + "...");
-                if (toSave[id] !== undefined) {
-                    if (image != null)
-                        toSave[id] = image;
-                    return;
-                }
-                toSave[id] = image;
-                items++;
-                core.loader._setStartProgressVal(items * (100 / names.length));
-                if (items == names.length) {
-                    if (callback) callback();
+            if (toSave[id] !== undefined) {
+                if (image != null)
+                    toSave[id] = image;
+                return;
+            }
+            toSave[id] = image;
+            items++;
+            core.loader._setStartProgressVal(items * (100 / names.length));
+            if (items == names.length) {
+                if (callback) callback();
             }
         })
     }
@@ -166,6 +170,8 @@ loader.prototype.loadImagesFromZip = function (url, names, toSave, callback) {
         });
         cnt--;
         if (cnt == 0 && callback) callback();
+    }, null, false, function (percentage) {
+        core.loader._setStartProgressVal(percentage * 100);
     });
 }
 
@@ -191,6 +197,7 @@ loader.prototype.loadImage = function (imgName, callback) {
 }
 
 loader.prototype._loadAnimates = function () {
+    this._setStartLoadTipText("正在加载动画文件...");
     if (main.useCompress) {
         core.unzip('project/animates/animates.zip?v=' + main.version, function (animates) {
             for (var name in animates) {
@@ -200,7 +207,9 @@ loader.prototype._loadAnimates = function () {
                         core.loader._loadAnimate(t, animates[name]);
                 }
             }
-        }, null, true);
+        }, null, true, function (percentage) {
+            core.loader._setStartProgressVal(percentage * 100);
+        });
     } else {
         core.animates.forEach(function (t) {
             core.http('GET', 'project/animates/' + t + ".animate?v=" + main.version, null, function (content) {
@@ -267,6 +276,7 @@ loader.prototype._loadMusic = function () {
         core.loader.loadOneMusic(t);
     });
 
+    this._setStartLoadTipText("正在加载音效文件...");
     if (main.useCompress && core.musicStatus.audioContext) {
         core.unzip('project/sounds/sounds.zip?v=' + main.version, function (data) {
             for (var name in data) {
@@ -274,6 +284,8 @@ loader.prototype._loadMusic = function () {
                     core.loader._loadOneSound_decodeData(name, data[name]);
                 }
             }
+        }, null, false, function (percentage) {
+            core.loader._setStartProgressVal(percentage * 100);
         });
     } else {
         core.sounds.forEach(function (t) {
diff --git a/libs/utils.js b/libs/utils.js
index 8506a8b9..ad66b4d3 100644
--- a/libs/utils.js
+++ b/libs/utils.js
@@ -1166,7 +1166,7 @@ utils.prototype._export = function (floorIds) {
     console.log(content);
 }
 
-utils.prototype.unzip = function (blobOrUrl, success, error, convertToText) {
+utils.prototype.unzip = function (blobOrUrl, success, error, convertToText, onprogress) {
     var _error = function (msg) {
         main.log(msg);
         if (error) error(msg);
@@ -1179,7 +1179,7 @@ utils.prototype.unzip = function (blobOrUrl, success, error, convertToText) {
     if (typeof blobOrUrl == 'string') {
         return core.http('GET', blobOrUrl, null, function (data) {
             core.unzip(data, success, error, convertToText);
-        }, _error, 'application/zip', 'blob');
+        }, _error, 'application/zip', 'blob', onprogress);
     }
 
     if (!(blobOrUrl instanceof Blob)) {
@@ -1214,7 +1214,7 @@ utils.prototype._unzip_readEntries = function (entries, success, convertToText)
     });
 }
 
-utils.prototype.http = function (type, url, formData, success, error, mimeType, responseType) {
+utils.prototype.http = function (type, url, formData, success, error, mimeType, responseType, onprogress) {
     var xhr = new XMLHttpRequest();
     xhr.open(type, url, true);
     if (mimeType) xhr.overrideMimeType(mimeType);
@@ -1227,6 +1227,11 @@ utils.prototype.http = function (type, url, formData, success, error, mimeType,
             if (error) error("HTTP " + xhr.status);
         }
     };
+    xhr.onprogress = function (e) {
+        if (e.lengthComputable) {
+            if (onprogress) onprogress(e.loaded / e.total);
+        }
+    }
     xhr.onabort = function () {
         if (error) error("Abort");
     }