diff --git a/libs/events.js b/libs/events.js
index bf0866fe..3158b818 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -842,7 +842,7 @@ events.prototype.openDoor = function (id, x, y, needKey, callback) {
     if (core.interval.openDoorAnimate!=null) return;
 
     // 是否存在门
-    if (!core.terrainExists(x, y, id)) {
+    if (!core.terrainExists(x, y, id) && id!='lava' && id!='star') {
         if (core.isset(callback)) callback();
         return;
     }
@@ -876,6 +876,7 @@ events.prototype.openDoor = function (id, x, y, needKey, callback) {
     }
     var door = core.material.icons.animates[doorId];
     core.status.replay.animate=true;
+    core.removeGlobalAnimate(x,y);
     core.interval.openDoorAnimate = window.setInterval(function () {
         state++;
         if (state == 4) {
diff --git a/project/icons.js b/project/icons.js
index 1d36e5e0..1b6208fe 100644
--- a/project/icons.js
+++ b/project/icons.js
@@ -56,36 +56,31 @@ icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
         'animates': {
             'star': 0,
             'lava': 1,
-            'waterWall': 2,
-            'yellowDoor': 3,
-            'blueDoor': 4,
-            'redDoor': 5,
-            'greenDoor': 6,
-            'specialDoor': 7,
-            'blueWallDoor': 8,
-            'yellowWallDoor': 9,
-            'whiteWallDoor': 10,
-            'steelDoor': 11,
-            'lavaDoor': 12,
-            'grayLavaDoor': 13,
+            'blueWater': 2,
+            'water': 3,
+            'yellowDoor': 4,
+            'blueDoor': 5,
+            'redDoor': 6,
+            'greenDoor': 7,
+            'specialDoor': 8,
+            'steelDoor': 9,
+            'yellowWallDoor': 10,
+            'whiteWallDoor': 11,
+            'blueWallDoor': 12,
+            'lavaDoor': 13,
             'starDoor': 14,
-            'mockBlueWallDoor': 15,
-            'mockYellowWallDoor': 16,
-            'mockWhiteWallDoor': 17,
-            'iceYellowWallDoor': 18,
-            'starPortal': 19,
-            'exclamation': 20,
-            'portal': 21,
-            'switch': 22,
-            'lavaNet': 23,
-            'poisonNet': 24,
-            'weakNet': 25,
-            'curseNet': 26,
-            'downPortal': 27,
-            'leftPortal': 28,
-            'rightPortal': 29,
-            'upPortal': 30,
-            'water': 31,
+            'starPortal': 15,
+            //'exclamation': 16,
+            'portal': 17,
+            //'switch': 18,
+            'lavaNet': 19,
+            'poisonNet': 20,
+            'weakNet': 21,
+            'curseNet': 22,
+            'downPortal': 23,
+            'leftPortal': 24,
+            'rightPortal': 25,
+            'upPortal': 26,
         },
         'npcs': {
             'man': 0,
diff --git a/project/images/animates.png b/project/images/animates.png
index 29707cdb..0bfad0df 100644
Binary files a/project/images/animates.png and b/project/images/animates.png differ
diff --git a/project/maps.js b/project/maps.js
index 6e7bee25..c410b9d0 100644
--- a/project/maps.js
+++ b/project/maps.js
@@ -17,7 +17,8 @@ maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
     '12':{'cls': 'animates', 'id': 'poisonNet', 'noPass': false, 'trigger': 'passNet'}, // 毒网
     '13':{'cls': 'animates', 'id': 'weakNet', 'noPass': false, 'trigger': 'passNet'}, // 衰网
     '14':{'cls': 'animates', 'id': 'curseNet', 'noPass': false, 'trigger': 'passNet'}, // 咒网
-    '15':{'cls': 'animates', 'id': 'water', 'noPass': true}, // 水
+    '15':{'cls': 'animates', 'id': 'blueWater', 'noPass': true}, // 水
+    '16':{'cls': 'animates', 'id': 'water', 'noPass': true}, // 水
     // 在这里添加更多地形
     // 如果空位不足，可以从180以后开始继续放，只要不和现有的数字冲突即可