From b646c1cb3e080014bbb68665d9d0437aa2118fd4 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Tue, 11 Dec 2018 23:28:00 +0800
Subject: [PATCH] firstArrive before eachArrive

---
 _server/comment.js   |  2 +-
 libs/events.js       |  2 +-
 project/functions.js | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/_server/comment.js b/_server/comment.js
index 9577712f..c38b6cd9 100644
--- a/_server/comment.js
+++ b/_server/comment.js
@@ -334,7 +334,7 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
                             "_leaf": true,
                             "_type": "event",
                             "_event": "eachArrive",
-                            "_data": "每次到该楼层触发的事件，可以双击进入事件编辑器；该事件会比firstArrive先执行。"
+                            "_data": "每次到该楼层触发的事件，可以双击进入事件编辑器；该事件会在firstArrive执行后再执行。"
                         },
                         "parallelDo": {
                             "_leaf": true,
diff --git a/libs/events.js b/libs/events.js
index 97fb8201..7588fbaa 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -117,7 +117,7 @@ events.prototype.startGame = function (hard, seed, route, callback) {
 
             core.changeFloor(core.firstData.floorId, null, nowLoc, null, function() {
                 if (core.isset(callback)) callback();
-            }, true);
+            });
 
             setTimeout(function () {
                 // Upload
diff --git a/project/functions.js b/project/functions.js
index d2ffbc3e..21852685 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -87,16 +87,19 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
         "afterChangeFloor": function (floorId, fromLoad) {
 	// 转换楼层结束的事件
 	// floorId是切换到的楼层；fromLoad若为true则代表是从读档行为造成的楼层切换
+
+	// 每次抵达楼层时执行的事件
+	if (!fromLoad) {
+		core.insertAction(core.floors[floorId].eachArrive);
+	}
+
+	// 首次抵达楼层时执行的事件（后插入，先执行）
 	var visited = core.getFlag("__visited__", []);
 	if (visited.indexOf(floorId)===-1) {
 		core.insertAction(core.floors[floorId].firstArrive);
 		visited.push(floorId);
 		core.setFlag("__visited__", visited);
 	}
-	// 每次抵达楼层时执行的事件
-	if (!fromLoad) {
-		core.insertAction(core.floors[floorId].eachArrive);
-	}
 },
         "addPoint": function (enemy) {
 	// 加点事件