From fdc0b14c3a39cc000d2b652ca1d4570106fbc382 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Mon, 18 Jun 2018 20:54:27 +0800
Subject: [PATCH 1/4] Fix ChangeFloor Time

---
 docs/event.md  | 2 +-
 libs/events.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/event.md b/docs/event.md
index 3eb4023c..a1ccef79 100644
--- a/docs/event.md
+++ b/docs/event.md
@@ -591,7 +591,7 @@ direction为可选的，指定的话将使勇士的朝向变成该方向
 
 time为可选的，指定的话将作为楼层切换动画的时间。
 
-**time也可以置为0，如果为0则没有楼层切换动画。**
+**如果time指定为小于100，则视为没有楼层切换动画。**
 
 !> **changeFloor到达一个新的楼层，将不会执行firstArrive事件！如有需求请在到达点设置自定义事件，然后使用type: trigger立刻调用之。**
 
diff --git a/libs/events.js b/libs/events.js
index c60a3914..03cee5e1 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1001,7 +1001,7 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback
         else floorId=core.status.floorId;
     }
 
-    var displayAnimate=!(time==0) && !core.status.replay.replaying;
+    var displayAnimate=(!core.isset(time) || time>=100) && !core.status.replay.replaying;
 
     time = time || 800;
     time /= 20;

From f0625272386088504309161cc00c1a9c84ed1147 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Tue, 19 Jun 2018 22:01:17 +0800
Subject: [PATCH 2/4] Fix Compress Save Bug

---
 libs/utils.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/libs/utils.js b/libs/utils.js
index 58c625a1..062772ac 100644
--- a/libs/utils.js
+++ b/libs/utils.js
@@ -76,7 +76,19 @@ utils.prototype.unshift = function (a,b) {
 ////// 设置本地存储 //////
 utils.prototype.setLocalStorage = function(key, value) {
     try {
-        localStorage.setItem(core.firstData.name + "_" + key, LZString.compress(JSON.stringify(value)));
+        var str = JSON.stringify(value);
+        var compressed = LZString.compress(str);
+
+        // test if we can save to localStorage
+        localStorage.setItem("__tmp__", compressed);
+        if (LZString.decompress(localStorage.getItem("__tmp__"))==str) {
+            localStorage.setItem(core.firstData.name + "_" + key, compressed);
+        }
+        else {
+            // We cannot compress the data
+            localStorage.setItem(core.firstData.name + "_" + key, str);
+        }
+        localStorage.removeItem("__tmp__");
         return true;
     }
     catch (e) {

From 64b25a93303c2e7864f405ffc0dae3c81f2e43d1 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Wed, 20 Jun 2018 00:05:48 +0800
Subject: [PATCH 3/4] Update Current

---
 libs/events.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/events.js b/libs/events.js
index 03cee5e1..b60a56a3 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1484,7 +1484,7 @@ events.prototype.afterLoadData = function (data) {
 }
 
 ////// 上传当前数据 //////
-events.prototype.uploadCurrent = function () {
+events.prototype.uploadCurrent = function (username) {
     var formData = new FormData();
 
     formData.append('type', 'score');
@@ -1492,6 +1492,7 @@ events.prototype.uploadCurrent = function () {
     formData.append('version', core.firstData.version);
     formData.append('platform', core.platform.isPC?"PC":core.platform.isAndroid?"Android":core.platform.isIOS?"iOS":"");
     formData.append('hard', core.encodeBase64(core.status.hard));
+    formData.append('username', core.encodeBase64(username||"current"));
     formData.append('lv', core.status.hero.lv);
     formData.append('hp', Math.min(hp, Math.pow(2, 63)));
     formData.append('atk', core.status.hero.atk);

From c9f4674029d5ef7a3ae87f2b359f38a090ab6fa6 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Wed, 20 Jun 2018 00:18:07 +0800
Subject: [PATCH 4/4] Fix Compress Save Bug

---
 libs/events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/events.js b/libs/events.js
index b60a56a3..add5938c 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1494,7 +1494,7 @@ events.prototype.uploadCurrent = function (username) {
     formData.append('hard', core.encodeBase64(core.status.hard));
     formData.append('username', core.encodeBase64(username||"current"));
     formData.append('lv', core.status.hero.lv);
-    formData.append('hp', Math.min(hp, Math.pow(2, 63)));
+    formData.append('hp', Math.min(core.status.hero.hp, Math.pow(2, 63)));
     formData.append('atk', core.status.hero.atk);
     formData.append('def', core.status.hero.def);
     formData.append('mdef', core.status.hero.mdef);