From 8ae45444d6e5573cb82cccafdb1cf19354b095a9 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Wed, 10 Jun 2020 10:21:50 +0800
Subject: [PATCH 1/2] Fix turnBlock selectPoint

---
 _server/MotaAction.g4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index e265e406..bd3b302e 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -1224,7 +1224,7 @@ helpUrl : /_docs/#/instruction
 colour : this.mapColor
 allFloorIds : ['IdString_0']
 default : [null,"","",""]
-selectPoint : ["EvalString_1", "EvalString_2", "IdString_0"]
+selectPoint : ["EvalString_0", "EvalString_1", "IdString_0"]
 var floorstr = '';
 if (EvalString_0 && EvalString_1) {
   var pattern1 = MotaActionFunctions.pattern.id;

From c6ea15e80704874d3430893a0a01b8c41e147eba Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Fri, 12 Jun 2020 12:32:57 +0800
Subject: [PATCH 2/2] Fix v2.7 bug

---
 libs/control.js      | 2 ++
 libs/events.js       | 2 +-
 project/functions.js | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/control.js b/libs/control.js
index a29e99b8..16cf3e86 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -1262,6 +1262,7 @@ control.prototype.rewindReplay = function () {
         return core.drawTip("无法再回到上一个节点");
     var save = core.status.replay.save, data = save.pop();
     core.loadData(data.data, function () {
+        core.removeFlag('__fromLoad__');
         core.status.replay = {
             "replaying": true,
             "pausing": true,
@@ -1760,6 +1761,7 @@ control.prototype._doSL_replayLoad_afterGet = function (id, data) {
     if (route == null || data.hero.flags.__seed__ != core.getFlag('__seed__'))
         return core.drawTip("无法从此存档回放录像");
     core.loadData(data, function () {
+        core.removeFlag('__fromLoad__');
         core.startReplay(route);
         core.drawTip("回退到存档节点");
     });
diff --git a/libs/events.js b/libs/events.js
index 2a5d873f..29467243 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1370,7 +1370,7 @@ events.prototype._action_setBlock = function (data, x, y, prefix) {
 events.prototype._action_turnBlock = function (data, x, y, prefix) {
     data.loc = this.__action_getLoc2D(data.loc, x, y, prefix);
     data.loc.forEach(function (t) {
-        core.turnBlock(data.number, t[0], t[1], data.floorId);
+        core.turnBlock(data.direction, t[0], t[1], data.floorId);
     });
     core.doAction();
 }
diff --git a/project/functions.js b/project/functions.js
index 43ad463f..a790acd9 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -981,6 +981,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 			core.playBgm(core.getFlag("__bgm__"));
 		}
 
+        core.removeFlag('__fromLoad__');
 		if (callback) callback();
 	});
 },