From de4db364551388384a71c5f6fa4fa84825fc5fe4 Mon Sep 17 00:00:00 2001
From: strawberry42271 <2806566736@qq.com>
Date: Wed, 2 Apr 2025 20:25:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/functions.js | 53 +++++---------------------------------------
 1 file changed, 5 insertions(+), 48 deletions(-)

diff --git a/project/functions.js b/project/functions.js
index 1b19e5a..d341984 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -391,8 +391,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	}
 	// 退化
 	if (core.enemys.hasSpecial(special, 21)) {
-		core.status.hero.atk -= (enemy.atkValue || 0);
-		core.status.hero.def -= (enemy.defValue || 0);
+		core.status.hero.atk -= core.getEnemyValue(enemy, "atkValue", x, y) || 0;
+		core.status.hero.def -= core.getEnemyValue(enemy, "defValue", x, y) || 0;
 		if (core.status.hero.atk < 0) core.status.hero.atk = 0;
 		if (core.status.hero.def < 0) core.status.hero.def = 0;
 	}
@@ -774,29 +774,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		mon_mdef = core.getEnemyValue(enemy, "mdef", x, y, floorId) || 0,
 		mon_spell = core.getEnemyValue(enemy, "spell", x, y, floorId) || 0,
 		mon_speed = core.getEnemyValue(enemy, "speed", x, y, floorId) || 1,
-		mon_special = core.getEnemyValue(enemy, "special", x, y, floorId),
-		mon_zone = core.getEnemyValue(enemy, "zone", x, y, floorId),
-		mon_repulse = core.getEnemyValue(enemy, "repulse", x, y, floorId),
-		mon_laser = core.getEnemyValue(enemy, "laser", x, y, floorId),
-		mon_breakArmor = core.getEnemyValue(enemy, "breakArmor", x, y, floorId),
-		mon_counterAttack = core.getEnemyValue(enemy, "counterAttack", x, y, floorId),
-		mon_vampire = core.getEnemyValue(enemy, "vampire", x, y, floorId),
-		mon_hpBuff = core.getEnemyValue(enemy, "hpBuff", x, y, floorId),
-		mon_atkBuff = core.getEnemyValue(enemy, "atkBuff", x, y, floorId),
-		mon_defBuff = core.getEnemyValue(enemy, "defBuff", x, y, floorId),
-		mon_zoneSquare = core.getEnemyValue(enemy, "zoneSquare", x, y, floorId),
-		mon_haloSquare = core.getEnemyValue(enemy, "haloSquare", x, y, floorId),
-		mon_haloRange = core.getEnemyValue(enemy, "haloRange", x, y, floorId),
-		mon_range = core.getEnemyValue(enemy, "range", x, y, floorId),
-		mon_notBomb = core.getEnemyValue(enemy, "notBomb", x, y, floorId),
-		mon_n = core.getEnemyValue(enemy, "n", x, y, floorId),
-		mon_purify = core.getEnemyValue(enemy, "purify", x, y, floorId),
-		mon_add = core.getEnemyValue(enemy, "add", x, y, floorId),
-		mon_haloAdd = core.getEnemyValue(enemy, "haloAdd", x, y, floorId),
-		mon_atkValue = core.getEnemyValue(enemy, "atkValue", x, y, floorId),
-		mon_defValue = core.getEnemyValue(enemy, "defValue", x, y, floorId),
-		mon_damage2 = core.getEnemyValue(enemy, "damage2", x, y, floorId),
-		mon_value = core.getEnemyValue(enemy, "value", x, y, floorId);
+		mon_special = core.getEnemyValue(enemy, "special", x, y, floorId);
 	var mon_money = core.getEnemyValue(enemy, "money", x, y, floorId),
 		mon_exp = core.getEnemyValue(enemy, "exp", x, y, floorId),
 		mon_point = core.getEnemyValue(enemy, "point", x, y, floorId);
@@ -922,29 +900,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		exp: Math.floor(mon_exp),
 		point: Math.floor(mon_point),
 		special: mon_special,
-		guards: guards, // 返回支援情况
-		zone: mon_zone,
-		repulse: mon_repulse,
-		laser: mon_laser,
-		breakArmor: mon_breakArmor,
-		counterAttack: mon_counterAttack,
-		vampire: mon_vampire,
-		hpBuff: mon_hpBuff,
-		atkBuff: mon_atkBuff,
-		defBuff: mon_defBuff,
-		zoneSquare: mon_zoneSquare,
-		haloSquare: mon_haloSquare,
-		haloRange: mon_haloRange,
-		range: mon_range,
-		notBomb: mon_notBomb,
-		n: mon_n,
-		purify: mon_purify,
-		add: mon_add,
-		haloAdd: mon_haloAdd,
-		atkValue: mon_atkValue,
-		defValue: mon_defValue,
-		damage2: mon_damage2,
-		value: mon_value
+		guards: guards // 返回支援情况
+
 	};
 },
         "getDamageInfo": function (enemy, hero, x, y, floorId) {

From 417ef943392a459da7d78bf9bb4076831a32738f Mon Sep 17 00:00:00 2001
From: QuincyAlter <571979627@qq.com>
Date: Thu, 10 Apr 2025 20:14:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E5=8C=BA5F/5F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/enemys.js             |  10 ++++----
 project/floors/jiaocheng01.js |   4 ++--
 project/floors/jiaocheng02.js |  18 +++++++-------
 project/floors/jiaocheng03.js |  16 ++++++-------
 project/floors/yiqu1.js       |   2 +-
 project/floors/yiqu2.js       |   6 ++---
 project/floors/yiqu3.js       |  43 +++++++++++++++++++++++-----------
 project/floors/yiqu4.js       |  43 +++++++++++++++++++++++-----------
 project/floors/yiqu5.js       |  36 +++++++++++++++++-----------
 project/icons.js              |   4 +++-
 project/maps.js               |   2 ++
 project/materials/enemys.png  | Bin 67104 -> 69119 bytes
 12 files changed, 114 insertions(+), 70 deletions(-)

diff --git a/project/enemys.js b/project/enemys.js
index 811acf2..ff7453e 100644
--- a/project/enemys.js
+++ b/project/enemys.js
@@ -10,7 +10,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"vampire": {"name":"冥灵魔王","hp":888,"atk":888,"def":888,"money":888,"exp":888,"point":0,"special":[6],"n":8,"mdef":0,"spell":0,"speed":1},
 	"skeleton": {"name":"骷髅人","hp":77,"atk":77,"def":7,"money":0,"exp":2,"point":0,"special":0,"mdef":0,"spell":0,"speed":17},
 	"skeletonCaptain": {"name":"骷髅队长","hp":226,"atk":66,"def":1,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":18},
-	"zombie": {"name":"兽人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[22],"mdef":0,"spell":0,"speed":1},
+	"zombie": {"name":"兽人","hp":444,"atk":43,"def":9,"money":0,"exp":3,"point":0,"special":[],"mdef":0,"spell":0,"speed":27},
 	"zombieKnight": {"name":"兽人武士","hp":10000,"atk":100,"def":100,"money":0,"exp":0,"point":0,"special":[22],"speed":10,"mdef":0,"damage2":20,"spell":0},
 	"rock": {"name":"石头人","hp":50,"atk":50,"def":0,"money":3,"exp":0,"point":0,"special":3,"damage2":15,"mdef":0,"spell":0,"speed":1},
 	"bluePriest": {"name":"初级法师","hp":108,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"mdef":0,"spell":270,"speed":12},
@@ -30,7 +30,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"skeletonKing": {"name":"骷髅王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"evilHero": {"name":"迷失勇者","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"demonPriest": {"name":"魔神法师","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
-	"goldHornSlime": {"name":"金角怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
+	"goldHornSlime": {"name":"小恶魔","hp":126,"atk":48,"def":12,"money":0,"exp":2,"point":0,"special":0,"mdef":0,"spell":0,"speed":16},
 	"silverSlime": {"name":"银头怪","hp":100,"atk":120,"def":0,"money":15,"exp":0,"point":0,"special":14,"mdef":0,"spell":0,"speed":1},
 	"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":[],"mdef":0,"spell":0,"speed":1},
@@ -43,7 +43,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"evilBat": {"name":"邪恶蝙蝠","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"silverSlimelord": {"name":"银怪王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"goldSlimelord": {"name":"金怪王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
-	"skeletonWarrior": {"name":"骷髅士兵","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
+	"skeletonWarrior": {"name":"骷髅士兵","hp":226,"atk":66,"def":1,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":18,"displayIdInBook":null},
 	"whiteSlimeman": {"name":"水银战士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"slimeman": {"name":"影子战士","hp":243,"atk":28,"def":5,"money":0,"exp":0,"point":0,"special":[],"atkValue":2,"defValue":3,"mdef":0,"spell":0,"speed":69},
 	"yellowGateKeeper": {"name":"初级卫兵","hp":80,"atk":25,"def":5,"money":3,"exp":1,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
@@ -82,5 +82,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"bearRight": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"},"mdef":0,"spell":0,"speed":1},
 	"bearUp": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"},"mdef":0,"spell":0,"speed":1},
 	"E421": {"name":"蓝头怪","hp":104,"atk":33,"def":8,"money":0,"exp":1,"point":0,"special":[],"value":null,"mdef":0,"spell":0,"speed":19,"displayIdInBook":null},
-	"E422": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]}
+	"E422": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]},
+	"E425": {"name":"黄骷髅","hp":226,"atk":66,"def":1,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":18,"displayIdInBook":null},
+	"E426": {"name":"小偷","hp":377,"atk":53,"def":17,"mdef":0,"speed":23,"money":50,"exp":10,"point":0,"special":[],"spell":0}
 }
\ No newline at end of file
diff --git a/project/floors/jiaocheng01.js b/project/floors/jiaocheng01.js
index 2b82f13..61b259a 100644
--- a/project/floors/jiaocheng01.js
+++ b/project/floors/jiaocheng01.js
@@ -262,9 +262,9 @@ main.floors.jiaocheng01=
     [  1,  0,  0, 82,  0,  1, 81,  1, 82,  1,  1,  1,  1],
     [  1, 21,  1,  1,  0,  1, 22,  1,  0,  0, 21, 23,  1],
     [  1,  1,  1,  1, 83,  1,  1,  1,  1,  1,  1,  1,  1],
-    [ 27,  0, 28,  1,  0,124, 82,  0, 22,  1, 31,  0, 32],
+    [401,  0,402,  1,  0,124, 82,  0, 22,  1, 31,  0, 32],
     [  0,  0,  0,  1, 21,  1,  1,  1,  0,  1,  0,  0,  0],
-    [ 29,  0, 30,  1, 23,  1, 21,  1,  0,  1, 34,  0, 33],
+    [403,  0,404,  1, 23,  1, 21,  1,  0,  1, 34,  0, 33],
     [  1,  1,  1,  1,  1,  1,  0,  1, 81,  1,  1,  1,  1],
     [129,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,129],
     [  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1]
diff --git a/project/floors/jiaocheng02.js b/project/floors/jiaocheng02.js
index 0d540ee..8cea02c 100644
--- a/project/floors/jiaocheng02.js
+++ b/project/floors/jiaocheng02.js
@@ -310,19 +310,19 @@ main.floors.jiaocheng02=
     "cannotMove": {},
     "cannotMoveIn": {},
     "map": [
-    [  0, 31,  0,217, 33,  0, 91,  1, 28,  1, 30,  1,203],
-    [216,  1,  0,  1,  1,  1,  1,  1, 28,  1, 30,  1,  1],
-    [216,  1, 31,  1,  0,  0,  0, 81,  0,  1,  0,  1,211],
-    [211,  1, 21,  1,216,  1,216,  1,  1,  1, 81,  1,  1],
-    [  0,  1,  1,  1,  0,  1,  0,  0,  0,211,  0,  0,  0],
-    [ 31,  1, 32,  1,  0,  1,  1,  0,  1,  1,  1,  1,211],
+    [  0, 31,  0,217, 33,  0, 91,  1,402,  1,404,  1,203],
+    [216,  1,  0,  1,  1,  1,  1,  1,402,  1,404,  1,  1],
+    [216,  1, 31,  1,  0,  0,  0, 81,  0,  1,  0,  1,425],
+    [425,  1, 21,  1,216,  1,216,  1,  1,  1, 81,  1,  1],
+    [  0,  1,  1,  1,  0,  1,  0,  0,  0,425,  0,  0,  0],
+    [ 31,  1, 32,  1,  0,  1,  1,  0,  1,  1,  1,  1,425],
     [  0, 82,  0,  1,  0,  1, 21, 33,  1, 33,  0, 81,  0],
     [  0,  1,  1,  1,217,  1,  1,  1,  1,  1,  1,  1, 22],
-    [203,  1, 33,  0,  0, 29, 29, 29, 29,  1,  0,  0,  0],
+    [203,  1, 33,  0,  0,403,403,403,403,  1,  0,  0,  0],
     [  0,  1,  1,  1,  0,  1,  1,  1,  1,  1,203,  1, 82],
-    [ 33,  0,211,  1,  0,  1,  0,203,  0,124,  0,  1,  0],
+    [ 33,  0,425,  1,  0,  1,  0,203,  0,124,  0,  1,  0],
     [  0, 82,  0,  1,217,  1,  0,  1,  1, 81,  1,  1, 21],
-    [216,  0,  0, 22,  0,  1, 93,  1, 27,  0, 27,  1, 21]
+    [216,  0,  0, 22,  0,  1, 93,  1,401,  0,401,  1, 21]
 ],
     "areas": "教程",
     "bgmap": [
diff --git a/project/floors/jiaocheng03.js b/project/floors/jiaocheng03.js
index a037050..cc919bd 100644
--- a/project/floors/jiaocheng03.js
+++ b/project/floors/jiaocheng03.js
@@ -137,18 +137,18 @@ main.floors.jiaocheng03=
     "cannotMove": {},
     "cannotMoveIn": {},
     "map": [
-    [129,  1, 27,  1, 28,  1, 91,  1, 29,  1, 30,  1,129],
+    [129,  1,401,  1,402,  1, 91,  1,403,  1,404,  1,129],
     [ 70,  1, 82,  1, 82,  1,236,  1, 82,  1, 82,  1,375],
-    [  0, 83,  0, 29,  0, 33,  0, 31,  0, 23,  0, 83,  0],
+    [  0, 83,  0,403,  0, 33,  0, 31,  0, 23,  0, 83,  0],
     [  1,  1,  1,  1,  1,  1,219,  1,  1,  1,  1,  1,  1],
-    [  0, 22,  0, 31,  0, 31,  0,  1, 27,  1, 30,  1, 30],
-    [ 81,  1, 81,  1, 81,  1, 22,  1, 27,  1, 30,  1, 27],
-    [ 29,  1, 31,  1, 31,  1,218,  1, 82,  1, 82,  1, 82],
-    [ 28,  1, 28,  1, 29,  1,  0, 81,  0, 33,  0, 21,  0],
+    [  0, 22,  0, 31,  0, 31,  0,  1,401,  1,404,  1,404],
+    [ 81,  1, 81,  1, 81,  1, 22,  1,401,  1,404,  1,401],
+    [403,  1, 31,  1, 31,  1,218,  1, 82,  1, 82,  1, 82],
+    [402,  1,402,  1,403,  1,  0, 81,  0, 33,  0, 21,  0],
     [  1,  1,  1,  1,  1,  1,240,  1,  1,  1,  1,  1,  1],
-    [  0, 33,  0, 21,  0, 29,  0,  1, 27,  1, 28,  1, 31],
+    [  0, 33,  0, 21,  0,403,  0,  1,401,  1,402,  1, 31],
     [ 83,  1, 83,  1, 83,  1,204,  1, 81,  1, 81,  1, 81],
-    [ 28,  1, 30,  1, 27,129,124,204,  0, 33,  0, 23,  0],
+    [402,  1,404,  1,401,129,124,204,  0, 33,  0, 23,  0],
     [  1,  1,  1,  1,  1,  1, 93,  1,  1,  1,  1,  1,  1]
 ],
     "areas": "牢狱",
diff --git a/project/floors/yiqu1.js b/project/floors/yiqu1.js
index 8b64f9f..66c4433 100644
--- a/project/floors/yiqu1.js
+++ b/project/floors/yiqu1.js
@@ -56,7 +56,7 @@ main.floors.yiqu1=
     [  1, 32,  0, 21,  1,  0,  1, 31,  0, 81,201,  0, 21],
     [  1,  1,205,  1,  1,421,  1,  0,  0,  1,  1,  0,  0],
     [  1,  1,  0,  1,  1, 81,  1,  1, 81,  1,202,  0, 31],
-    [ 92,  0,201,  0, 21,  0,202,  0,  0, 82,  0,  1,  1],
+    [ 92,  0,201,  0, 21,  0,202,  0, 21, 82,  0,  1,  1],
     [  1,  1, 81,  1,  1,  0,  1,205,  1,  1,  0,  0, 94],
     [  1,  0, 31,  0,  1,201,  1,  0,  0, 31,  1,205,  1],
     [  1,202,  0,202,  1,  0,  1,402, 21,  0,  1,  0,  1],
diff --git a/project/floors/yiqu2.js b/project/floors/yiqu2.js
index 2ec9eca..16400e4 100644
--- a/project/floors/yiqu2.js
+++ b/project/floors/yiqu2.js
@@ -44,11 +44,11 @@ main.floors.yiqu2=
     [  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
     [  1, 81,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0, 22],
     [  1, 81,  1,  1,  1,  1,  1,  1,  1,  0, 83,  0,403],
-    [ 31,  0,401,209,  0,402,  1,  0, 32,  0,  1,205,  0],
+    [ 31,  0,401,209,  0,402,  1,  0, 34,  0,  1,209,  0],
     [  0,202,  0,  1, 32,  0,  1,405,  0,408,  1, 81,  1],
-    [  1, 81,  1,  1,  0,421,  1,  0,240,  0,  1,  0, 94],
+    [  1, 81,  1,  1,  0,421,  1,  0,204,  0,  1,  0, 94],
     [ 92,  0, 21,  1,  1, 81,  1,  1, 82,  1,  1,205,  1],
-    [  1,  1,  0,202,  0,  0, 32,421,  0,  1, 21,  0,  1],
+    [  1,  1,  0,202,  0,  0, 32,209,  0,  1, 21,  0,  1],
     [  0,201,  0,  1, 81,  1,  1,  1,  0,205,  0,  0,421],
     [202,  1,  1,  1,  0,  1,402,  1,201,  1, 31,  1,  0],
     [  0, 21, 21,  1,  0,202,  0,201,  0,  1,  1,  1, 22]
diff --git a/project/floors/yiqu3.js b/project/floors/yiqu3.js
index 5ae7ffe..6acf6a5 100644
--- a/project/floors/yiqu3.js
+++ b/project/floors/yiqu3.js
@@ -15,7 +15,22 @@ main.floors.yiqu3=
     "eachArrive": [],
     "parallelDo": "",
     "events": {},
-    "changeFloor": {},
+    "changeFloor": {
+        "0,7": {
+            "floorId": "yiqu2",
+            "loc": [
+                12,
+                7
+            ]
+        },
+        "5,0": {
+            "floorId": "yiqu4",
+            "loc": [
+                5,
+                12
+            ]
+        }
+    },
     "beforeBattle": {},
     "afterBattle": {},
     "afterGetItem": {},
@@ -24,19 +39,19 @@ main.floors.yiqu3=
     "cannotMove": {},
     "cannotMoveIn": {},
     "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,  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,  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,  1,  1,  1,  1, 91,  1,  1,  1,  1,  1,  1,  1],
+    [  1,  1,  1,  1,  1,  0,  1,  1,  1, 31, 21,  1,  1],
+    [  1,  1,  1,  1,  1,203,  1,  1,  1,  1, 21,  1,  1],
+    [  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  0,  1,  1],
+    [  1,  1,  1,  1,  1,205,  1,  1,  1,  1, 82,  1,  1],
+    [  1,  0,202,  0,421,  0,421,  0, 31,  0,  0,  1,  1],
+    [  1,201,  1,  1, 81,  1,  1,  1,  1,  1, 81,  1,  1],
+    [ 92,  0,  1, 31,  0,209,  0,  1,403,  0,209,  1,  1],
+    [  1, 81,  1,  0,244,  0, 31,  1,  0,403,  0,  1, 23],
+    [205,  0,  1,  1,  1,  1, 82,  1,205,  1,  1,  1,  0],
+    [  0,209,  1,401,402,  0,  0,  1,  0,  1,244,  0, 31],
+    [205,  0,  1,  1,  1,  1,216,  1, 81,  1,  0, 81,  0],
+    [ 21,  0,203,  0, 31, 21,  0, 81,  0, 82,216,  0,203]
 ],
     "bgmap": [
 
diff --git a/project/floors/yiqu4.js b/project/floors/yiqu4.js
index c3c0f66..7462679 100644
--- a/project/floors/yiqu4.js
+++ b/project/floors/yiqu4.js
@@ -15,7 +15,22 @@ main.floors.yiqu4=
     "eachArrive": [],
     "parallelDo": "",
     "events": {},
-    "changeFloor": {},
+    "changeFloor": {
+        "5,12": {
+            "floorId": "yiqu3",
+            "loc": [
+                5,
+                0
+            ]
+        },
+        "12,11": {
+            "floorId": "yiqu5",
+            "loc": [
+                0,
+                11
+            ]
+        }
+    },
     "beforeBattle": {},
     "afterBattle": {},
     "afterGetItem": {},
@@ -24,19 +39,19 @@ main.floors.yiqu4=
     "cannotMove": {},
     "cannotMoveIn": {},
     "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,  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,  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,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
+    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
+    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
+    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
+    [  1,  1,  1,421,  0,205,  0,421,  1,  1,  1,  1,  1],
+    [  1,  1,  1,  0,  1, 81,  1,  0, 81, 81,  0,205,  0],
+    [  0,244,  0, 31,  1,  0,  1, 31,  1,  1,216,  1, 31],
+    [  0,  1,425,  1,  1, 31,  1,  1, 22,  1,  0,  1,  1],
+    [ 31,  1,  0,  1,401,  1,402,  1,  0,  1, 32,  1,403],
+    [  0, 81, 21,  1,  0,  1,  0,  1,244, 81,  0, 81,  0],
+    [403,  1,  0,  1, 82,  1, 82,  1,  1,  1,216,  1,  1],
+    [  0,  1,421,  0, 21,  0, 32,  0,240, 21,  0,425, 94],
+    [  0,216,  0,  1,  1, 93,  1,  1,  1,  1,  1,  1,  1]
 ],
     "bgmap": [
 
diff --git a/project/floors/yiqu5.js b/project/floors/yiqu5.js
index b2cdbe7..2ebfddd 100644
--- a/project/floors/yiqu5.js
+++ b/project/floors/yiqu5.js
@@ -15,7 +15,15 @@ main.floors.yiqu5=
     "eachArrive": [],
     "parallelDo": "",
     "events": {},
-    "changeFloor": {},
+    "changeFloor": {
+        "0,11": {
+            "floorId": "yiqu4",
+            "loc": [
+                12,
+                11
+            ]
+        }
+    },
     "beforeBattle": {},
     "afterBattle": {},
     "afterGetItem": {},
@@ -24,19 +32,19 @@ main.floors.yiqu5=
     "cannotMove": {},
     "cannotMoveIn": {},
     "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,  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,  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,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
+    [  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1],
+    [  1,  0, 32,  1,  1,  1,426,  1,  1,  1,  1,  1,  1],
+    [  1, 82,  1,  1,  1,  1,  0,  1,  1, 31,  1,  1,  1],
+    [216,  0,216,  1,  1,  1, 83,  1,  1,  0,  1,  1,  1],
+    [  0,  1,  0,  1,  1,209,  0,209,  1, 81,  1,  1,  1],
+    [ 32,  1, 32,  0, 81,  0, 82,  0, 32,  0,216,  0, 22],
+    [  1,  1,  0,  1,  1,244,  1,  1, 81,  1,  1,  1,  1],
+    [ 31,  1,209,  1, 31,  0,403,  1,203,  0,244,  1, 31],
+    [  0,216,  0,  1,  1,  1,  1,  1,  0,203,  0,  1,  0],
+    [  1,  1, 32, 82,  0,402,  1,  1,209,  0, 34,  1, 81],
+    [ 92,  0,  0,  1,  1,  1,  1, 21,  1,  1, 21,  1, 22],
+    [  1,  1, 31, 82,  0,401,  1, 32,  0,425,  0,213,  0]
 ],
     "bgmap": [
 
diff --git a/project/icons.js b/project/icons.js
index 18db1ef..14e3c91 100644
--- a/project/icons.js
+++ b/project/icons.js
@@ -257,7 +257,9 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
 		"tulipFairy": 72,
 		"purpleBowman": 65,
 		"E421": 73,
-		"E422": 73
+		"E422": 73,
+		"E425": 74,
+		"E426": 75
 	},
 	"enemy48": {
 		"angel": 0,
diff --git a/project/maps.js b/project/maps.js
index 4cf3aac..e9b9cf2 100644
--- a/project/maps.js
+++ b/project/maps.js
@@ -323,6 +323,8 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"422": {"cls":"enemys","id":"E422"},
 	"423": {"cls":"items","id":"I423"},
 	"424": {"cls":"items","id":"I424"},
+	"425": {"cls":"enemys","id":"E425"},
+	"426": {"cls":"enemys","id":"E426"},
 	"20034": {"cls":"tileset","id":"X20034","canPass":true},
 	"20154": {"cls":"tileset","id":"X20154","canPass":true},
 	"20216": {"cls":"tileset","id":"X20216","canPass":true},
diff --git a/project/materials/enemys.png b/project/materials/enemys.png
index 1e79d19c98a654a297620c1fa7e053fdfb37e18e..44fb81118d51bd33ace26ed7756c5ec7357da0e9 100644
GIT binary patch
delta 6238
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
U!nJqsivTYDcSXNS*D31%0K_?66951J

delta 4207
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