jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Update progressbar

Browse Source
This commit is contained in:
ckcz123 2020-01-05 12:29:29 +08:00
parent 4bc69f5b27
commit 7ba5a72a60
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libs/loader.js
View File

@ -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) {

11
libs/utils.js
View File

@ -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");
}