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

Use .h5data

Browse Source
This commit is contained in:
ckcz123 2020-01-05 15:00:42 +08:00
parent ee3e90a9db
commit f367e48ad5
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/loader.js
View File

@ -52,7 +52,7 @@ loader.prototype._loadIcons = function () {
loader.prototype._loadMaterialImages = function (callback) { loader.prototype._loadMaterialImages = function (callback) {
this._setStartLoadTipText("正在加载资源文件..."); this._setStartLoadTipText("正在加载资源文件...");
if (main.useCompress) { if (main.useCompress) {
this.loadImagesFromZip('project/images/materials.zip', core.materials, core.material.images, callback); this.loadImagesFromZip('project/images/materials.h5data', core.materials, core.material.images, callback);
} else { } else {
this.loadImages(core.materials, core.material.images, callback); this.loadImages(core.materials, core.material.images, callback);
} }
@ -67,7 +67,7 @@ loader.prototype._loadExtraImages = function (callback) {
this._setStartLoadTipText("正在加载图片文件..."); this._setStartLoadTipText("正在加载图片文件...");
if (main.useCompress) { if (main.useCompress) {
this.loadImagesFromZip('project/images/images.zip', images, core.material.images.images, callback); this.loadImagesFromZip('project/images/images.h5data', images, core.material.images.images, callback);
} else { } else {
this.loadImages(images, core.material.images.images, callback); this.loadImages(images, core.material.images.images, callback);
} }
@ -90,7 +90,7 @@ loader.prototype._loadAutotiles = function (callback) {
} }
this._setStartLoadTipText("正在加载自动元件..."); this._setStartLoadTipText("正在加载自动元件...");
if (main.useCompress) { if (main.useCompress) {
this.loadImagesFromZip('project/images/autotiles.zip', keys, autotiles, _callback); this.loadImagesFromZip('project/images/autotiles.h5data', keys, autotiles, _callback);
} else { } else {
this.loadImages(keys, autotiles, _callback); this.loadImages(keys, autotiles, _callback);
} }
@ -114,7 +114,7 @@ loader.prototype._loadTilesets = function (callback) {
} }
this._setStartLoadTipText("正在加载额外素材..."); this._setStartLoadTipText("正在加载额外素材...");
if (main.useCompress) { if (main.useCompress) {
this.loadImagesFromZip('project/images/tilesets.zip', core.tilesets, core.material.images.tilesets, _callback); this.loadImagesFromZip('project/images/tilesets.h5data', core.tilesets, core.material.images.tilesets, _callback);
} else { } else {
this.loadImages(core.tilesets, core.material.images.tilesets, _callback); this.loadImages(core.tilesets, core.material.images.tilesets, _callback);
} }
@ -199,7 +199,7 @@ loader.prototype.loadImage = function (imgName, callback) {
loader.prototype._loadAnimates = function () { loader.prototype._loadAnimates = function () {
this._setStartLoadTipText("正在加载动画文件..."); this._setStartLoadTipText("正在加载动画文件...");
if (main.useCompress) { if (main.useCompress) {
core.unzip('project/animates/animates.zip?v=' + main.version, function (animates) { core.unzip('project/animates/animates.h5data?v=' + main.version, function (animates) {
for (var name in animates) { for (var name in animates) {
if (name.endsWith(".animate")) { if (name.endsWith(".animate")) {
var t = name.substring(0, name.length - 8); var t = name.substring(0, name.length - 8);
@ -278,7 +278,7 @@ loader.prototype._loadMusic = function () {
this._setStartLoadTipText("正在加载音效文件..."); this._setStartLoadTipText("正在加载音效文件...");
if (main.useCompress && core.musicStatus.audioContext) { if (main.useCompress && core.musicStatus.audioContext) {
core.unzip('project/sounds/sounds.zip?v=' + main.version, function (data) { core.unzip('project/sounds/sounds.h5data?v=' + main.version, function (data) {
for (var name in data) { for (var name in data) {
if (core.sounds.indexOf(name) >= 0) { if (core.sounds.indexOf(name) >= 0) {
core.loader._loadOneSound_decodeData(name, data[name]); core.loader._loadOneSound_decodeData(name, data[name]);

8
libs/utils.js
View File

@ -1179,7 +1179,7 @@ utils.prototype.unzip = function (blobOrUrl, success, error, convertToText, onpr
if (typeof blobOrUrl == 'string') { if (typeof blobOrUrl == 'string') {
return core.http('GET', blobOrUrl, null, function (data) { return core.http('GET', blobOrUrl, null, function (data) {
core.unzip(data, success, error, convertToText); core.unzip(data, success, error, convertToText);
}, _error, 'application/zip', 'blob', onprogress); }, _error, null, 'blob', onprogress);
} }
if (!(blobOrUrl instanceof Blob)) { if (!(blobOrUrl instanceof Blob)) {
@ -1246,12 +1246,6 @@ utils.prototype.http = function (type, url, formData, success, error, mimeType,
else xhr.send(); else xhr.send();
} }
utils.prototype.httpAndZip = function (url, success, error) {
this.http('GET', url, null, function (data) {
}, error, null, 'blob');
}
// LZW-compress // LZW-compress
// https://gist.github.com/revolunet/843889 // https://gist.github.com/revolunet/843889
function lzw_encode(s) { function lzw_encode(s) {