From f367e48ad5625bec64f7d8a880f050e19115c197 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Sun, 5 Jan 2020 15:00:42 +0800
Subject: [PATCH] Use .h5data

---
 libs/loader.js | 12 ++++++------
 libs/utils.js  |  8 +-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/libs/loader.js b/libs/loader.js
index 1804c82f..9a625731 100644
--- a/libs/loader.js
+++ b/libs/loader.js
@@ -52,7 +52,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);
+        this.loadImagesFromZip('project/images/materials.h5data', core.materials, core.material.images, callback);
     } else {
         this.loadImages(core.materials, core.material.images, callback);
     }
@@ -67,7 +67,7 @@ loader.prototype._loadExtraImages = function (callback) {
 
     this._setStartLoadTipText("正在加载图片文件...");
     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 {
         this.loadImages(images, core.material.images.images, callback);
     }
@@ -90,7 +90,7 @@ loader.prototype._loadAutotiles = function (callback) {
     }
     this._setStartLoadTipText("正在加载自动元件...");
     if (main.useCompress) {
-        this.loadImagesFromZip('project/images/autotiles.zip', keys, autotiles, _callback);
+        this.loadImagesFromZip('project/images/autotiles.h5data', keys, autotiles, _callback);
     } else {
         this.loadImages(keys, autotiles, _callback);
     }
@@ -114,7 +114,7 @@ loader.prototype._loadTilesets = function (callback) {
     }
     this._setStartLoadTipText("正在加载额外素材...");
     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 {
         this.loadImages(core.tilesets, core.material.images.tilesets, _callback);
     }
@@ -199,7 +199,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) {
+        core.unzip('project/animates/animates.h5data?v=' + main.version, function (animates) {
             for (var name in animates) {
                 if (name.endsWith(".animate")) {
                     var t = name.substring(0, name.length - 8);
@@ -278,7 +278,7 @@ loader.prototype._loadMusic = function () {
 
     this._setStartLoadTipText("正在加载音效文件...");
     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) {
                 if (core.sounds.indexOf(name) >= 0) {
                     core.loader._loadOneSound_decodeData(name, data[name]);
diff --git a/libs/utils.js b/libs/utils.js
index ad66b4d3..009625ff 100644
--- a/libs/utils.js
+++ b/libs/utils.js
@@ -1179,7 +1179,7 @@ utils.prototype.unzip = function (blobOrUrl, success, error, convertToText, onpr
     if (typeof blobOrUrl == 'string') {
         return core.http('GET', blobOrUrl, null, function (data) {
             core.unzip(data, success, error, convertToText);
-        }, _error, 'application/zip', 'blob', onprogress);
+        }, _error, null, 'blob', onprogress);
     }
 
     if (!(blobOrUrl instanceof Blob)) {
@@ -1246,12 +1246,6 @@ utils.prototype.http = function (type, url, formData, success, error, mimeType,
     else xhr.send();
 }
 
-utils.prototype.httpAndZip = function (url, success, error) {
-    this.http('GET', url, null, function (data) {
-
-    }, error, null, 'blob');
-}
-
 // LZW-compress
 // https://gist.github.com/revolunet/843889
 function lzw_encode(s) {