From 647ad49dcc11e041c376392306da1f789e7a89c2 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Sat, 26 Oct 2019 11:57:33 +0800
Subject: [PATCH] tiny fiox

---
 _server/css/editor.css   |  4 +++-
 _server/editor_listen.js |  2 +-
 libs/events.js           | 18 ++++++++++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/_server/css/editor.css b/_server/css/editor.css
index c12e3f07..92172a43 100644
--- a/_server/css/editor.css
+++ b/_server/css/editor.css
@@ -285,8 +285,10 @@ body {
 
 #iconExpandBtn {
     position: absolute;
-    left: 10px;
+    left: 20px;
     bottom: 30px;
+    font-size: 15px;
+    padding: 6px;
     display: none;
 }
 
diff --git a/_server/editor_listen.js b/_server/editor_listen.js
index dc957c6a..dec2bc2f 100644
--- a/_server/editor_listen.js
+++ b/_server/editor_listen.js
@@ -20,7 +20,7 @@ editor_listen_wrapper = function (editor) {
 
         editor.uivalues.scrollBarHeight = editor.uifunctions.getScrollBarHeight();
         editor.dom.iconExpandBtn.style.display = 'block';
-        editor.dom.iconExpandBtn.innerText = editor.uivalues.folded ? "展开" : "折叠";
+        editor.dom.iconExpandBtn.innerText = editor.uivalues.folded ? "展开素材区" : "折叠素材区";
         editor.dom.iconExpandBtn.onclick = editor.uifunctions.fold_material_click
 
         editor.dom.iconLib.onmousedown = editor.uifunctions.material_ondown
diff --git a/libs/events.js b/libs/events.js
index 95374ab1..d4425ff7 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -852,9 +852,10 @@ events.prototype.doAction = function (keepUI) {
     }
     // 判定是否执行完毕
     if (this._doAction_finishEvents()) return;
+    var floorId = core.status.event.data.floorId || core.status.floorId;
     // 当前点坐标和前缀
     var x = core.status.event.data.x, y = core.status.event.data.y;
-    var prefix = [core.status.floorId || ":f", x != null ? x : "x", y != null ? y : "y"].join("@");
+    var prefix = [floorId || ":f", x != null ? x : "x", y != null ? y : "y"].join("@");
     var current = core.status.event.data.list[0];
     if (this._popEvents(current, prefix)) return;
     // 当前要执行的事件
@@ -862,6 +863,7 @@ events.prototype.doAction = function (keepUI) {
     core.status.event.data.current = data;
     if (typeof data == "string")
         data = {"type": "text", "text": data};
+    data.floorId = data.floorId || floorId;
     core.status.event.data.type = data.type;
     this.doEvent(data, x, y, prefix);
     return;
@@ -1106,7 +1108,7 @@ events.prototype._action_tip = function (data, x, y, prefix) {
 
 events.prototype._action_show = function (data, x, y, prefix) {
     data.loc = this.__action_getLoc2D(data.loc, x, y, prefix);
-    if (data.time > 0 && !(data.floorId && data.floorId != core.status.floorId)) {
+    if (data.time > 0 &&  data.floorId == core.status.floorId) {
         this.__action_doAsyncFunc(data.async, core.animateBlock, data.loc, 'show', data.time);
     }
     else {
@@ -1119,7 +1121,7 @@ events.prototype._action_show = function (data, x, y, prefix) {
 
 events.prototype._action_hide = function (data, x, y, prefix) {
     data.loc = this.__action_getLoc2D(data.loc, x, y, prefix);
-    if (data.time > 0 && !(data.floorId && data.floorId != core.status.floorId)) {
+    if (data.time > 0 && data.floorId == core.status.floorId) {
         data.loc.forEach(function (t) {
             core.hideBlock(t[0], t[1], data.floorId);
         });
@@ -1219,7 +1221,7 @@ events.prototype._action_jumpHero = function (data, x, y, prefix) {
 events.prototype._action_changeFloor = function (data, x, y, prefix) {
     var loc = this.__action_getHeroLoc(data.loc, prefix);
     var heroLoc = {x: loc[0], y: loc[1], direction: data.direction};
-    core.changeFloor(data.floorId || core.status.floorId, null, heroLoc, data.time, core.doAction);
+    core.changeFloor(data.floorId, null, heroLoc, data.time, core.doAction);
 }
 
 events.prototype._action_changePos = function (data, x, y, prefix) {
@@ -1293,7 +1295,7 @@ events.prototype._action_setWeather = function (data, x, y, prefix) {
 
 events.prototype._action_openDoor = function (data, x, y, prefix) {
     var loc = this.__action_getLoc(data.loc, x, y, prefix);
-    var floorId = data.floorId || core.status.floorId;
+    var floorId = data.floorId;
     if (floorId == core.status.floorId) {
         this.__action_doAsyncFunc(data.async, core.openDoor, loc[0], loc[1], data.needKey);
     }
@@ -1338,6 +1340,10 @@ events.prototype._action_battle = function (data, x, y, prefix) {
         this.battle(data.id, null, null, true, core.doAction);
     }
     else {
+        if (data.floorId != core.status.floorId) {
+            setTimeout(core.doAction);
+            return;
+        }
         var loc = this.__action_getLoc(data.loc, x, y, prefix);
         this.battle(null, loc[0], loc[1], true, core.doAction);
     }
@@ -1376,7 +1382,7 @@ events.prototype._action_insert = function (data, x, y, prefix) {
     else {
         var loc = this.__action_getLoc(data.loc, x, y, prefix);
         core.setFlag('arg0', loc);
-        var floorId = data.floorId || core.status.floorId;
+        var floorId = data.floorId;
         var which = data.which || "events";
         var event = (core.floors[floorId][which]||[])[loc[0] + "," + loc[1]];
         if (event) this.insertAction(event.data || event);