Merge branch 'shengqishi' into feature

Modify some enemys and items, add some notifies
光明血瓶和黑暗雪萍不再挡路；调整了难度；修复黑暗神使；修复西武区倍率
2024-08-25 12:34:07 +08:00 · 2024-08-25 12:32:55 +08:00 · 2024-08-25 12:19:48 +08:00
53 changed files with 382 additions and 86 deletions
--- a/project/animates/baofa.animate
+++ b/project/animates/baofa.animate
--- a/project/animates/dark2.animate
+++ b/project/animates/dark2.animate
--- a/project/animates/dark_1.animate
+++ b/project/animates/dark_1.animate
--- a/project/animates/dazhaofadong.animate
+++ b/project/animates/dazhaofadong.animate
--- a/project/animates/explosion_small.animate
+++ b/project/animates/explosion_small.animate
--- a/project/animates/hongguang.animate
+++ b/project/animates/hongguang.animate
--- a/project/animates/hunanxuehua.animate
+++ b/project/animates/hunanxuehua.animate
--- a/project/animates/jianxue.animate
+++ b/project/animates/jianxue.animate
--- a/project/animates/lvup.animate
+++ b/project/animates/lvup.animate
--- a/project/animates/morphattack.animate
+++ b/project/animates/morphattack.animate
--- a/project/animates/petit2.animate
+++ b/project/animates/petit2.animate
--- a/project/animates/petit3.animate
+++ b/project/animates/petit3.animate
--- a/project/animates/purify.animate
+++ b/project/animates/purify.animate
--- a/project/animates/shengdun.animate
+++ b/project/animates/shengdun.animate
--- a/project/animates/skill2.animate
+++ b/project/animates/skill2.animate
--- a/project/animates/support1.animate
+++ b/project/animates/support1.animate
--- a/project/animates/sword5_1.animate
+++ b/project/animates/sword5_1.animate
--- a/project/data.js
+++ b/project/data.js
@ -186,7 +186,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"HA17",
 			"HA18",
 			"HA19",
-			"HA20"
+			"HA20",
+			"MM6"
 		],
 		"floorPartitions": [],
 		"images": [
@ -263,6 +264,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"balloonspeak",
 			"balloontan",
 			"balloonwen",
+			"baofa",
 			"baozha",
 			"baozha2",
 			"bigExplosion",
@ -275,12 +277,16 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"chanrao",
 			"chuansong",
 			"dark",
+			"dark2",
 			"dark3",
+			"dark_1",
 			"darkattack",
+			"dazhaofadong",
 			"defUp",
 			"die",
 			"double",
 			"emo",
+			"explosion_small",
 			"fire",
 			"fire2",
 			"fire3",
@ -291,17 +297,28 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"hand2",
 			"heal",
 			"heidong3",
+			"hongguang",
+			"hunanxuehua",
 			"ice",
 			"jianji",
+			"jianxue",
 			"jinshu",
 			"jinshu2",
 			"jinshu3",
 			"kulou",
 			"light",
+			"lvup",
+			"morphattack",
+			"petit2",
+			"petit3",
+			"purify",
 			"rage_buff",
 			"re",
 			"red",
 			"sg",
+			"shengdun",
+			"skill2",
+			"support1",
 			"sur",
 			"sword",
 			"sword1",
@ -309,6 +326,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"sword3",
 			"sword4",
 			"sword5",
+			"sword5_1",
 			"sword6",
 			"swordN",
 			"thunder",
@ -348,18 +366,30 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"049-Explosion02.ogg",
 			"050-Explosion03.ogg",
 			"051-Explosion04.ogg",
+			"053-Cannon02.mp3",
+			"054-Cannon03.ogg",
 			"061-Thunderclap01.ogg",
+			"064-Swing03.mp3",
 			"073-Animal08.ogg",
 			"085-Monster07.ogg",
+			"086-Action01.ogg",
+			"098-Attack10.mp3",
 			"099-Attack11.mp3",
 			"1.flac",
+			"112-Heal08.ogg",
 			"120-Ice01.ogg",
 			"121-Ice02.ogg",
 			"122-Ice03.ogg",
+			"123-Thunder01.mp3",
+			"129-Earth01.mp3",
 			"129-Earth01.ogg",
 			"130-Earth02.ogg",
 			"131-Earth03.ogg",
+			"143-Support01.mp3",
+			"177-Skill21.mp3",
+			"180-Skill24.mp3",
 			"2.ogg",
+			"Bell.mp3",
 			"Ice7.mp3",
 			"LocoHorn.ogg",
 			"MaleScream.mp3",
@ -426,6 +456,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"leiji.mp3",
 			"levelup.mp3",
 			"light.mp3",
+			"lingyu.mp3",
 			"load.mp3",
 			"luodi.mp3",
 			"open_ui.mp3",
@ -490,18 +521,16 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 					1
 				],
 				"action": [
-					"简单模式赠送100瓶琼浆和100瓶玉露",
+					"简单难度琼浆玉露和神之血效果翻倍，玉露效果为回满血后再得一瓶琼浆。同时送琼浆玉露各【10】瓶。",
 					{
 						"type": "setValue",
 						"name": "item:I415",
-						"operator": "+=",
-						"value": "100"
+						"value": "10"
 					},
 					{
 						"type": "setValue",
 						"name": "item:I416",
-						"operator": "+=",
-						"value": "100"
+						"value": "10"
 					}
 				]
 			},
@ -511,11 +540,25 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 				"hard": 3,
 				"color": [
 					255,
-					68,
+					255,
 					64,
 					1
 				],
 				"action": []
+			},
+			{
+				"title": "？？？",
+				"name": "???",
+				"hard": 4,
+				"color": [
+					255,
+					68,
+					64,
+					1
+				],
+				"action": [
+					"？？？难度琼浆玉露和神之血效果归零。"
+				]
 			}
 		],
 		"equipName": [
--- a/project/enemys.js
+++ b/project/enemys.js
@ -26,8 +26,8 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"goldSlime": {"name":"金史莱姆","hp":888,"atk":525,"def":95,"money":20,"exp":0,"point":0,"special":[21,39],"mdefValue":20,"Atkvalue":2,"Defvalue":2,"Mdefvalue":null},
 	"poisonSkeleton": {"name":"紫骷髅","hp":1200,"atk":680,"def":100,"money":40,"exp":0,"point":0,"special":[6],"n":5,"notBomb":true,"afterBattle":null},
 	"poisonBat": {"name":"紫蝙蝠","hp":1000,"atk":450,"def":135,"money":24,"exp":0,"point":0,"special":[1]},
-	"skeletonPriest": {"name":"骷髅法师","hp":36000,"atk":1550,"def":1225,"money":84,"exp":0,"point":0,"special":[],"damage":1000,"notBomb":false,"displayIdInBook":null,"level":"灵海高阶","fantan":30},
-	"skeletonKing": {"name":"骷髅王","hp":38500,"atk":1650,"def":1025,"money":84,"exp":0,"point":0,"special":[36],"damage":1000,"notBomb":false,"displayIdInBook":null,"level":"灵海高阶","fantan":30,"X":20},
+	"skeletonPriest": {"name":"骷髅法师","hp":28000,"atk":1550,"def":1225,"money":84,"exp":0,"point":0,"special":[],"damage":1000,"notBomb":false,"displayIdInBook":null,"level":"灵海高阶","fantan":30},
+	"skeletonKing": {"name":"骷髅王","hp":32500,"atk":1650,"def":1025,"money":84,"exp":0,"point":0,"special":[36],"damage":1000,"notBomb":false,"displayIdInBook":null,"level":"灵海高阶","fantan":30,"X":20},
 	"evilHero": {"name":"须弥勇者","hp":72000,"atk":2150,"def":1540,"money":120,"exp":0,"point":0,"special":[30],"level":"玄海初阶","notBomb":true,"value30_1":2000,"value30_2":30},
 	"demonPriest": {"name":"希羽","hp":2000000,"atk":300000,"def":225000,"money":5000,"exp":0,"point":0,"special":[30,36],"value30_1":10000,"value30_2":30,"notBomb":true,"X":15,"displayIdInBook":"四阶无上"},
 	"goldHornSlime": {"name":"金角怪","hp":5000,"atk":740,"def":405,"money":56,"exp":0,"point":0,"special":[32],"X":12,"W":20,"displayIdInBook":null,"Z":60,"level":"地品初阶"},
@ -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},
 	"silverSlimelord": {"name":"银史莱姆王","hp":450,"atk":185,"def":68,"money":12,"exp":0,"point":0,"special":[2,5]},
 	"goldSlimelord": {"name":"金史莱姆王","hp":6250,"atk":2100,"def":255,"money":32,"exp":0,"point":0,"special":[37],"displayIdInBook":null,"Y":50},
-	"skeletonWarrior": {"name":"骷髅士兵","hp":66,"atk":58,"def":32,"money":8,"exp":0,"point":0,"special":[36],"purify":1,"level":"灵品高阶","X":30},
+	"skeletonWarrior": {"name":"骷髅士兵","hp":66,"atk":68,"def":22,"money":8,"exp":0,"point":0,"special":[32,36],"purify":1,"level":"灵品高阶","X":30,"Z":50},
 	"whiteSlimeman": {"name":"水银战士","hp":333,"atk":135,"def":24,"money":8,"exp":0,"point":0,"special":[9,31],"purify":2},
 	"slimeman": {"name":"幽灵","hp":245,"atk":135,"def":55,"money":18,"exp":0,"point":0,"special":[6],"atkValue":2,"defValue":3,"n":4,"level":"玄品中阶"},
 	"yellowGateKeeper": {"name":"初级卫兵","hp":158,"atk":65,"def":10,"money":12,"exp":0,"point":0,"special":[22],"damage":50,"level":"灵品高阶"},
@ -53,7 +53,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"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":450000,"atk":13680,"def":5800,"money":500,"exp":0,"point":0,"special":[5,35,39],"bigImage":"dragon_0.png","Atkvalue":20,"Defvalue":20,"notBomb":true},
-	"skeletonKnight": {"name":"骷髅武士","hp":30000,"atk":1800,"def":1380,"money":88,"exp":0,"point":0,"special":0,"level":"玄海初阶"},
+	"skeletonKnight": {"name":"骷髅武士","hp":25000,"atk":1800,"def":1380,"money":88,"exp":0,"point":0,"special":0,"level":"玄海初阶"},
 	"skeletonPresbyter": {"name":"骷髅巫师","hp":39000,"atk":1000,"def":650,"money":78,"exp":0,"point":0,"special":[2],"level":"灵海高阶"},
 	"ironRock": {"name":"铁面人","hp":5000,"atk":842,"def":0,"money":42,"exp":0,"point":0,"special":[3],"displayIdInBook":null},
 	"grayRock": {"name":"灰石人","hp":20000,"atk":350,"def":2780,"money":48,"exp":0,"point":0,"special":[]},
@ -72,7 +72,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"blackKing": {"name":"黑衣魔王","hp":8500,"atk":880,"def":480,"money":60,"exp":0,"point":0,"special":[37],"level":"地品中阶","displayIdInBook":null,"Y":10},
 	"yellowKing": {"name":"黄衣魔王","hp":128000,"atk":11200,"def":7200,"money":120,"exp":0,"point":0,"special":[36],"X":10,"Y":10,"level":"武海高阶"},
 	"greenKing": {"name":"青衣武士","hp":145000,"atk":10250,"def":6600,"money":112,"exp":0,"point":0,"special":[22],"damage":20000,"level":"武海高阶"},
-	"redKing": {"name":"魔王","hp":28000,"atk":980,"def":545,"money":64,"exp":0,"point":0,"special":[22],"damage":1000,"notBomb":false,"level":"地品高阶"},
+	"redKing": {"name":"魔王","hp":28000,"atk":980,"def":545,"money":64,"exp":0,"point":0,"special":[22],"damage":1000,"notBomb":false,"level":"地品高阶","beforeBattle":[{"type":"if","condition":"(flag:shengqishi>8)","true":[{"type":"animate","name":"sword"},{"type":"setBlock","number":"N472"},"\t[${flag:shengqishi_name},N472]\b[this]此等骑士，不堪一击！",{"type":"setValue","name":"status:money","operator":"+=","value":"64"},"${flag:shengqishi_name}击杀魔王，获得64枚金币。",{"type":"hide","remove":true}],"false":[]}]},
 	"blueKing": {"name":"魔卫","hp":7200,"atk":765,"def":360,"money":54,"exp":0,"point":0,"special":[],"level":"地品初阶","displayIdInBook":null},
 	"keiskeiFairy": {"name":"铃兰花妖","hp":33000,"atk":4080,"def":1150,"money":48,"exp":0,"point":0,"special":[9,40],"purify":1},
 	"tulipFairy": {"name":"郁金香花妖","hp":830,"atk":380,"def":145,"money":34,"exp":0,"point":0,"special":[30,36],"damage":300,"displayIdInBook":null,"level":"武品初阶","X":60,"notBomb":true,"value30_1":1000,"value30_2":10},
@ -253,7 +253,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E730": {"name":"青谷史莱姆","hp":25000,"atk":1350,"def":725,"money":74,"exp":0,"point":0,"special":[],"damage":1000,"notBomb":false,"displayIdInBook":null,"level":"灵海中阶"},
 	"E731": {"name":"谷史莱姆王","hp":40000,"atk":1750,"def":925,"money":80,"exp":0,"point":0,"special":[29],"damage":1000,"notBomb":false,"displayIdInBook":null,"level":"灵海高阶","fantan":20},
 	"E732": {"name":"利剑绿史","hp":72000,"atk":6200,"def":3400,"money":96,"exp":0,"point":0,"special":[36],"level":"武海初阶","X":15},
-	"E733": {"name":"利剑红史","hp":78000,"atk":6500,"def":3650,"money":94,"exp":0,"point":0,"special":[],"level":"武海初阶"},
+	"E733": {"name":"利剑红史","hp":78000,"atk":6500,"def":3650,"money":94,"exp":0,"point":0,"special":[],"level":"武海初阶","beforeBattle":[{"type":"if","condition":"(flag:shengqishi>20)","true":[{"type":"animate","name":"sword"},{"type":"setBlock","number":"N472"},"\t[${flag:shengqishi_name},N472]\b[this]此等骑士，不堪一击！",{"type":"setValue","name":"status:money","operator":"+=","value":"95"},"${flag:shengqishi_name}击杀怪物，获得95枚金币。",{"type":"hide","remove":true}],"false":[]}]},
 	"E734": {"name":"利剑青史","hp":85000,"atk":7050,"def":3500,"money":98,"exp":0,"point":0,"special":[],"level":"武海初阶"},
 	"E735": {"name":"利剑史王","hp":115000,"atk":6850,"def":4650,"money":100,"exp":0,"point":0,"special":[],"level":"武海中阶"},
 	"E736": {"name":"僵尸史莱姆王","hp":6500,"atk":720,"def":365,"money":120,"exp":0,"point":0,"special":[],"level":"地品初阶"},
@ -262,14 +262,14 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E739": {"name":"骷髅金将","hp":205000,"atk":6400,"def":3520,"money":300,"exp":0,"point":0,"special":[30,37],"level":"玄海高阶","Y":20,"displayIdInBook":null,"notBomb":true,"value30_1":2000,"value30_2":60},
 	"E740": {"name":"骷髅地将","hp":125000,"atk":5800,"def":3220,"money":100,"exp":0,"point":0,"special":[37],"level":"玄海高阶","Y":10,"displayIdInBook":null},
 	"E741": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
-	"E742": {"name":"骷髅玄将","hp":55000,"atk":4600,"def":2080,"money":94,"exp":0,"point":0,"special":[37],"level":"玄海中阶","Y":15},
+	"E742": {"name":"骷髅玄将","hp":45000,"atk":4600,"def":2080,"money":94,"exp":0,"point":0,"special":[37],"level":"玄海中阶","Y":15,"beforeBattle":null},
 	"E743": {"name":"骷髅高武","hp":34000,"atk":4200,"def":2400,"money":94,"exp":0,"point":0,"special":[36],"level":"玄海中阶","displayIdInBook":null,"X":20},
 	"E744": {"name":"炽烈蝙蝠","hp":28000,"atk":1620,"def":780,"money":76,"exp":0,"point":0,"special":[],"damage":1000,"notBomb":false,"displayIdInBook":null,"level":"灵海中阶"},
 	"E745": {"name":"大灰蝙蝠","hp":44000,"atk":1620,"def":880,"money":78,"exp":0,"point":0,"special":[],"damage":1000,"notBomb":false,"displayIdInBook":null,"level":"灵海中阶"},
-	"E746": {"name":"阴阳蝙蝠","hp":50000,"atk":3800,"def":1500,"money":92,"exp":0,"point":0,"special":[38],"level":"玄海中阶"},
+	"E746": {"name":"阴阳蝙蝠","hp":30000,"atk":3800,"def":1500,"money":92,"exp":0,"point":0,"special":[38],"level":"玄海中阶","beforeBattle":[{"type":"if","condition":"(flag:shengqishi>16)","true":[{"type":"animate","name":"sword"},{"type":"setBlock","number":"N472"},"\t[${flag:shengqishi_name},N472]\b[this]此等骑士，不堪一击！",{"type":"setValue","name":"status:money","operator":"+=","value":"95"},"${flag:shengqishi_name}击杀怪物，获得95枚金币。",{"type":"hide","remove":true}],"false":[]}]},
 	"E747": {"name":"毒毛虫","hp":18400,"atk":3000,"def":500,"money":86,"exp":0,"point":0,"special":[],"level":"玄海初阶"},
 	"E748": {"name":"苍蝇","hp":28000,"atk":2800,"def":1200,"money":80,"exp":0,"point":0,"special":[],"level":"玄海初阶"},
-	"E749": {"name":"大眼虫","hp":25000,"atk":3250,"def":1800,"money":84,"exp":0,"point":0,"special":[],"level":"玄海初阶"},
+	"E749": {"name":"大眼虫","hp":21000,"atk":3250,"def":1800,"money":84,"exp":0,"point":0,"special":[],"level":"玄海初阶"},
 	"E750": {"name":"胡蜂","hp":20000,"atk":2780,"def":1600,"money":88,"exp":0,"point":0,"special":[],"level":"玄海初阶"},
 	"E751": {"name":"悬骨蝙蝠","hp":105000,"atk":3000,"def":4500,"money":100,"exp":0,"point":0,"special":[2],"level":"武海中阶"},
 	"E752": {"name":"溶胶莱姆","hp":135000,"atk":13200,"def":5400,"money":108,"exp":0,"point":0,"special":[],"level":"地海初阶"},
@ -277,45 +277,45 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E754": {"name":"金钻岩","hp":160000,"atk":1050,"def":0,"money":100,"exp":0,"point":0,"special":[36,37],"level":"地海初阶","X":90,"Y":95},
 	"E755": {"name":"七彩魔石","hp":1220000,"atk":450000,"def":0,"money":480,"exp":0,"point":0,"special":[32,37],"level":"五阶无上","Y":15,"Z":95},
 	"E756": {"name":"闪光人","hp":112000,"atk":14500,"def":5000,"money":100,"exp":0,"point":0,"special":[],"level":"地海初阶"},
-	"E757": {"name":"蓝晶人","hp":110000,"atk":8800,"def":5000,"money":106,"exp":0,"point":0,"special":[36],"level":"地海初阶","X":50},
+	"E757": {"name":"蓝晶人","hp":110000,"atk":8800,"def":5000,"money":106,"exp":0,"point":0,"special":[36],"level":"地海初阶","X":50,"beforeBattle":[{"type":"if","condition":"(flag:shengqishi>26)","true":[{"type":"animate","name":"sword"},{"type":"setBlock","number":"N472"},"\t[${flag:shengqishi_name},N472]\b[this]此等骑士，不堪一击！",{"type":"setValue","name":"status:money","operator":"+=","value":"108"},"${flag:shengqishi_name}击杀怪物，获得108枚金币。",{"type":"hide","remove":true}],"false":[]}]},
 	"E758": {"name":"青灵人","hp":185000,"atk":9400,"def":8550,"money":112,"exp":0,"point":0,"special":[36],"level":"地海中阶","X":35,"displayIdInBook":null},
 	"E759": {"name":"四抓人","hp":160000,"atk":16500,"def":9200,"money":116,"exp":0,"point":0,"special":[],"level":"地海中阶","X":40,"displayIdInBook":null},
 	"E760": {"name":"小型邪龙","hp":240000,"atk":15800,"def":10500,"money":122,"exp":0,"point":0,"special":[],"level":"地海高阶","X":40,"displayIdInBook":null},
-	"E761": {"name":"扭曲章鱼","hp":240000,"atk":21200,"def":11800,"money":120,"exp":0,"point":0,"special":[],"level":"天海初阶"},
+	"E761": {"name":"扭曲章鱼","hp":210000,"atk":21200,"def":11800,"money":120,"exp":0,"point":0,"special":[],"level":"天海初阶","beforeBattle":[{"type":"if","condition":"(flag:shengqishi>16)","true":[{"type":"animate","name":"sword"},{"type":"setBlock","number":"N472"},"\t[${flag:shengqishi_name},N472]\b[this]此等骑士，不堪一击！",{"type":"setValue","name":"status:money","operator":"+=","value":"122"},"${flag:shengqishi_name}击杀怪物，获得122枚金币。",{"type":"hide","remove":true}],"false":[]}]},
 	"E762": {"name":"绿蛙魔","hp":180000,"atk":18200,"def":12000,"money":122,"exp":0,"point":0,"special":[36],"X":25,"level":"天海初阶"},
-	"E763": {"name":"蓝飞魔","hp":225000,"atk":20000,"def":13200,"money":128,"exp":0,"point":0,"special":[],"level":"天海初阶"},
-	"E764": {"name":"墨幽灵","hp":245000,"atk":24000,"def":14200,"money":136,"exp":0,"point":0,"special":[],"level":"天海初阶","displayIdInBook":null},
-	"E765": {"name":"天魔","hp":285000,"atk":26000,"def":15200,"money":142,"exp":0,"point":0,"special":[],"level":"天海中阶","displayIdInBook":null},
-	"E766": {"name":"恶灵裁决","hp":305000,"atk":25800,"def":16000,"money":144,"exp":0,"point":0,"special":[],"level":"天海中阶","displayIdInBook":null},
+	"E763": {"name":"蓝飞魔","hp":195000,"atk":20000,"def":13200,"money":128,"exp":0,"point":0,"special":[],"level":"天海初阶"},
+	"E764": {"name":"墨幽灵","hp":215000,"atk":26000,"def":14200,"money":136,"exp":0,"point":0,"special":[36],"level":"天海初阶","displayIdInBook":null,"X":30},
+	"E765": {"name":"天魔","hp":255000,"atk":27500,"def":15200,"money":142,"exp":0,"point":0,"special":[36],"level":"天海中阶","displayIdInBook":null,"X":20},
+	"E766": {"name":"恶灵裁决","hp":255000,"atk":28800,"def":16000,"money":144,"exp":0,"point":0,"special":[36],"level":"天海中阶","displayIdInBook":null,"X":20},
 	"E767": {"name":"无虞守卫","hp":650000,"atk":48000,"def":30500,"money":1000,"exp":0,"point":0,"special":[],"notBomb":true,"level":"天海高阶"},
-	"E768": {"name":"地下盲蛇","hp":218000,"atk":35000,"def":23500,"money":200,"exp":0,"point":0,"special":[],"level":"天海初阶"},
+	"E768": {"name":"地下盲蛇","hp":208000,"atk":35000,"def":23500,"money":200,"exp":0,"point":0,"special":[],"level":"天海初阶"},
 	"E769": {"name":"黑暗法师","hp":1500000,"atk":250000,"def":210000,"money":520,"exp":0,"point":0,"special":[2],"level":"五阶无上","beforeBattle":[{"type":"if","condition":"(flag:heianshengzi===1)","true":["\t[黑暗法师,E769]\b[this]吾之荣耀即忠诚！",{"type":"setValue","name":"item:I345","operator":"+=","value":"1"},{"type":"hide","remove":true}],"false":[]}]},
 	"E770": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E771": {"name":"黑暗蝙蝠","hp":2000000,"atk":440000,"def":80000,"money":440,"exp":0,"point":0,"special":[40],"level":"五阶无上"},
-	"E772": {"name":"红丧尸","hp":200000,"atk":40000,"def":21000,"money":180,"exp":0,"point":0,"special":[],"level":"天海初阶"},
+	"E772": {"name":"红丧尸","hp":180000,"atk":40000,"def":21000,"money":180,"exp":0,"point":0,"special":[],"level":"天海初阶"},
 	"E773": {"name":"赤丧尸武士","hp":320000,"atk":44500,"def":28000,"money":260,"exp":0,"point":0,"special":[],"level":"天海中阶","displayIdInBook":null},
-	"E774": {"name":"黄丧尸","hp":220000,"atk":39000,"def":15000,"money":160,"exp":0,"point":0,"special":[],"level":"天海初阶"},
-	"E775": {"name":"紫丧尸","hp":280000,"atk":45000,"def":25000,"money":240,"exp":0,"point":0,"special":[],"level":"天海中阶"},
+	"E774": {"name":"黄丧尸","hp":210000,"atk":39000,"def":15000,"money":160,"exp":0,"point":0,"special":[],"level":"天海初阶"},
+	"E775": {"name":"紫丧尸","hp":250000,"atk":45000,"def":25000,"money":240,"exp":0,"point":0,"special":[36],"level":"天海中阶","X":20,"beforeBattle":[{"type":"if","condition":"(flag:shengqishi>32)","true":[{"type":"animate","name":"sword"},{"type":"setBlock","number":"N472"},"\t[${flag:shengqishi_name},N472]\b[this]此等骑士，不堪一击！",{"type":"setValue","name":"status:money","operator":"+=","value":"244"},"${flag:shengqishi_name}击杀怪物，获得244枚金币。",{"type":"hide","remove":true}],"false":[]}]},
 	"E776": {"name":"进阶丧尸武士","hp":860000,"atk":54000,"def":36000,"money":300,"exp":0,"point":0,"special":[],"level":"天海高阶","displayIdInBook":null},
-	"E777": {"name":"骷髅兽人","hp":250000,"atk":59500,"def":35000,"money":220,"exp":0,"point":0,"special":[],"level":"圣武初阶","notBomb":true,"displayIdInBook":null},
-	"E778": {"name":"魔法兽人","hp":300000,"atk":54000,"def":37500,"money":200,"exp":0,"point":0,"special":[36],"level":"圣武初阶","notBomb":true,"displayIdInBook":null,"X":15},
-	"E779": {"name":"穿甲兽人","hp":260000,"atk":60500,"def":40500,"money":200,"exp":0,"point":0,"special":[36,37],"level":"圣武中阶","notBomb":true,"displayIdInBook":null,"X":10,"Y":10},
-	"E780": {"name":"硬头龟","hp":450000,"atk":72000,"def":18500,"money":240,"exp":0,"point":0,"special":[36],"level":"圣武初阶","notBomb":true,"displayIdInBook":null,"X":10},
-	"E781": {"name":"卓棒龟","hp":520000,"atk":62000,"def":32500,"money":260,"exp":0,"point":0,"special":[30,36],"level":"圣武中阶","notBomb":true,"displayIdInBook":null,"X":25,"Y":0,"value30_1":1000,"value30_2":10},
+	"E777": {"name":"骷髅兽人","hp":125000,"atk":59500,"def":35400,"money":220,"exp":0,"point":0,"special":[],"level":"圣武初阶","notBomb":true,"displayIdInBook":null},
+	"E778": {"name":"魔法兽人","hp":150000,"atk":58000,"def":37500,"money":200,"exp":0,"point":0,"special":[36],"level":"圣武初阶","notBomb":true,"displayIdInBook":null,"X":15},
+	"E779": {"name":"穿甲兽人","hp":130000,"atk":63500,"def":40500,"money":200,"exp":0,"point":0,"special":[36,37],"level":"圣武中阶","notBomb":true,"displayIdInBook":null,"X":10,"Y":10},
+	"E780": {"name":"硬头龟","hp":228000,"atk":72500,"def":18500,"money":240,"exp":0,"point":0,"special":[36],"level":"圣武初阶","notBomb":true,"displayIdInBook":null,"X":10},
+	"E781": {"name":"卓棒龟","hp":260000,"atk":62500,"def":32500,"money":260,"exp":0,"point":0,"special":[30,36],"level":"圣武中阶","notBomb":true,"displayIdInBook":null,"X":25,"Y":0,"value30_1":1000,"value30_2":10},
 	"E782": {"name":"玄灵龟","hp":320000,"atk":65000,"def":44500,"money":300,"exp":0,"point":0,"special":[36],"level":"圣武高阶","notBomb":true,"displayIdInBook":null,"X":35,"Y":15},
 	"E783": {"name":"绿飞虫","hp":240000,"atk":82000,"def":32500,"money":300,"exp":0,"point":0,"special":[30],"level":"圣武高阶","notBomb":true,"displayIdInBook":null,"X":30,"Y":15,"value30_2":20,"value30_1":1500},
-	"E784": {"name":"大爬虫","hp":270000,"atk":80000,"def":35500,"money":320,"exp":0,"point":0,"special":[],"level":"圣武高阶","notBomb":true,"displayIdInBook":null,"X":35,"Y":15},
-	"E785": {"name":"猪猪虫","hp":360000,"atk":84000,"def":46500,"money":340,"exp":0,"point":0,"special":[],"level":"圣武高阶","notBomb":true,"displayIdInBook":null,"X":35,"Y":15},
-	"E786": {"name":"大胖虫","hp":670000,"atk":8000,"def":55500,"money":280,"exp":0,"point":0,"special":[2,32],"level":"圣武高阶","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"Z":50},
-	"E787": {"name":"紫盾武士","hp":1060000,"atk":112000,"def":49500,"money":420,"exp":0,"point":0,"special":[30],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":20,"value30_1":1200},
-	"E788": {"name":"黄盾武士","hp":860000,"atk":104000,"def":56500,"money":400,"exp":0,"point":0,"special":[30],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_1":1250,"value30_2":20},
+	"E784": {"name":"大爬虫","hp":270000,"atk":80000,"def":35500,"money":320,"exp":0,"point":0,"special":[],"level":"圣武高阶","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"beforeBattle":[{"type":"if","condition":"(flag:shengqishi>36)","true":[{"type":"animate","name":"sword"},{"type":"setBlock","number":"N472"},"\t[${flag:shengqishi_name},N472]\b[this]此等骑士，不堪一击！",{"type":"setValue","name":"status:money","operator":"+=","value":"322"},"${flag:shengqishi_name}击杀魔王，获得322枚金币。",{"type":"hide","remove":true}],"false":[]}]},
+	"E785": {"name":"猪猪虫","hp":260000,"atk":84000,"def":46500,"money":340,"exp":0,"point":0,"special":[],"level":"圣武高阶","notBomb":true,"displayIdInBook":null,"X":35,"Y":15},
+	"E786": {"name":"大胖虫","hp":470000,"atk":8000,"def":55500,"money":280,"exp":0,"point":0,"special":[2,32],"level":"圣武高阶","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"Z":50},
+	"E787": {"name":"紫盾武士","hp":760000,"atk":112000,"def":49500,"money":420,"exp":0,"point":0,"special":[30],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":20,"value30_1":1200},
+	"E788": {"name":"黄盾武士","hp":560000,"atk":104000,"def":56500,"money":400,"exp":0,"point":0,"special":[30],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_1":1250,"value30_2":20},
 	"E789": {"name":"灵石兽","hp":160000,"atk":152000,"def":100500,"money":800,"exp":0,"point":0,"special":[30,32],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":3000,"Z":90},
-	"E790": {"name":"双手剑士","hp":550000,"atk":140000,"def":60500,"money":350,"exp":0,"point":0,"special":[30],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":1000,"Z":90},
-	"E791": {"name":"赤色双手剑士","hp":420000,"atk":142000,"def":72000,"money":360,"exp":0,"point":0,"special":[],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":1000,"Z":90},
-	"E792": {"name":"紫金双手剑士","hp":580000,"atk":154000,"def":75000,"money":400,"exp":0,"point":0,"special":[],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":1000,"Z":90},
-	"E793": {"name":"黑衣元帅","hp":560000,"atk":154000,"def":95000,"money":450,"exp":0,"point":0,"special":[],"level":"二阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":1000,"Z":90},
-	"E794": {"name":"黄色武士","hp":820000,"atk":162000,"def":42000,"money":380,"exp":0,"point":0,"special":[],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":1000,"Z":90},
-	"E795": {"name":"蓝色武士","hp":420000,"atk":142000,"def":102000,"money":480,"exp":0,"point":0,"special":[36],"level":"二阶无上","notBomb":true,"displayIdInBook":null,"X":30,"Y":null,"value30_2":30,"value30_1":1000,"Z":null},
+	"E790": {"name":"双手剑士","hp":350000,"atk":145000,"def":60500,"money":350,"exp":0,"point":0,"special":[30],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":1000,"Z":90},
+	"E791": {"name":"赤色双手剑士","hp":220000,"atk":147000,"def":72000,"money":360,"exp":0,"point":0,"special":[],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":1000,"Z":90,"beforeBattle":[{"type":"if","condition":"(flag:shengqishi>42)","true":[{"type":"animate","name":"sword"},{"type":"setBlock","number":"N510"},"\t[${flag:shengqishi_name},N472]\b[this]此等骑士，不堪一击！",{"type":"setValue","name":"status:money","operator":"+=","value":"364"},"${flag:shengqishi_name}击杀怪物，获得364枚金币。",{"type":"hide","remove":true}],"false":[]}]},
+	"E792": {"name":"紫金双手剑士","hp":380000,"atk":156000,"def":75000,"money":400,"exp":0,"point":0,"special":[],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":1000,"Z":90},
+	"E793": {"name":"黑衣元帅","hp":360000,"atk":154000,"def":95000,"money":450,"exp":0,"point":0,"special":[],"level":"二阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":1000,"Z":90},
+	"E794": {"name":"黄色武士","hp":520000,"atk":167000,"def":42000,"money":380,"exp":0,"point":0,"special":[],"level":"一阶无上","notBomb":true,"displayIdInBook":null,"X":35,"Y":15,"value30_2":30,"value30_1":1000,"Z":90},
+	"E795": {"name":"蓝色武士","hp":220000,"atk":147000,"def":102000,"money":480,"exp":0,"point":0,"special":[36],"level":"二阶无上","notBomb":true,"displayIdInBook":null,"X":30,"Y":null,"value30_2":30,"value30_1":1000,"Z":null},
 	"E796": {"name":"赤色武士","hp":850000,"atk":205000,"def":102000,"money":440,"exp":0,"point":0,"special":[],"level":"三阶无上"},
 	"E797": {"name":"幽蓝武士","hp":920000,"atk":208000,"def":105000,"money":450,"exp":0,"point":0,"special":[],"level":"三阶无上","displayIdInBook":null},
 	"E798": {"name":"金色武士","hp":1050000,"atk":215000,"def":118000,"money":480,"exp":0,"point":0,"special":[],"level":"三阶无上","displayIdInBook":null},
@ -560,7 +560,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E1021": {"name":"细血蝙蝠","hp":1,"atk":0,"def":0,"money":50,"exp":0,"point":0,"special":[9,22],"level":"四阶无上","purify":1,"damage":50000},
 	"E1022": {"name":"残骨蝙蝠","hp":2800000,"atk":440000,"def":50000,"money":400,"exp":0,"point":0,"special":[9],"level":"五阶无上","purify":1},
 	"E1023": {"name":"吸血赤色蝙蝠","hp":600000,"atk":450000,"def":120000,"money":450,"exp":0,"point":0,"special":[11],"level":"五阶无上","vampire":0.05},
-	"E1024": {"name":"阴暗魔","hp":5000000,"atk":350000,"def":150000,"money":420,"exp":0,"point":0,"special":[36],"level":"五阶无上","X":80},
+	"E1024": {"name":"阴暗魔","hp":2000000,"atk":350000,"def":90000,"money":420,"exp":0,"point":0,"special":[36],"level":"五阶无上","X":60},
 	"E1025": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E1027": {"name":"考核法师","hp":10400,"atk":840,"def":325,"money":150,"exp":0,"point":0,"special":[30],"level":"地品初阶","notBomb":true,"displayIdInBook":null,"beforeBattle":[{"type":"if","condition":"(flag:shengqishi>=8)","true":[{"type":"animate","name":"sword"},{"type":"setBlock","number":"N472"},"\t[${flag:shengqishi_name},N472]\b[this]考你麻痹！圣子殿下也是你能考的？","\t[考核法师,E1027]哎呦……圣子殿下，你不讲武德！","\t[${flag:shengqishi_name},N472]\b[this]连我都打不过，还考圣子殿下？还不快把通关奖励拿出来！","\t[考核法师,E1027]可恶的小子，你给我等着，我定要让教皇陛下做主！",{"type":"setBlock","number":"I612","loc":[[4,7]]},{"type":"setBlock","number":"I416","loc":[[8,7]]},{"type":"setBlock","number":"I625","loc":[[6,3]]},"考核法师逃跑了！","\t[${flag:shengqishi_name},N472]\b[this]嘿嘿，圣子殿下，看我的鬼手掏了多少？","金币+300",{"type":"setValue","name":"status:money","operator":"+=","value":"300"},"\t[莫析辉,hero]\b[hero]不错，不过下次可别这样了。","\t[${flag:shengqishi_name},N472]\b[this]知道啦！嘿嘿。","考核法师又回来了。","\t[${flag:shengqishi_name},N472]\b[this]你还来干嘛？","\t[考核法师,E1027]哼，教皇陛下准备让圣子殿下、圣女殿下、准圣子殿下进入隐世学院交流。","\t[莫析辉,hero]\b[hero]隐世学院？","\t[考核法师,E1027]回圣子殿下，隐世学院是一个不逊于光明学院的学院，只是常年隐居，很少有人知道罢了。但是很多强大势力的少主都送到隐世学院交流，教皇陛下有意让你们三人前去交流……emmm，${flag:shengqishi_name}，你也可以去。","\t[莫析辉,hero]\b[hero]好吧。那我们去就是了，入口在哪里？","\t[考核法师,E1027]在光明学院6，有一个传送阵，圣子殿下赶快启程吧！",{"type":"hide","remove":true}],"false":[]}],"value30_1":2000,"value30_2":40},
 	"E1028": {"name":"提灯幽灵","hp":12000,"atk":550,"def":340,"money":200,"exp":0,"point":0,"special":[6,30],"level":"地品初阶","notBomb":true,"n":5,"value30_1":3000,"value30_2":20},
--- a/project/floors/GM2.js
+++ b/project/floors/GM2.js
@ -160,8 +160,7 @@ main.floors.GM2=
            ],
            "floorId": "GM1",
            "remove": true
-        },
-        "\\c[30]本塔主要加攻击，且需要留怪。"
+        }
    ],
    "eachArrive": [
        {
@ -209,7 +208,8 @@ main.floors.GM2=
                    "type": "setValue",
                    "name": "flag:luotao",
                    "value": "0"
-                }
+                },
+                "前往\r[red]\\c[50]西面的村庄\\c[]\r[]"
            ],
            "false": []
        }
--- a/project/floors/GM8.js
+++ b/project/floors/GM8.js
@ -481,7 +481,8 @@ main.floors.GM8=
            ],
            "floorId": "GM3",
            "remove": true
-        }
+        },
+        "前往\r[red]\\c[50]圣女宫\\c[]\r[]"
    ],
    "eachArrive": [],
    "parallelDo": "",
--- a/project/floors/HA1.js
+++ b/project/floors/HA1.js
@ -52,9 +52,9 @@ main.floors.HA1=
    [140165,140165,140165,140165,140128,  0, 93,  0,140130,140165,140165,140165,140165],
    [140165,688,140165,688,140136, 21,  0, 21,140138,688,  0, 21,140165],
    [140165,356,140165, 21,140144,140145,852,140145,140146,  0,769,  0,140165],
-    [ 92,  0,140165, 21,140160,140161,140225,140161,140162,140180, 81,140180,140165],
-    [140165,  0,140165,737,140160,140161,140225,140161,140162,  0,  0,  0,140165],
-    [140165,  0, 82,  0,140160,140161,140225,140169,140170,687,  0, 21,140165],
+    [ 92,  0,140165, 21,140160,140161,  0,140161,140162,140180, 81,140180,140165],
+    [140165,  0,140165,737,140160,140161,  0,140161,140162,  0,  0,  0,140165],
+    [140165,  0, 82,  0,140160,140161,  0,140169,140170,687,  0, 21,140165],
    [140165,140171,877,140171,140171,140171,1076,140171,140171,140171,876,140171,140165],
    [140165,  0,  0, 81,140171,  0,769,  0,140171,  0,  0,  0,140165],
    [140165,140165,140165,  0,140004,  0,10294,  0,140004,352,703,1099,140165],
@ -74,7 +74,19 @@ main.floors.HA1=
        0
    ],
    "bg2map": [
-
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,140225,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,140225,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,140225,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,140225,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,140225,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "fg2map": [

--- a/project/floors/HA10.js
+++ b/project/floors/HA10.js
@ -65,7 +65,7 @@ main.floors.HA10=
    [ 92,1076,140166,  0,140166,  0,140166,  0,140166, 21,140166,  0,140166],
    [140166,  0,140166,737, 81,1022, 81,737,140166, 21,1078,  0,140166],
    [140166,1023,140166,140166,140166,140166,140166,140166,140166,140166,140166,769,140166],
-    [140166,  0,140166,687,  0,876,1118,618,356, 21,140166,  0,140166],
+    [140166,  0,140166,687,  0,876, 21,618,356,1118,140166,  0,140166],
    [140166,687,140166, 81,140166,140166,140166,140166,140166,140166,140166, 81,140166],
    [140166,618,140166,  0,851,  0,688,  0,1023,  0,687,  0,140166],
    [140166,140166,140166,140166,140166,140166, 93,140166,140166,140166,140166,140166,140166]
--- a/project/floors/HA11.js
+++ b/project/floors/HA11.js
@ -221,7 +221,7 @@ main.floors.HA11=
        "2,9": [
            {
                "type": "if",
-                "condition": "(flag:heianshengzhi===1)",
+                "condition": "(flag:heianshengzi===1)",
                "true": [
                    "\t[黑暗神使,E907]愿为殿下效犬马之劳",
                    {
@ -284,12 +284,7 @@ main.floors.HA11=
        12,
        6
    ],
-    "color": [
-        0,
-        0,
-        0,
-        1
-    ],
+    "color": null,
    "bg2map": [

 ],
--- a/project/floors/HA12.js
+++ b/project/floors/HA12.js
@ -13,7 +13,17 @@ main.floors.HA12=
    "ratio": 512,
    "defaultGround": "X40339",
    "bgm": "gentaiyangxishuozaijian.mp3",
-    "firstArrive": [],
+    "firstArrive": [
+        "\t[莫析辉,hero]\b[hero]黑暗圣子宫……好气派的房间，一点也不比光明圣子宫差呢……",
+        {
+            "type": "setHeroOpacity",
+            "opacity": 0
+        },
+        {
+            "type": "changeFloor",
+            "floorId": "MM6"
+        }
+    ],
    "eachArrive": [],
    "parallelDo": "",
    "events": {
--- a/project/floors/HA18.js
+++ b/project/floors/HA18.js
@ -16,7 +16,30 @@ main.floors.HA18=
    "firstArrive": [],
    "eachArrive": [],
    "parallelDo": "",
-    "events": {},
+    "events": {
+        "0,9": [
+            "未完待续……",
+            {
+                "type": "choices",
+                "text": "\t[莫析辉,hero]是否提交成绩？",
+                "choices": [
+                    {
+                        "text": "是",
+                        "action": [
+                            {
+                                "type": "win",
+                                "reason": "圣骑士"
+                            }
+                        ]
+                    },
+                    {
+                        "text": "否",
+                        "action": []
+                    }
+                ]
+            }
+        ]
+    },
    "changeFloor": {
        "12,6": {
            "floorId": "HA2",
@ -57,7 +80,7 @@ main.floors.HA18=
    [ 92,877,140166,140166,140166,140166,140166, 81,140166,140166,  0,1022, 92],
    [140166,  0,  0, 22,140166,688,  0,737,  0,  0, 21,  0,140166],
    [1095,140166, 82,140166,140166,140166,140166,140166, 82,140166,140166,140166,140166],
-    [ 92, 84,1024,  0,349,687,140166,  0,737,  0,618,687,140166],
+    [ 92,1077,1024,  0,349,687,140166,  0,737,  0,618,687,140166],
    [1095,140166, 81,140166,140166,140166,140166, 81,140166, 81,140166,140166,140166],
    [140166,688,  0,  0, 21,  0,1024,  0,140166,852, 22,687,140166],
    [140166,140166,140166,140166,140166,140166,140166,140166,140166,140166,140166,140166,140166]
--- a/project/floors/MM6.js
+++ b/project/floors/MM6.js
@ -0,0 +1,193 @@
+main.floors.MM6=
+{
+    "floorId": "MM6",
+    "title": " 6 ",
+    "name": "6",
+    "width": 13,
+    "height": 13,
+    "canFlyTo": false,
+    "canFlyFrom": false,
+    "canUseQuickShop": false,
+    "cannotViewMap": true,
+    "cannotMoveDirectly": false,
+    "images": [],
+    "ratio": 1,
+    "defaultGround": "X140137",
+    "bgm": "gentaiyangxishuozaijian.mp3",
+    "firstArrive": [
+        "\t[林霄,N485]\b[this,6,4]黛默琳！",
+        "\t[黛默琳,N481]\b[this,6,8]林霄，方才，有人看见你勾结光明圣子进入黑暗神殿。说吧，光明圣子在哪里呀？",
+        "\t[林霄,N485]\b[this,6,4]我不知道！",
+        "\t[黛默琳,N481]\b[this,6,8]林霄哥哥，可不是妹妹不帮你呀。本来看在你是圣子哥哥的守护骑士份上，小妹不曾为难你，结果你非要与光明神殿的圣子勾结，祸害黑暗神殿，小妹不得不处置你，以正黑暗神殿纲纪！",
+        "\t[林霄,N485]\b[this,6,4]哈哈哈哈哈哈！啊哈哈哈哈！",
+        "\t[林霄,N485]\b[this,6,4]黛默琳，别以为我不知道，黑暗圣子殿下就是被你所害！你暗地里派了多少人来追杀我，以为我不知道吗？",
+        "\t[黛默琳,N481]\b[this,6,8]各位，这林霄身为守护骑士，杀死了自己守护的圣子，我身为圣女，自然要为圣子报仇。没想到，这林霄竟然倒打一耙，反倒怪人家杀害了圣子哥哥了。真是其心当诛啊！",
+        "\t[林霄,N485]\b[this,6,4]好啊，黛默琳，你还往我头上扣屎盆子！",
+        "\t[黛默琳,N481]\b[this,6,8]罢了，林霄哥哥，这周围可都是小妹的人呢！只是你知道的实在太多了，不然这样吧，你只要效忠于我，我便让你继续拥有守护骑士的地位，回到黑暗神殿，如何？",
+        "\t[林霄,N485]\b[this,6,4]不可能！我这一生，只效忠于圣子殿下！黛默琳，你杀害了圣子殿下，还想让我效忠于你，绝无可能！",
+        "\t[黛默琳,N481]\b[this,6,8]既然如此，各位，给林霄哥哥来一个痛快的吧！",
+        "\t[林霄,N485]\b[this,6,4]等一下！",
+        "\t[黛默琳,N481]\b[this,6,8]怎么？怕了？",
+        "\t[林霄,N485]\b[this,6,4]哈哈哈哈！怕？我林霄纵横多年，还不知道怕字怎么写呢！",
+        "\t[林霄,N485]\b[this,6,4]告诉你，他们还不配杀我！我自己来！",
+        {
+            "type": "jump",
+            "from": [
+                6,
+                4
+            ],
+            "to": [
+                6,
+                7
+            ],
+            "time": 500,
+            "keep": true
+        },
+        "\t[林霄,N485]\b[this,6,7]去死吧黛默琳！我要拉你去见圣子殿下，给圣子殿下赔罪吧！",
+        {
+            "type": "animate",
+            "name": "baofa",
+            "loc": [
+                6,
+                7
+            ]
+        },
+        {
+            "type": "animate",
+            "name": "dazhaofadong",
+            "loc": [
+                6,
+                7
+            ]
+        },
+        {
+            "type": "animate",
+            "name": "explosion_small",
+            "loc": [
+                6,
+                7
+            ]
+        },
+        {
+            "type": "animate",
+            "name": "hongguang",
+            "loc": [
+                6,
+                7
+            ]
+        },
+        {
+            "type": "animate",
+            "name": "lvup",
+            "loc": [
+                6,
+                7
+            ]
+        },
+        {
+            "type": "animate",
+            "name": "sword5_1",
+            "loc": [
+                6,
+                7
+            ]
+        },
+        "\t[黛默琳,N481]\b[this,6,8]你找死！",
+        {
+            "type": "animate",
+            "name": "zhuanhua",
+            "loc": [
+                6,
+                7
+            ]
+        },
+        "\t[林霄,N485]\b[this,6,7]啊啊啊啊啊啊！",
+        {
+            "type": "hide",
+            "loc": [
+                [
+                    6,
+                    7
+                ]
+            ],
+            "remove": true
+        },
+        "\t[铁姝,npc0]\b[this,7,9]林霄……",
+        {
+            "type": "setCurtain",
+            "color": [
+                0,
+                0,
+                0,
+                1
+            ],
+            "time": 500,
+            "keep": true
+        },
+        "\t[林霄,N485]一切都结束了吗？",
+        "\t[林霄,N485]好想回家……",
+        "\t[林霄,N485]我从小就被养在了黑暗神殿，无父也无母。黑暗神殿便是我的家，我的父母。",
+        "\t[林霄,N485]黑暗神殿，一个被光明神殿驱逐之地。我的命运，被掌握在四位长老手中。",
+        "\t[林霄,N485]我对黑暗神殿来说，是无数从小养大的孩子。但黑暗神殿对我来说，是唯一的父母，是唯一的家。从小长老就教导我，我将来要效忠于黑暗神殿，效忠于圣子殿下。",
+        "\t[林霄,N485]圣子殿下？比我还小的那个孩子，我成为了他的守护骑士。人生来就是不平等的，墨奈殿下，刚出现，便是黑暗神殿的焦点，哪怕耀眼如圣女，也不得不避其锋芒，而我，不过是黑暗神殿的一滩淤泥。",
+        "\t[林霄,N485]有时候，我总在想，为什么我努力半生，才成为黑暗圣子的守护骑士，为什么你不用努力，就成为了黑暗圣子。",
+        "\t[林霄,N485]墨奈的天赋很高，又有黑暗神殿的资源倾斜，不过几年实力便已经超越了我，成为下一任教皇，是板上钉钉的事情了，我规规矩矩的，在黑暗神殿也将有一个好的归宿。",
+        "\t[林霄,N485]哪怕强如黑暗圣子，也有畏惧别人的时候。墨奈，他畏惧那个比他还弱的光明圣子。不要去招惹光明神殿，我不止一次阻止这位自负的圣子殿下，都是徒劳……",
+        "\t[林霄,N485]令我震惊的是，黑暗圣子竟然是光明圣子十几年前剥离的黑暗部分。墨奈殿下如愿以偿地抓到了自己的本体，希望能够解除与本体的束缚。可世事难料，光明圣子被擒的事，很快被教皇陛下所知，墨奈殿下只得把光明圣子放走，最终败在光明圣子与光明圣女的联手之下。",
+        "\t[林霄,N485]我曾经想过，我到底是忠于圣子，还是忠于黑暗神殿？或许，我是忠于黑暗神殿的吧……那一天，圣子陨落了，我也回不去了。忠心了一辈子，最后黑暗神殿却传来了“林霄背叛圣子”的传言。",
+        "\t[林霄,N485]我对黑暗神殿的渴望，如同孩子想回到母亲的怀抱一般。我只是想回家，但家已经不容我……黑暗圣女的几次追杀，我终于明白了杀害圣子的幕后凶手，应该就是黛默琳！圣子殿下的灵魂并没有消散，被我用法阵保护了起来，趁着光明圣子来到西武帝国，我决定铤而走险……",
+        "\t[林霄,N485]黑暗神殿的守护骑士与光明神殿的圣子走在了一起……这一切，都是为了你啊，圣子殿下……墨奈！我渴望的是，黑暗圣子能够在本体的帮助下，重新回归，我才能回到自己的家……",
+        "\t[林霄,N485]黛默琳很快就找来了，最终，她给出了十分诱人的条件，回到黑暗神殿——回到家。多么诱人的条件啊！我以为我会像断线的风筝想找到自己的线，以为我会像无根的浮萍想找到自己的根，以为我会像离家的浪子想回到自己的家一样飞奔回去……没想到，我拒绝了黛默琳的提议。",
+        "\t[林霄,N485]我在回家和圣子中，还是选择了圣子……家，我再也回不去了……墨奈，圣子，你欠了我好多好多啊……",
+        {
+            "type": "setCurtain",
+            "time": 500
+        },
+        {
+            "type": "setHeroOpacity",
+            "opacity": 1
+        },
+        {
+            "type": "changeFloor",
+            "floorId": "HA12"
+        }
+    ],
+    "eachArrive": [],
+    "parallelDo": "",
+    "events": {},
+    "changeFloor": {},
+    "beforeBattle": {},
+    "afterBattle": {},
+    "afterGetItem": {},
+    "afterOpenDoor": {},
+    "autoEvent": {},
+    "cannotMove": {},
+    "cannotMoveIn": {},
+    "map": [
+    [140019,140019,140019,140019,140019,140019,140019,140019,140019,140019,140019,140019,140019],
+    [140019,  0,  0,140019,  0,  0,  0,  0,  0,  0,  0,  0,140019],
+    [140019,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140019],
+    [140019,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140019],
+    [140019,140019,  0,  0,  0,  0,485,  0,  0,  0,  0,  0,140019],
+    [140019,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140019,140019],
+    [140019,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140019],
+    [140019,1123,  0,  0,  0,  0,  0,  0,  0,  0,  0,1123,140019],
+    [140019,  0,1123,  0,  0,  0,484,  0,  0,  0,1123,  0,140019],
+    [140019,  0,  0,1123,  0,  0,  0,136,  0,1123,  0,  0,140019],
+    [140019,140019,  0,  0,1123,1123,1123,1123,1123,  0,  0,140019,140019],
+    [140019,140019,  0,  0,  0,  0,  0,  0,  0,  0,  0,140019,140019],
+    [140019,140019,140019,140019,140019,140019,140019,140019,140019,140019,140019,140019,140019]
+],
+    "bgmap": [
+
+],
+    "fgmap": [
+
+],
+    "bg2map": [
+
+],
+    "fg2map": [
+
+]
+}
--- a/project/floors/SN10.js
+++ b/project/floors/SN10.js
@ -248,7 +248,8 @@ main.floors.SN10=
                    "name": "flag:luotao",
                    "operator": "+=",
                    "value": "1"
-                }
+                },
+                "前往\r[red]\\c[50]光明神殿\\c[]\r[]"
            ],
            "false": []
        }
--- a/project/floors/XW10.js
+++ b/project/floors/XW10.js
@ -10,7 +10,7 @@ main.floors.XW10=
    "canUseQuickShop": true,
    "cannotViewMap": false,
    "images": [],
-    "ratio": 1,
+    "ratio": 512,
    "defaultGround": "X140283",
    "bgm": "lfmg.mp3",
    "weather": [
--- a/project/floors/XW2.js
+++ b/project/floors/XW2.js
@ -10,7 +10,7 @@ main.floors.XW2=
    "canUseQuickShop": true,
    "cannotViewMap": false,
    "images": [],
-    "ratio": 1,
+    "ratio": 512,
    "defaultGround": "autotile7",
    "bgm": "lfmg.mp3",
    "weather": [
--- a/project/floors/XW3.js
+++ b/project/floors/XW3.js
@ -10,7 +10,7 @@ main.floors.XW3=
    "canUseQuickShop": true,
    "cannotViewMap": false,
    "images": [],
-    "ratio": 1,
+    "ratio": 512,
    "defaultGround": "autotile7",
    "bgm": "lfmg.mp3",
    "weather": [
--- a/project/floors/XW4.js
+++ b/project/floors/XW4.js
@ -10,7 +10,7 @@ main.floors.XW4=
    "canUseQuickShop": true,
    "cannotViewMap": false,
    "images": [],
-    "ratio": 1,
+    "ratio": 512,
    "defaultGround": "autotile7",
    "bgm": "lfmg.mp3",
    "weather": [
@ -70,11 +70,11 @@ main.floors.XW4=
    "cannotMoveIn": {},
    "map": [
    [144,144,144,144,144,144,144,144,144,144,144, 91,144],
-    [144, 21,  0, 21,144,  0,755, 81,1118,  0,144,1023,144],
-    [144,  0, 21,  0,144,353,  0,144,  0,934,144,1022,144],
+    [144, 21,  0, 21,144,  0,851, 81,  0,  0,144,1023,144],
+    [144,  0, 21,  0,144,353,  0,144,1118,934,144,1022,144],
    [144,144, 81,144,144,144,144,144,144, 81,144,1023,144],
    [144,  0,851,  0,144,  0,  0,144,  0,  0,  0, 21,144],
-    [144,  0,  0,486, 81,851,  0,1021,  0,617,  0,  0,144],
+    [144,  0,  0,486, 81,755,  0,1021,  0,617,  0,  0,144],
    [ 94,  0,  0,687,144,  0,  0,  0,144,144, 81,144,144],
    [144,144,144,144,144,144,144, 81,144,  0,934,  0,144],
    [144,  0, 22,851, 81,352,  0,737,144,687,  0, 21,144],
--- a/project/floors/XW5.js
+++ b/project/floors/XW5.js
@ -10,7 +10,7 @@ main.floors.XW5=
    "canUseQuickShop": true,
    "cannotViewMap": false,
    "images": [],
-    "ratio": 1,
+    "ratio": 512,
    "defaultGround": "autotile7",
    "bgm": "lfmg.mp3",
    "weather": [
@ -48,15 +48,15 @@ main.floors.XW5=
    [144,144,144,144,144,144,144,144,144,144,144, 93,144],
    [144,617,  0,1117,144,617,  0,352,144,617,144,  0,144],
    [144,  0,349,  0,144,  0,934,  0,144,851,144,  0,144],
-    [144,144, 83,144,144,144, 81,144,144,  0,  0,852,144],
+    [144,144, 83,144,144,144, 81,144,144,  0,  0,1021,144],
    [144, 21,  0,  0,144,352,  0,  0,144,1077,144,144,703],
-    [144,  0,737,  0, 82,  0,  0,1023, 82,  0,  0,1021, 21],
+    [144,  0,737,  0, 82,  0,  0,1023, 82,  0,  0,852, 21],
    [144,144, 81,144,144,1100,  0,  0,144,688,  0,  0,144],
    [144,687,  0,  0,144,144, 81,144,144,144, 81,144,144],
    [144,  0,  0,1024, 81,  0,1022,  0,144,  0,737,  0,144],
    [144,144, 81,144,144,  0,  0,687,144,687,  0,688,144],
-    [144,  0,1022,  0,144,144,  0,144,144,144, 81,144,144],
-    [144,352,  0,688, 81,  0,851,  0, 81, 21,1021, 21,144],
+    [144,  0,851,  0,144,144,  0,144,144,144, 81,144,144],
+    [144,352,  0,688, 81,  0,1021,  0, 81, 21,1022, 21,144],
    [144,144,144,144,144,144, 93,144,144,144,144,144,144]
 ],
    "bgmap": [
--- a/project/floors/XW6.js
+++ b/project/floors/XW6.js
@ -10,7 +10,7 @@ main.floors.XW6=
    "canUseQuickShop": true,
    "cannotViewMap": false,
    "images": [],
-    "ratio": 1,
+    "ratio": 512,
    "defaultGround": "autotile7",
    "bgm": "lfmg.mp3",
    "weather": [
--- a/project/floors/XW7.js
+++ b/project/floors/XW7.js
@ -10,7 +10,7 @@ main.floors.XW7=
    "canUseQuickShop": true,
    "cannotViewMap": false,
    "images": [],
-    "ratio": 1,
+    "ratio": 512,
    "defaultGround": "autotile7",
    "bgm": "lfmg.mp3",
    "weather": [
--- a/project/floors/XW8.js
+++ b/project/floors/XW8.js
@ -10,7 +10,7 @@ main.floors.XW8=
    "canUseQuickShop": true,
    "cannotViewMap": false,
    "images": [],
-    "ratio": 1,
+    "ratio": 512,
    "defaultGround": "autotile7",
    "bgm": "lfmg.mp3",
    "weather": [
@ -89,9 +89,9 @@ main.floors.XW8=
    [144,1100,144, 81,144,144, 85,144,144, 81,144,144,1021],
    [144,737,144,  0,  0,1024,  0,1024,144,851,  0,144,  0],
    [144,  0,144,144,144,144,  0,  0,144,  0,688,144,348],
-    [144, 21,144,688,687, 81,851,  0, 81,  0,  0, 82,  0],
+    [144, 21,144,688,687, 81,737,  0, 81,  0,  0, 82,  0],
    [144,755,144,144,144,144,  0,144,144,144, 81,144,1022],
-    [144,346,144, 21,617,144,687,737,  0,144,1023,144, 81],
+    [144,346,144, 21,617,144,687,851,  0,144,1023,144, 81],
    [144,617,144,688,687,851,  0,144, 21,144,  0,144, 21],
    [144,  0,144,144,1022,144,144,144,617,144,687,144, 21],
    [144,737, 81,851,  0,  0,687,144,688,144,  0,144, 21],
--- a/project/floors/XW9.js
+++ b/project/floors/XW9.js
@ -10,7 +10,7 @@ main.floors.XW9=
    "canUseQuickShop": true,
    "cannotViewMap": false,
    "images": [],
-    "ratio": 1,
+    "ratio": 512,
    "defaultGround": "autotile7",
    "bgm": "lfmg.mp3",
    "weather": [
--- a/project/floors/YS10.js
+++ b/project/floors/YS10.js
@ -63,7 +63,7 @@ main.floors.YS10=
            "floorId": "GM1",
            "remove": true
        },
-        "提示：先去 GM8 ，然后去 SN10 ，最后去 GM2 。"
+        "前往\r[red]\\c[50]准圣子宫\\c[]\r[]"
    ],
    "eachArrive": [],
    "parallelDo": "",
--- a/project/items.js
+++ b/project/items.js
@ -2168,11 +2168,11 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"cls": "equips",
 		"name": "蕴灵甲",
 		"canUseItemEffect": "true",
-		"text": "防御力+12",
+		"text": "防御力+32",
 		"equip": {
 			"type": "法袍",
 			"value": {
-				"def": 12
+				"def": 32
 			},
 			"percentage": {}
 		}
--- a/project/maps.js
+++ b/project/maps.js
--- a/project/sounds/053-Cannon02.mp3
+++ b/project/sounds/053-Cannon02.mp3
--- a/project/sounds/054-Cannon03.ogg
+++ b/project/sounds/054-Cannon03.ogg
--- a/project/sounds/064-Swing03.mp3
+++ b/project/sounds/064-Swing03.mp3
--- a/project/sounds/086-Action01.ogg
+++ b/project/sounds/086-Action01.ogg
--- a/project/sounds/098-Attack10.mp3
+++ b/project/sounds/098-Attack10.mp3
--- a/project/sounds/112-Heal08.ogg
+++ b/project/sounds/112-Heal08.ogg
--- a/project/sounds/123-Thunder01.mp3
+++ b/project/sounds/123-Thunder01.mp3
--- a/project/sounds/129-Earth01.mp3
+++ b/project/sounds/129-Earth01.mp3
--- a/project/sounds/143-Support01.mp3
+++ b/project/sounds/143-Support01.mp3
--- a/project/sounds/177-Skill21.mp3
+++ b/project/sounds/177-Skill21.mp3
--- a/project/sounds/180-Skill24.mp3
+++ b/project/sounds/180-Skill24.mp3
--- a/project/sounds/Bell.mp3
+++ b/project/sounds/Bell.mp3
--- a/project/sounds/lingyu.mp3
+++ b/project/sounds/lingyu.mp3
Author	SHA1	Message	Date
bdf1	d2c6a3188c	Merge branch 'shengqishi' into feature	2024-08-25 12:34:07 +08:00
bdf1	901342bd97	Modify some enemys and items, add some notifies	2024-08-25 12:32:55 +08:00
bdf1	d9a46a76ad	光明血瓶和黑暗雪萍不再挡路；调整了难度；修复黑暗神使；修复西武区倍率	2024-08-25 12:19:48 +08:00