diff --git a/project/data.js b/project/data.js
index d99ae5d6..d3abd830 100644
--- a/project/data.js
+++ b/project/data.js
@@ -9,7 +9,9 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		],
 		"floorPartitions": [],
 		"images": [
+			"bear.png",
 			"bg.jpg",
+			"dragon.png",
 			"hero.png",
 			"winskin.png"
 		],
@@ -150,7 +152,15 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			],
 			"floorChangingStyle": "background-color: black; color: white",
 			"font": "Verdana"
-		}
+		},
+		"splitImages": [
+			{
+				"name": "dragon.png",
+				"width": 384,
+				"height": 96,
+				"prefix": "dragon_"
+			}
+		]
 	},
 	"firstData": {
 		"title": "魔塔样板",
diff --git a/project/enemys.js b/project/enemys.js
index bac13fde..17cde5ac 100644
--- a/project/enemys.js
+++ b/project/enemys.js
@@ -35,7 +35,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"whiteHornSlime": {"name":"尖角怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"redSwordsman": {"name":"剑王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"poisonZombie": {"name":"绿兽人","hp":100,"atk":120,"def":0,"money":13,"exp":0,"point":0,"special":[12]},
-	"octopus": {"name":"血影","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
+	"octopus": {"name":"血影","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"bigImage":"dragon_1.png"},
 	"princessEnemy": {"name":"假公主","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"angel": {"name":"天使","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"elemental": {"name":"元素生物","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
@@ -52,7 +52,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"magicMaster": {"name":"黑暗大法师","hp":100,"atk":120,"def":0,"money":12,"exp":0,"point":0,"special":11,"value":0.3333333333333333,"add":true,"notBomb":true},
 	"devilWarrior": {"name":"魔神武士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"fairyEnemy": {"name":"仙子","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
-	"dragon": {"name":"魔龙","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
+	"dragon": {"name":"魔龙","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"bigImage":"dragon_0.png"},
 	"skeletonKnight": {"name":"骷髅武士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"skeletonPresbyter": {"name":"骷髅巫师","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"ironRock": {"name":"铁面人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
@@ -76,5 +76,9 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"blueKing": {"name":"白衣武士","hp":100,"atk":120,"def":0,"money":17,"exp":0,"point":0,"special":16},
 	"keiskeiFairy": {"name":"铃兰花妖","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"tulipFairy": {"name":"郁金香花妖","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
-	"purpleBowman": {"name":"高级弓兵","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0}
+	"purpleBowman": {"name":"高级弓兵","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
+	"bearDown": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"},"bigImage":"bear.png"},
+	"bearLeft": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"}},
+	"bearRight": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"}},
+	"bearUp": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"}}
 }
\ No newline at end of file
diff --git a/project/floors/sample2.js b/project/floors/sample2.js
index 821f594a..7e370e35 100644
--- a/project/floors/sample2.js
+++ b/project/floors/sample2.js
@@ -13,22 +13,22 @@ main.floors.sample2=
     "map": [
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  1,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  1,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,202,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  1,  1, 45,  0,  1,  0,202,202,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,202,202,  0],
-    [  0,  0,  0,  1,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  0,  1,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0, 88,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0],
+    [  1,  1,  1,  1,  1,  0,  0,  1,  1,  1,  1,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  1, 27, 28, 29,  1,  0,202,  1, 27, 28, 29,  1,  0,  0,  0,  1,  0,  0,  0,202,  0,  0,  0,  0,  0,  0],
+    [  1, 31, 32, 33,  1,  0,  0,  1, 31, 32, 33,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  1, 21,258, 22,  1,  0,  0,  1, 21,257, 22,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  1,  1, 82,  1,  1,  0,  0,  1,  1, 81,  1,  1,  0,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0, 22,  0,  0,  0,  0,  0,  0, 21,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0, 45,  0,  1,  0,202,202,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,202,202,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  0,  1,  0,  0,  0,  0],
+    [  0,327,  0,  0,  0,  0, 88,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,202,  0,  0,  0,  0,328,  0,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0],
     [  0,  0,  0,  0,  0,  0,  0, 87,  0,  0,  0,  0,122,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  1,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,202,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,329,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,330,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,202,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  1,  0,  0,202,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0],
     [  0,  0,  0,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0],
@@ -42,9 +42,6 @@ main.floors.sample2=
     "height": 26,
     "firstArrive": [],
     "events": {
-        "3,2": [
-            "123"
-        ],
         "12,12": [
             "234"
         ]
@@ -71,5 +68,6 @@ main.floors.sample2=
 
 ],
     "autoEvent": {},
-    "beforeBattle": {}
+    "beforeBattle": {},
+    "cannotMoveIn": {}
 }
\ No newline at end of file
diff --git a/project/icons.js b/project/icons.js
index fbff0263..c0d6eae8 100644
--- a/project/icons.js
+++ b/project/icons.js
@@ -109,24 +109,8 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
 		"expShop": 9,
 		"moneyShop": 10,
 		"princess": 11,
-		"greenMan": 28,
-		"blueTrader": 29,
-		"octopusLeftTop": 12,
-		"octopusTop": 13,
-		"octopusRightTop": 14,
-		"octopusLeft": 15,
-		"octopusCenter": 16,
-		"octopusRight": 17,
-		"octopusLeftBottom": 18,
-		"octopusRightBottom": 19,
-		"dragonLeftTop": 20,
-		"dragonTop": 21,
-		"dragonRightTop": 22,
-		"dragonLeft": 23,
-		"dragonCenter": 24,
-		"dragonRight": 25,
-		"dragonLeftBottom": 26,
-		"dragonRightBottom": 27
+		"greenMan": 12,
+		"blueTrader": 13
 	},
 	"npc48": {
 		"npc0": 0,
@@ -219,7 +203,11 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
 		"angel": 0,
 		"elemental": 1,
 		"steelGuard": 2,
-		"evilBat": 3
+		"evilBat": 3,
+		"bearDown": 4,
+		"bearLeft": 5,
+		"bearRight": 6,
+		"bearUp": 7
 	},
 	"items": {
 		"yellowKey": 0,
diff --git a/project/images/bear.png b/project/images/bear.png
new file mode 100644
index 00000000..3a0ea543
Binary files /dev/null and b/project/images/bear.png differ
diff --git a/project/images/dragon.png b/project/images/dragon.png
new file mode 100644
index 00000000..ad20aaae
Binary files /dev/null and b/project/images/dragon.png differ
diff --git a/project/maps.js b/project/maps.js
index 6c8d0509..fbf881ca 100644
--- a/project/maps.js
+++ b/project/maps.js
@@ -118,22 +118,6 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"168": {"cls":"terrains","id":"flower","canPass":true},
 	"169": {"cls":"terrains","id":"box","trigger":"pushBox"},
 	"170": {"cls":"terrains","id":"boxed","trigger":"pushBox"},
-	"181": {"cls":"npcs","id":"octopusLeftTop"},
-	"182": {"cls":"npcs","id":"octopusTop"},
-	"183": {"cls":"npcs","id":"octopusRightTop"},
-	"184": {"cls":"npcs","id":"octopusLeft"},
-	"185": {"cls":"npcs","id":"octopusCenter"},
-	"186": {"cls":"npcs","id":"octopusRight"},
-	"187": {"cls":"npcs","id":"octopusLeftBottom"},
-	"188": {"cls":"npcs","id":"octopusRightBottom"},
-	"189": {"cls":"npcs","id":"dragonLeftTop"},
-	"190": {"cls":"npcs","id":"dragonTop"},
-	"191": {"cls":"npcs","id":"dragonRightTop"},
-	"192": {"cls":"npcs","id":"dragonLeft"},
-	"193": {"cls":"npcs","id":"dragonCenter"},
-	"194": {"cls":"npcs","id":"dragonRight"},
-	"195": {"cls":"npcs","id":"dragonLeftBottom"},
-	"196": {"cls":"npcs","id":"dragonRightBottom"},
 	"201": {"cls":"enemys","id":"greenSlime"},
 	"202": {"cls":"enemys","id":"redSlime"},
 	"203": {"cls":"enemys","id":"blackSlime"},
@@ -235,5 +219,9 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"323": {"cls":"npc48","id":"tallSpecialDoor","trigger":"openDoor","name":"高机关门","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"specialKey":1}}},
 	"324": {"cls":"npc48","id":"tallSteelDoor","trigger":"openDoor","name":"高铁门","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"steelKey":1}}},
 	"325": {"cls":"enemys","id":"keiskeiFairy"},
-	"326": {"cls":"enemys","id":"tulipFairy"}
+	"326": {"cls":"enemys","id":"tulipFairy"},
+	"327": {"cls":"enemy48","id":"bearDown"},
+	"328": {"cls":"enemy48","id":"bearLeft"},
+	"329": {"cls":"enemy48","id":"bearRight"},
+	"330": {"cls":"enemy48","id":"bearUp"}
 }
\ No newline at end of file
diff --git a/project/materials/enemy48.png b/project/materials/enemy48.png
index a7f7d0cd..d18a129a 100644
Binary files a/project/materials/enemy48.png and b/project/materials/enemy48.png differ
diff --git a/project/materials/npcs.png b/project/materials/npcs.png
index e37d3498..2bff0872 100644
Binary files a/project/materials/npcs.png and b/project/materials/npcs.png differ