From e822543bf1732e0dbbf8cf1e1f35a4480820b9ad Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sat, 30 Mar 2019 20:15:43 +0800
Subject: [PATCH] prev replays

---
 libs/control.js |  8 ++++++--
 libs/maps.js    | 13 ++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/libs/control.js b/libs/control.js
index b980955b..fa0eaf5a 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -1302,8 +1302,12 @@ control.prototype._replay_save = function () {
 
 control.prototype._replay_error = function (action) {
     core.status.replay.replaying = false;
-    main.log("录像文件出错，当前操作：" + action +
-        "\n接下来10个操作是："+core.status.replay.toReplay.slice(0, 10).toString());
+    var len = core.status.replay.toReplay.length;
+    var prevList = core.status.replay.totalList.slice(-len - 11, -len - 1);
+    var nextList = core.status.replay.toReplay.slice(0, 10);
+    main.log("录像文件出错，当前操作：" + action);
+    main.log("之前的10个操作是：\n" + prevList.toString());
+    main.log("接下来10个操作是：\n" + nextList.toString());
     core.ui.drawConfirmBox("录像文件出错，你想回到上个节点吗？", function () {
         core.ui.closePanel();
         if (core.status.replay.save.length > 0) {
diff --git a/libs/maps.js b/libs/maps.js
index f09d6b27..9d05a272 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -30,11 +30,14 @@ maps.prototype.loadFloor = function (floorId, map) {
         map = {"map": map};
     }
     var content = {};
-    ["floorId", "title", "name", "canFlyTo", "canUseQuickShop", "cannotViewMap", "cannotMoveDirectly", "color", "weather",
-        "defaultGround", "images", "item_ratio", "upFloor", "bgm", "downFloor", "underGround"].forEach(function (e) {
-        if (map[e] != null) content[e] = core.clone(map[e]);
-        else content[e] = core.clone(floor[e]);
-    });
+    for (var name in floor) {
+        if (name != 'map' && name != 'bgmap' && name != 'fgmap' && floor[name] != null)
+            content[name] = core.clone(floor[name]);
+    }
+    for (var name in map) {
+        if (name != 'map' && name != 'bgmap' && name != 'fgmap' && map[name] != null)
+            content[name] = core.clone(map[name]);
+    }
     map = this.decompressMap(map.map, floorId);
     // 事件处理
     content['blocks'] = this._mapIntoBlocks(map, floor, floorId);