diff --git a/_server/editor.js b/_server/editor.js
index 0df9b22c..4e5c516d 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -18,9 +18,9 @@ editor.prototype.init = function (callback) {
                     return editor.ids[[editor.indexs[parseInt(v)][0]]]
                 })
             });
-            editor.updateMap();
             editor.currentFloorId = core.status.floorId;
             editor.currentFloorData = core.floors[core.status.floorId];
+            editor.updateMap();
             editor.buildMark();
             editor.drawEventBlock();
             if (Boolean(callback)) callback();
@@ -229,7 +229,7 @@ editor.prototype.updateMap = function () {
         return v.map(function (v) {
             return v.idnum || v || 0
         })
-    }), {'events': {}, 'changeFloor': {}});
+    }), {'events': {}, 'changeFloor': {}}, editor.currentFloorId);
     core.status.thisMap.blocks = blocks;
     main.editor.updateMap();
 
@@ -340,9 +340,9 @@ editor.prototype.changeFloor = function (floorId, callback) {
                 return editor.ids[[editor.indexs[parseInt(v)][0]]]
             })
         });
-        editor.updateMap();
         editor.currentFloorId = core.status.floorId;
         editor.currentFloorData = core.floors[core.status.floorId];
+        editor.updateMap();
         editor_mode.floor();
         editor.drawEventBlock();
         if (core.isset(callback)) callback();
diff --git a/libs/maps.js b/libs/maps.js
index be066c67..82aa04bb 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -16,7 +16,7 @@ maps.prototype.loadFloor = function (floorId, map) {
     content['title'] = floor.title;
     content['canFlyTo'] = floor.canFlyTo;
     if (!core.isset(map)) map=floor.map;
-    var mapIntoBlocks = function(map,maps,floor){
+    var mapIntoBlocks = function(map,maps,floor,floorId){
         var blocks = [];
         var mw = core.floors[floorId].width || 13;
         var mh = core.floors[floorId].height || 13;
@@ -32,12 +32,12 @@ maps.prototype.loadFloor = function (floorId, map) {
         return blocks;
     }
     if (main.mode=='editor'){
-        main.editor.mapIntoBlocks = function(map,floor){
-            return mapIntoBlocks(map,core.maps,floor);
+        main.editor.mapIntoBlocks = function(map,floor,floorId){
+            return mapIntoBlocks(map,core.maps,floor,floorId);
         }
     }
     // 事件处理
-    content['blocks'] = mapIntoBlocks(map,this,floor);
+    content['blocks'] = mapIntoBlocks(map,this,floor,floorId);
     return content;
 }