diff --git a/project/data.js b/project/data.js index c7aff69..096c919 100644 --- a/project/data.js +++ b/project/data.js @@ -244,6 +244,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "def.png", "def2.png", "dragon.png", + "dragon1_compress.png", + "dragonknight.png", "exp.png", "expL.png", "expLt.png", @@ -256,6 +258,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "manaLt.png", "mdef.png", "money.png", + "octopus.png", "potion.png", "shengzi.png", "winskin.png" @@ -622,6 +625,24 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "width": 384, "height": 96, "prefix": "dragon_" + }, + { + "name": "dragon1_compress.png", + "width": 384, + "height": 96, + "prefix": "dragon1_compress_" + }, + { + "name": "dragonknight.png", + "width": 384, + "height": 96, + "prefix": "dragonknight_" + }, + { + "name": "octopus.png", + "width": 384, + "height": 96, + "prefix": "octopus_" } ] }, diff --git a/project/enemys.js b/project/enemys.js index 6331c4b..5213c57 100644 --- a/project/enemys.js +++ b/project/enemys.js @@ -507,12 +507,12 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E985": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E986": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E987": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E1026": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E1026": {"name":"勾镰恶魔","hp":3200000,"atk":840000,"def":350000,"money":100,"exp":0,"point":0,"special":[39],"level":"六阶无上","Atkvalue":1000,"Defvalue":2000}, "E1167": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1168": {"name":"火蝙蝠","hp":60000000,"atk":405000,"def":98000,"money":300,"exp":0,"point":0,"special":[35]}, - "E1169": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E1169": {"name":"幽冥魔君","hp":10000000,"atk":940000,"def":465000,"money":1000,"exp":0,"point":0,"special":[30],"level":"八阶无上","value30_1":10000,"value30_2":50,"displayIdInBook":null}, "E1170": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E1171": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E1171": {"name":"美面魔帝","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"level":"九阶无上"}, "E1172": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1173": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1174": {"name":"火焰史莱姆王","hp":8000000,"atk":68000,"def":16040,"money":192,"exp":0,"point":0,"special":[21,35,39],"Mdefvalue":null,"mdefValue":100,"Atkvalue":35,"Defvalue":35}, @@ -521,7 +521,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E1177": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1178": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1179": {"name":"冰骨蝙蝠","hp":480000000000,"atk":60000000,"def":24500000,"money":30000,"exp":0,"point":0,"special":[42]}, - "E1180": {"name":"冰叶蝶","hp":420000000000,"atk":61500000,"def":2500000,"money":3200,"exp":0,"point":0,"special":[41,51,52],"Z":80,"W":36}, + "E1180": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"bigImage":"dragonknight_1.png"}, "E1246": {"name":"混沌魔君(阵法削弱状态)","hp":5000000000000,"atk":100000000,"def":20000000,"money":100000,"exp":0,"point":0,"special":[2],"description":"灵兽榜上第二名，混沌属性最强灵兽","notBomb":true}, "E827": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E988": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, @@ -565,7 +565,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "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":"insert","name":"回收钥匙商店"},{"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":2000,"value30_2":20}, "E1029": {"name":"麻龙","hp":2750000,"atk":780000,"def":320000,"money":500,"exp":0,"point":0,"special":[36],"X":20,"level":"六阶无上"}, - "E1030": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E1030": {"name":"暗夜灵魔","hp":4500000,"atk":855000,"def":360000,"money":120,"exp":0,"point":0,"special":[39],"Mdefvalue":5000}, "E1031": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1032": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1033": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, @@ -608,15 +608,19 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E1121": {"name":"蜜西娅","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"E1119","left":"E1120","right":"E1121","up":"E1122"},"displayIdInBook":null}, "E1122": {"name":"蜜西娅","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"E1119","left":"E1120","right":"E1121","up":"E1122"},"displayIdInBook":null}, "E1125": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E1126": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E1127": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E1126": {"name":"绿影骷髅","hp":2580000,"atk":840000,"def":365000,"money":100,"exp":0,"point":0,"special":[39],"beforeBattle":[{"type":"if","condition":"(flag:shengqishi>=68)","true":[{"type":"animate","name":"yijianzhanqianye"},"\t[${flag:shengqishi_name},N510]\b[this]让我来！","金币+120，攻击+2000",{"type":"setValue","name":"status:money","operator":"+=","value":"120"},{"type":"setValue","name":"status:atk","operator":"+=","value":"2000"}],"false":[]}],"Atkvalue":2000,"level":"七阶无上"}, + "E1127": {"name":"蓝影骷髅","hp":4250000,"atk":920000,"def":420000,"money":100,"exp":0,"point":0,"special":[39],"beforeBattle":[{"type":"if","condition":"(flag:shengqishi>=68)","true":[{"type":"animate","name":"yijianzhanqianye"},"\t[${flag:shengqishi_name},N510]\b[this]让我来！","金币+120，防御力+4000",{"type":"setValue","name":"status:money","operator":"+=","value":"120"},{"type":"setValue","name":"status:def","operator":"+=","value":"4000"}],"false":[]}],"Defvalue":4000,"level":"七阶无上"}, "E1128": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1129": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E1130": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E1130": {"name":"黑暗兽君","hp":5800000,"atk":860000,"def":450000,"money":125,"exp":0,"point":0,"special":[30,36,39],"level":"八阶无上","X":25,"Atkvalue":4000,"Defvalue":4000,"Mdefvalue":12000,"value30_1":1000,"value30_2":50}, "E1131": {"name":"青龙","hp":16000000,"atk":825000,"def":200000,"money":560,"exp":0,"point":0,"special":[]}, "E1132": {"name":"虹眼龙","hp":10000000,"atk":250000,"def":425000,"money":580,"exp":0,"point":0,"special":[2]}, "E1133": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E1134": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E1134": {"name":"黑暗将军","hp":5000000,"atk":820000,"def":350000,"money":110,"exp":0,"point":0,"special":[4,39],"level":"七阶无上","Atkvalue":1000,"Defvalue":1000}, "E1136": {"name":"深渊巨龙","hp":20000000,"atk":1000000,"def":350000,"money":5000,"exp":0,"point":0,"special":[30,35],"level":"九阶无上","value30_1":10000,"value30_2":60}, - "E1159": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]} + "E1159": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E1160": {"name":"棒锥","hp":10000000,"atk":940000,"def":465000,"money":1000,"exp":0,"point":0,"special":[30],"level":"八阶无上","value30_1":10000,"value30_2":50}, + "E1181": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"bigImage":"dragon1_compress_0.png"}, + "E1182": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"bigImage":"dragon1_compress_1.png"}, + "E1183": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"bigImage":"octopus_1.png"} } \ No newline at end of file diff --git a/project/floors/LZ10.js b/project/floors/LZ10.js index 922ebfc..41921b6 100644 --- a/project/floors/LZ10.js +++ b/project/floors/LZ10.js @@ -894,6 +894,7 @@ main.floors.LZ10= "\t[莫析辉,hero]\b[hero]我想，我们应该先去\r[red]\\c[30]精灵王国\\c[]\r[]、兽人族、矮人族看看老同学了……", "\t[唐佳成,N510]\b[this,4,6]啊？", "\t[莫析辉,hero]\b[hero]黑暗神殿如今异常活跃，咱们多联系几个朋友吧，毕竟如今东凌帝国、南荒帝国、北寒帝国都陷入了混乱……emmm，西武帝国的皇帝也投靠了黛默琳，我一怒之下杀了他，现在也内乱了……我可能真的做错了……现在得赶紧想办法对付黑暗神殿！", + "建议玩家在进入精灵王国之前通关魔界！", { "type": "setBlock", "number": "I357", @@ -1205,6 +1206,7 @@ main.floors.LZ10= "\t[莫析辉,hero]\b[hero]我想，我们应该先去\r[red]\\c[30]精灵王国\\c[]\r[]、兽人族、矮人族看看老同学了……", "\t[唐佳成,N510]\b[this,4,6]啊？", "\t[莫析辉,hero]\b[hero]黑暗神殿如今异常活跃，咱们多联系几个朋友吧，毕竟如今东凌帝国、南荒帝国、北寒帝国都陷入了混乱……emmm，西武帝国的皇帝也投靠了黛默琳，我一怒之下杀了他，现在也内乱了……我可能真的做错了……现在得赶紧想办法对付黑暗神殿！", + "建议玩家在进入精灵王国之前通关魔界！", { "type": "setBlock", "number": "I416", diff --git a/project/floors/LZ4.js b/project/floors/LZ4.js index fc62757..a639ecc 100644 --- a/project/floors/LZ4.js +++ b/project/floors/LZ4.js @@ -44,7 +44,7 @@ main.floors.LZ4= [140,140,140,140,140,140, 91,140,140,140,140,140,140], [140,688, 0,1132, 81, 0,1131, 0,140, 21, 21, 21,140], [140,688,688, 0,140, 0,140,823,140,140, 82,140,140], - [140,140,140,140,140,824,140, 0,222, 0, 0,689,140], + [140,140,140,140,140,824,140, 0,1132, 0, 0,689,140], [140,688, 0, 0,1029, 0,140,688,140,140, 81,140,140], [140,140, 81,140,140, 0,140, 0,140, 0,825, 0,140], [140, 0,1131, 0,140,823, 82,1029,140,689,349,346,140], diff --git a/project/floors/LZ6.js b/project/floors/LZ6.js index d2ea5f3..dcd6cf2 100644 --- a/project/floors/LZ6.js +++ b/project/floors/LZ6.js @@ -50,7 +50,7 @@ main.floors.LZ6= [140, 0, 21, 0,140, 0,140,1029,140,140,140,824, 94], [140, 21,825, 21,140,1132,140, 21, 21, 21,140, 0,140], [140,140, 82,140,140, 0,140,140,140,140,140, 81,140], - [140,1098, 0,216, 0, 21,140,688, 0,1131, 0,348,140], + [140,1098, 0,1029, 0, 21,140,688, 0,1131, 0,348,140], [140, 81,140,140,140,140,140, 81,140,140,140, 81,140], [140,823, 0,348, 0,1029, 0,1029,140,689,688,1131,140], [140,140,140,140,140,140, 91,140,140,140,140,140,140] diff --git a/project/floors/MJ1.js b/project/floors/MJ1.js index da4637b..b4b6a1d 100644 --- a/project/floors/MJ1.js +++ b/project/floors/MJ1.js @@ -14,689 +14,29 @@ main.floors.MJ1= "defaultGround": "ground", "bgm": null, "firstArrive": [ - "\t[伟大的迷迭香,E764]\b[this,6,6]现在的魔塔都不行，外墙太占地方啦，给我拆啦，拆啦！", - { - "type": "screenFlash", - "color": [ - 255, - 255, - 255, - 1 - ], - "time": 500, - "times": 1 - }, + "魔界剧情按照与圣骑士亲密度达到进行。（后面五层需要圣骑士亲密度达到75开启。）", + "\t[莫析辉,hero]\b[hero]可恶啊，这个魔界怎么没有任何红黄蓝绿白宝石……", + "\t[唐佳成,N510]\b[this,6,12]据说魔界的怪物都将所有的能量汲取了，如果想要从它们口中夺取能量，只能杀死它们。", + "\t[唐佳成,N510]\b[this,6,12]不过殿下方向，我会一直守护殿下的。", { "type": "hide", - "loc": [ - [ - 1, - 0 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 2, - 0 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 3, - 0 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 4, - 0 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 6, - 0 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 7, - 0 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 9, - 0 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 10, - 0 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 11, - 0 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 12, - 1 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 0, - 3 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 0, - 4 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 0, - 5 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 0, - 6 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 0, - 7 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 0, - 8 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 0, - 9 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 0, - 11 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 0, - 12 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 1, - 12 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 2, - 12 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 3, - 12 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 5, - 12 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 6, - 12 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 8, - 12 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 9, - 12 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 10, - 12 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 11, - 12 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 12, - 9 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 12, - 8 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 12, - 7 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 12, - 6 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 12, - 5 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 12, - 4 - ] - ], - "remove": true, - "async": true - }, - { - "type": "hide", - "loc": [ - [ - 12, - 3 - ] - ], - "remove": true, - "async": true - }, - { - "type": "waitAsync" - }, - { - "type": "screenFlash", - "color": [ - 255, - 255, - 255, - 1 - ], - "time": 500, - "times": 1 - }, - "\t[伟大的迷迭香,E764]\b[this,6,6]emmmm，真不错！可怜的玩家啊，你以为我拆了外墙，你就不用打怪了吗？出来吧，我的天兵们！", - { - "type": "screenFlash", - "color": [ - 255, - 255, - 255, - 1 - ], - "time": 500, - "times": 1 - }, - { - "type": "setBlock", - "number": "E757", - "loc": [ - [ - 4, - 0 - ] - ] - }, - { - "type": "setBlock", - "number": "yellowKey", - "loc": [ - [ - 1, - 0 - ] - ] - }, - { - "type": "setBlock", - "number": "yellowKey", - "loc": [ - [ - 2, - 0 - ] - ] - }, - { - "type": "setBlock", - "number": "yellowKey", - "loc": [ - [ - 3, - 0 - ] - ] - }, - { - "type": "setBlock", - "number": "E758", - "loc": [ - [ - 2, - 12 - ] - ] - }, - { - "type": "setBlock", - "number": "E758", - "loc": [ - [ - 11, - 0 - ] - ] - }, - { - "type": "setBlock", - "number": "E761", - "loc": [ - [ - 7, - 0 - ] - ] - }, - { - "type": "setBlock", - "number": "redKing", - "loc": [ - [ - 0, - 6 - ] - ] - }, - { - "type": "setBlock", - "number": "redKing", - "loc": [ - [ - 12, - 6 - ] - ] - }, - { - "type": "setBlock", - "number": "E757", - "loc": [ - [ - 8, - 12 - ] - ] - }, - { - "type": "setBlock", - "number": "I361", - "loc": [ - [ - 9, - 12 - ] - ] - }, - { - "type": "setBlock", - "number": "I361", - "loc": [ - [ - 10, - 12 - ] - ] - }, - { - "type": "setBlock", - "number": "I361", - "loc": [ - [ - 11, - 12 - ] - ] - }, - { - "type": "setBlock", - "number": "big7Potion", - "loc": [ - [ - 0, - 8 - ] - ] - }, - { - "type": "setBlock", - "number": "big7Potion", - "loc": [ - [ - 12, - 4 - ] - ] - }, - { - "type": "setBlock", - "number": "big8Potion", - "loc": [ - [ - 12, - 8 - ] - ] - }, - { - "type": "setBlock", - "number": "big8Potion", - "loc": [ - [ - 0, - 5 - ] - ] - }, - { - "type": "setBlock", - "number": "I357", - "loc": [ - [ - 11, - 0 - ] - ] - }, - { - "type": "screenFlash", - "color": [ - 255, - 255, - 255, - 1 - ], - "time": 500, - "times": 1 - }, - "\t[伟大的迷迭香,E764]\b[this,6,6]好好玩吧，桀桀桀桀桀桀！", - { - "type": "hide", - "loc": [ - [ - 6, - 6 - ] - ], "remove": true - }, - { - "type": "if", - "condition": "(flag:hard===4)", - "true": [ - "检测到骑士专精，攻击+20，防御+20，护盾+100，生命值+12800。", - { - "type": "setValue", - "name": "status:atk", - "operator": "+=", - "value": "20" - }, - { - "type": "setValue", - "name": "status:def", - "operator": "+=", - "value": "20" - }, - { - "type": "setValue", - "name": "status:mdef", - "operator": "+=", - "value": "100" - }, - { - "type": "setValue", - "name": "status:hp", - "operator": "+=", - "value": "12800" - } - ], - "false": [ - { - "type": "if", - "condition": "(flag:hard===5)", - "true": [ - "检测到拓印者专精，血瓶效果归零。", - { - "type": "setGlobalValue", - "name": "greenPotion", - "value": 0 - } - ], - "false": [] - } - ] } ], "eachArrive": [], "parallelDo": "", "events": {}, "changeFloor": { - "1,11": { - "floorId": ":before", - "stair": "upFloor" - }, - "12,0": { + "12,1": { "floorId": ":next", "stair": "downFloor" + }, + "6,11": { + "floorId": "YS10", + "loc": [ + 6, + 6 + ] } }, "beforeBattle": {}, @@ -707,25 +47,37 @@ main.floors.MJ1= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [ 4, 4, 4, 4, 4, 81, 4, 4, 81, 4, 4, 4, 87], - [ 4,683,683,683, 0, 4, 0,683, 4, 0, 22, 0, 4], - [ 4, 4, 4, 4, 4, 4,758, 4, 4, 4, 4, 4, 4], - [ 4, 0,760, 0, 21, 4, 0, 4, 0,356,759, 0, 4], - [ 4,358, 4,683, 0, 4, 21, 4,683, 0, 4,358, 4], - [ 4, 0, 4, 0,357, 4, 0, 4, 0,357, 4, 0, 4], - [ 4, 4, 4, 4,761, 82,764, 82,758, 4, 4, 4, 4], - [ 4, 0, 4, 0,354, 4, 0, 4,361, 0, 4, 0, 4], - [ 4,360, 4,683, 0, 4,683, 4, 0,683, 4,360, 4], - [ 4, 0,750, 0,355, 4, 0, 4, 21, 0,750, 0, 4], - [ 4, 4, 4, 4, 4, 4,761, 4, 4, 4, 4, 4, 4], - [ 4, 88, 4,683, 4,361, 0, 4, 0, 21, 21, 21, 4], - [ 4, 4, 4, 4, 81, 4, 4, 81, 4, 4, 4, 4, 4] + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 4,688,688,688, 0, 81,1126,688, 81, 0, 22, 0, 94], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 0,1130, 0, 21, 4, 21, 4, 0,699,1127, 0, 4], + [ 4,699, 4,688, 0, 4, 0, 4,688, 0, 4,617, 4], + [ 4, 0, 4, 0,617, 4,1126, 4, 0,699, 4, 0, 4], + [ 4, 4, 4, 4,1030, 82, 0, 82,1126, 4, 4, 4, 4], + [ 4, 0, 4, 0,617, 4,688, 4,617, 0, 4, 0, 4], + [ 4,699, 4,688, 0, 4, 0, 4, 0,688, 4,699, 4], + [ 4, 0,1134, 0,1126, 4,1030, 4,1126, 0,1134, 0, 4], + [ 4, 4, 4, 4, 0, 0, 0, 0, 0, 4, 4, 4, 4], + [ 4,617,617,1026, 0,20821,20822,20823,1030, 21, 21, 21, 4], + [ 4, 4, 4, 4, 0, 0,513, 0, 0, 4, 4, 4, 4] ], "bgmap": [ ], "fgmap": [ - + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,20813,20814,20815, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "bg2map": [ @@ -734,7 +86,7 @@ main.floors.MJ1= ], "flyPoint": [ - 1, + 6, 11 ] } \ No newline at end of file diff --git a/project/floors/MJ10.js b/project/floors/MJ10.js index c372008..bf33b91 100644 --- a/project/floors/MJ10.js +++ b/project/floors/MJ10.js @@ -17,96 +17,19 @@ main.floors.MJ10= "eachArrive": [], "parallelDo": "", "events": {}, - "changeFloor": {}, + "changeFloor": { + "11,10": { + "floorId": "MJ9", + "loc": [ + 11, + 10 + ] + } + }, "beforeBattle": {}, - "afterBattle": { - "6,4": [ - "\t[迷迭香,E764]\b[this]魔塔内，我对你的爱，就像王州对李华、咸鱼对王大锤那么热烈，你居然感受不到，啊！", - "最终，邪恶的迷迭香被玩家打败……", - { - "type": "if", - "condition": "(flag:hard===1)", - "true": [ - { - "type": "win", - "reason": "战士" - } - ], - "false": [ - { - "type": "if", - "condition": "(flag:hard===2)", - "true": [ - { - "type": "win", - "reason": "刺客" - } - ], - "false": [ - { - "type": "if", - "condition": "(flag:hard===3)", - "true": [ - { - "type": "win", - "reason": "法师" - } - ], - "false": [ - { - "type": "if", - "condition": "(flag:hard===4)", - "true": [ - { - "type": "win", - "reason": "骑士" - } - ], - "false": [ - { - "type": "if", - "condition": "(flag:hard===5)", - "true": [ - { - "type": "win", - "reason": "拓印者" - } - ], - "false": [] - } - ] - } - ] - } - ] - } - ] - } - ] - }, + "afterBattle": {}, "afterGetItem": {}, - "afterOpenDoor": { - "6,5": [ - "\t[迷迭香,E764]\b[this,6,4]亲爱的玩家，你来啦！", - "\t[玩家,hero]\b[hero]你自己测了吗？", - "\t[迷迭香,E764]\b[this,6,4]测了一下。", - "\t[玩家,hero]\b[hero]感觉怎么样？", - "\t[迷迭香,E764]\b[this,6,4]我去除了大部分的塔的坑人。", - "\t[迷迭香,E764]\b[this,6,4]但是我保留了一部分。", - "\t[迷迭香,E764]\b[this,6,4]我觉得保留了一部分塔的玩法，才知道你玩的是魔塔。", - "\t[玩家,hero]\b[hero]你是有意把它保留的吗？", - "\t[迷迭香,E764]\b[this,6,4]是造塔的过程中，我留下了一部分。", - "\t[玩家,hero]\b[hero]是故意的还是不小心?", - "\t[迷迭香,E764]\b[this,6,4]是故意的。", - "\t[玩家,hero]\b[hero](玩塔中……)", - "\t[玩家,hero]\b[hero](呕呕……)迷迭香，我要打死你！", - "\t[迷迭香,E764]\b[this,6,4]！！！", - "\t[迷迭香,E764]\b[this,6,4]难道你没有感受到我对你炽热的爱吗？", - "\t[玩家,hero]\b[hero]我绝不会原谅你！受死吧！", - "\t[迷迭香,E764]\b[this,6,4]呜呜呜，亲爱的玩家，我对你的爱，如太阳般炽热，我可以把心掏给你！", - "\t[玩家,hero]\b[hero]谁要你的心！受死吧！" - ] - }, + "afterOpenDoor": {}, "autoEvent": {}, "cannotMove": {}, "cannotMoveIn": {}, @@ -115,13 +38,13 @@ main.floors.MJ10= [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], - [ 4, 4, 4, 4, 4, 4,764, 4, 4, 4, 4, 4, 4], - [ 4, 4, 4, 4, 4, 4, 83, 4, 4, 4, 4, 4, 4], - [ 4, 4, 4, 4,685, 0, 83, 0,685, 4, 4, 4, 4], - [ 4, 4, 4, 4, 4, 4, 83, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4,714,714,714,714,714, 4, 4, 4, 4], + [ 4, 4, 4, 4,714,1172,1173,1174,714, 4, 4, 4, 4], + [ 4, 4, 4, 4,714,1175,1176,1177,714, 4, 4, 4, 4], + [ 4, 4, 4, 4,714,1178,1171,1179,714, 4, 4, 4, 4], [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], - [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], - [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 92, 4], [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4] ], diff --git a/project/floors/MJ2.js b/project/floors/MJ2.js index 3d025f2..3ddd196 100644 --- a/project/floors/MJ2.js +++ b/project/floors/MJ2.js @@ -16,15 +16,7 @@ main.floors.MJ2= "firstArrive": [], "eachArrive": [], "parallelDo": "", - "events": { - "0,9": [ - "\t[智者,man]这一区的钥匙很少，需要留有金币买钥匙哦", - { - "type": "hide", - "remove": true - } - ] - }, + "events": {}, "changeFloor": { "12,0": { "floorId": ":before", @@ -81,19 +73,19 @@ main.floors.MJ2= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [358,360,358,760, 0, 4,358, 0,758, 81, 0, 0, 88], - [ 4, 4, 4, 4, 0, 4, 0, 4, 4, 4,245, 4,758], - [ 4,358, 0, 4,683, 4,761, 22,683,750, 0, 4, 0], - [ 4, 0,757, 81, 0, 4, 4, 4, 4, 4,356, 4,683], - [ 4,365, 0, 4,750, 4,683, 0, 0, 4, 0, 4, 0], - [ 4, 4, 4, 4, 0, 4, 0,366,759, 81,761, 4,761], - [ 87, 81, 81,758, 0, 4,683, 0, 0, 4, 0, 82, 0], - [ 4, 4, 4, 0, 0, 4, 4, 4, 4, 4,683, 4, 21], - [ 4,360, 0,761, 21, 81,683, 0,758, 81, 0, 4, 21], - [121, 0,365,761, 0, 4, 0,356, 0, 4,760, 4, 21], - [ 4, 81, 4, 4,750, 0,750, 4,761, 4, 81, 4, 4], - [ 0,759, 0, 4, 4, 85, 4, 4, 0, 4,361,362,361], - [684,684,684, 4, 21, 23, 21, 4,683, 4, 4, 4, 4] + [617,360,617,1130, 0, 4,617, 0,1126, 81, 0, 0, 92], + [ 4, 4, 4, 4, 0, 4, 0, 4, 4, 4,1026, 4,1126], + [ 4,617, 0, 4,688, 4,1030, 22,688,1126, 0, 4, 0], + [ 4, 0,1127, 81, 0, 4, 4, 4, 4, 4,699, 4,688], + [ 4,699, 0, 4,1126, 4,688, 0, 0, 4, 0, 4, 0], + [ 4, 4, 4, 4, 0, 4, 0,617,1127, 81,1030, 4,1030], + [ 92, 81, 81,1126, 0, 4,688, 0, 0, 4, 0, 82, 0], + [ 4, 4, 4, 0, 0, 4, 4, 4, 4, 4,688, 4, 21], + [ 4,699, 0,1030, 21, 81,688, 0,1126, 81, 0, 4, 21], + [ 4, 0,699,1030, 0, 4, 0,699, 0, 4,1130, 4, 21], + [ 4, 81, 4, 4,1126, 0,1126, 4,1030, 4, 81, 4, 4], + [ 0,1127, 0, 4, 4, 85, 4, 4, 0, 4,699,617,699], + [688,688,688, 4, 21, 23, 21, 4,688, 4, 4, 4, 4] ], "bgmap": [ diff --git a/project/floors/MJ3.js b/project/floors/MJ3.js index cd738dd..6f1dcd5 100644 --- a/project/floors/MJ3.js +++ b/project/floors/MJ3.js @@ -28,112 +28,26 @@ main.floors.MJ3= } }, "beforeBattle": {}, - "afterBattle": { - "4,3": [ - { - "type": "setValue", - "name": "flag:door_MJ3_6_5", - "operator": "+=", - "value": "1" - } - ], - "4,4": [ - { - "type": "setValue", - "name": "flag:door_MJ3_6_5", - "operator": "+=", - "value": "1" - } - ], - "5,4": [ - { - "type": "setValue", - "name": "flag:door_MJ3_6_5", - "operator": "+=", - "value": "1" - } - ], - "5,3": [ - { - "type": "setValue", - "name": "flag:door_MJ3_6_5", - "operator": "+=", - "value": "1" - } - ], - "6,3": [ - { - "type": "setValue", - "name": "flag:door_MJ3_6_5", - "operator": "+=", - "value": "1" - } - ], - "6,4": [ - { - "type": "setValue", - "name": "flag:door_MJ3_6_5", - "operator": "+=", - "value": "1" - } - ], - "7,4": [ - { - "type": "setValue", - "name": "flag:door_MJ3_6_5", - "operator": "+=", - "value": "1" - } - ], - "7,3": [ - { - "type": "setValue", - "name": "flag:door_MJ3_6_5", - "operator": "+=", - "value": "1" - } - ] - }, + "afterBattle": {}, "afterGetItem": {}, "afterOpenDoor": {}, - "autoEvent": { - "6,5": { - "0": { - "condition": "flag:door_MJ3_6_5==8", - "currentFloor": true, - "priority": 0, - "delayExecute": false, - "multiExecute": false, - "data": [ - { - "type": "openDoor" - }, - { - "type": "setValue", - "name": "flag:door_MJ3_6_5", - "operator": "=", - "value": "null" - } - ] - } - } - }, + "autoEvent": {}, "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [683, 0,761, 0, 81, 0,683, 0, 0, 4, 4, 4, 4], - [ 4, 81, 4, 4, 4, 0, 0, 0, 82,750, 4,683, 4], - [ 0,683, 0, 4, 4, 4, 81, 4, 4, 0, 4,684, 4], - [245, 4,361, 4,758,758,758,758, 4,683, 4,683, 4], - [ 0, 4, 81, 4,761,761,761,761, 4, 0, 81,760, 4], - [ 0, 4,761, 4, 4, 4, 85, 4, 4, 0, 4, 0, 4], - [ 88, 0,758, 81,245, 4, 81, 4, 21,759, 4, 81, 4], - [ 4, 83, 4, 4,361, 4, 81, 4, 21, 4, 4,245, 4], - [ 0,759, 0, 4,361, 4, 81, 4, 21, 4,361, 0,361], - [358, 0,360, 4, 4, 4, 0, 4, 4, 4, 4, 82, 4], - [ 0,361, 0, 4,683, 0,758, 0, 0, 4, 0,757, 0], - [ 4, 4, 4, 4,245, 4, 4, 4,761, 4, 21, 22, 21], - [ 87, 0,357, 81, 0, 81, 0,684, 0, 4, 21, 21, 21] + [688, 0,1030, 0, 81, 0, 0,688, 4, 4, 4, 4, 4], + [ 4, 81, 4, 4, 4, 0,1126, 0, 82,1134, 4,688, 4], + [ 4, 0,688, 0, 4, 4, 81, 4, 4, 0, 4,688, 4], + [ 4,1026, 4,699, 4, 0,617, 0, 4,688, 4,688, 4], + [ 4, 0, 4, 81, 4,688, 0, 21, 4, 0, 81,1130, 4], + [ 4, 0, 4,1030, 4, 4,1127, 4, 4, 0, 4, 0, 4], + [ 94, 0,1126, 81,1026, 4, 81, 4, 21,1127, 4, 81, 4], + [ 4, 83, 4, 4,699, 4, 81, 4, 21, 4, 4,1026, 4], + [ 0,1134, 0, 4,699, 4, 81, 4, 21, 4,699, 0,699], + [617, 0,700, 4, 4, 4, 0, 4, 4, 4, 4, 82, 4], + [ 0,699, 0, 4,688, 0,1126, 0, 0, 4, 0,1127, 0], + [ 4, 4, 4, 4,1026, 4, 4, 4,1030, 4, 21, 22, 21], + [ 92, 0,617, 81, 0, 81, 0,688, 0, 4, 21, 21, 21] ], "bgmap": [ diff --git a/project/floors/MJ4.js b/project/floors/MJ4.js index f80148b..0920090 100644 --- a/project/floors/MJ4.js +++ b/project/floors/MJ4.js @@ -35,19 +35,19 @@ main.floors.MJ4= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [361,361,361,759, 81, 0,761, 0, 22, 0,750, 4,683], - [ 4, 4, 4, 4,683, 4, 4, 4, 4, 4, 0, 4,683], - [ 0,362, 0, 4, 0, 4, 21, 81,750, 4,683, 82,683], - [ 21, 0,750, 82,245, 4, 0, 4, 0, 4, 81, 4, 4], - [ 4, 4, 4, 4, 0, 4,761, 4,683, 4,758, 4, 22], - [684, 0,760, 82,361, 4, 0, 4, 0, 4, 0, 4, 22], - [ 0,684, 0, 4, 81, 4, 81, 4,245, 4,361, 83, 22], - [ 4, 4, 4, 4,761, 4, 0, 4, 81, 4, 0, 4, 4], - [ 0,361, 0, 81, 0, 4,758, 4, 0, 0,761, 0, 21], - [683, 0,758, 4,683, 4, 0, 4, 4, 4, 4, 4, 4], - [ 4, 4, 82, 4, 0, 4,361, 0, 81,757,360,360,360], - [ 0, 0, 0, 4,245, 4, 0, 4, 4, 4, 4, 4, 4], - [ 88, 0,759, 81, 0, 4, 87, 0, 81,760,358,358,358] + [698,698,698,1127, 81, 0,1030, 0, 22, 0,1134, 4,688], + [ 4, 4, 4, 4,688, 4, 4, 4, 4, 4, 0, 4,688], + [ 0,617, 0, 4, 0, 4, 21, 81,1134, 4,688, 82,688], + [ 21, 0,1134, 82,1026, 4, 0, 4, 0, 4, 81, 4, 4], + [ 4, 4, 4, 4, 0, 4,1030, 4,688, 4,1126, 4, 22], + [688, 0,1130, 82,698, 4, 0, 4, 0, 4, 0, 4, 22], + [ 0,688, 0, 4, 81, 4, 81, 4,1026, 4,698, 83, 22], + [ 4, 4, 4, 4,1030, 4, 0, 4, 81, 4, 0, 4, 4], + [ 0,698, 0, 81, 0, 4,1126, 4, 0, 0,1030, 0, 21], + [688, 0,1126, 4,688, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4, 82, 4, 0, 4,698, 0, 81,1126,699,699,699], + [ 0, 0, 0, 4,1026, 4, 0, 4, 4, 4, 4, 4, 4], + [ 94, 0,1127, 81, 0, 4, 93, 0, 81,1130,617,617,617] ], "bgmap": [ diff --git a/project/floors/MJ5.js b/project/floors/MJ5.js index a8482ba..f690886 100644 --- a/project/floors/MJ5.js +++ b/project/floors/MJ5.js @@ -16,7 +16,30 @@ main.floors.MJ5= "firstArrive": [], "eachArrive": [], "parallelDo": "", - "events": {}, + "events": { + "6,9": [ + "\t[唐佳成,N510]\b[this]这个家伙应该就是殿下的毕业任务啦！", + { + "type": "hide", + "remove": true + } + ], + "11,11": [ + { + "type": "if", + "condition": "(flag:shengqishi>=72)", + "true": [ + { + "type": "hide", + "remove": true + } + ], + "false": [ + "与圣骑士亲密度没有达到72，不允许通行" + ] + } + ] + }, "changeFloor": { "6,12": { "floorId": ":before", @@ -29,18 +52,28 @@ main.floors.MJ5= }, "beforeBattle": {}, "afterBattle": { - "3,10": [ + "6,7": [ { "type": "setValue", - "name": "flag:door_MJ5_2_11", + "name": "flag:door_MJ5_5_3", "operator": "+=", "value": "1" - } - ], - "3,12": [ + }, { "type": "setValue", - "name": "flag:door_MJ5_2_11", + "name": "flag:door_MJ5_7_3", + "operator": "+=", + "value": "1" + }, + { + "type": "setValue", + "name": "flag:door_MJ5_10_7", + "operator": "+=", + "value": "1" + }, + { + "type": "setValue", + "name": "flag:door_MJ5_6_2", "operator": "+=", "value": "1" } @@ -49,9 +82,9 @@ main.floors.MJ5= "afterGetItem": {}, "afterOpenDoor": {}, "autoEvent": { - "2,11": { + "5,3": { "0": { - "condition": "flag:door_MJ5_2_11==2", + "condition": "flag:door_MJ5_5_3==1", "currentFloor": true, "priority": 0, "delayExecute": false, @@ -62,7 +95,68 @@ main.floors.MJ5= }, { "type": "setValue", - "name": "flag:door_MJ5_2_11", + "name": "flag:door_MJ5_5_3", + "operator": "=", + "value": "null" + } + ] + } + }, + "7,3": { + "0": { + "condition": "flag:door_MJ5_7_3==1", + "currentFloor": true, + "priority": 0, + "delayExecute": false, + "multiExecute": false, + "data": [ + { + "type": "openDoor" + }, + { + "type": "setValue", + "name": "flag:door_MJ5_7_3", + "operator": "=", + "value": "null" + } + ] + }, + "1": null + }, + "10,7": { + "0": { + "condition": "flag:door_MJ5_10_7==1", + "currentFloor": true, + "priority": 0, + "delayExecute": false, + "multiExecute": false, + "data": [ + { + "type": "openDoor" + }, + { + "type": "setValue", + "name": "flag:door_MJ5_10_7", + "operator": "=", + "value": "null" + } + ] + } + }, + "6,2": { + "0": { + "condition": "flag:door_MJ5_6_2==1", + "currentFloor": true, + "priority": 0, + "delayExecute": false, + "multiExecute": false, + "data": [ + { + "type": "openDoor" + }, + { + "type": "setValue", + "name": "flag:door_MJ5_6_2", "operator": "=", "value": "null" } @@ -73,19 +167,19 @@ main.floors.MJ5= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [361, 4, 21, 0, 21, 4,360,358,684,760, 81,683, 0], - [361, 4, 0,363, 0, 4,360,358,684, 0, 4, 0,757], - [361, 4, 21,759, 21, 4,684,684,750, 4, 4, 4, 81], - [ 0, 4, 4, 81, 4, 4, 4, 4, 82, 4,361, 0, 0], - [ 0, 81,757, 0,683, 0,761, 4, 0, 4, 0, 22, 0], - [ 4, 4, 83, 4, 4, 4, 81, 4, 0, 81,759, 0,361], - [ 4,683,683,683, 4, 0, 0, 4, 81, 4, 4, 4, 4], - [ 4,683,683,683, 4,683, 0, 4, 0,760, 82, 0,683], - [ 4,683,683,683, 4, 0,245, 4, 21, 21, 4, 0, 4], - [ 4, 4, 4, 4, 4, 4, 81, 4, 21, 21, 4,750, 4], - [ 0,684, 4,245, 0, 4, 0, 4, 0, 0, 4, 81, 4], - [362, 0, 85, 0, 0, 4, 0, 81,758, 0, 4, 0, 4], - [ 0, 23, 4,245, 0, 82, 88, 4, 4, 4, 4, 87, 4] + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4,1115, 4, 4, 4, 4, 4, 4], + [ 4, 4,703,703,703, 4, 85, 4,714,714,714, 4, 4], + [ 4, 4, 21, 21, 21, 85, 0, 85,349,349,349, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4,1161,1170,1162, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4,1163,1164,1165, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4,1166,1169,1168, 0, 0, 85, 0, 4], + [ 4, 4, 4, 4, 4, 4, 83, 4, 4, 4, 4, 0, 4], + [ 4, 4, 4, 4, 4, 4,510, 4, 4, 4, 4, 0, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 0, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4,1095, 4], + [ 4, 4, 4, 4, 4, 4, 91, 4, 4, 4, 4, 93, 4] ], "bgmap": [ diff --git a/project/floors/MJ6.js b/project/floors/MJ6.js index b041bed..d648db6 100644 --- a/project/floors/MJ6.js +++ b/project/floors/MJ6.js @@ -16,15 +16,7 @@ main.floors.MJ6= "firstArrive": [], "eachArrive": [], "parallelDo": "", - "events": { - "10,11": [ - "\t[智者,man]\b[this]进入最后一层不可回来，记得至少留有三把红钥匙。", - { - "type": "hide", - "remove": true - } - ] - }, + "events": {}, "changeFloor": { "11,12": { "floorId": ":before", @@ -36,64 +28,26 @@ main.floors.MJ6= } }, "beforeBattle": {}, - "afterBattle": { - "4,7": [ - { - "type": "setValue", - "name": "flag:door_MJ6_5_6", - "operator": "+=", - "value": "1" - } - ], - "6,7": [ - { - "type": "setValue", - "name": "flag:door_MJ6_5_6", - "operator": "+=", - "value": "1" - } - ] - }, + "afterBattle": {}, "afterGetItem": {}, "afterOpenDoor": {}, - "autoEvent": { - "5,6": { - "0": { - "condition": "flag:door_MJ6_5_6==2", - "currentFloor": true, - "priority": 0, - "delayExecute": false, - "multiExecute": false, - "data": [ - { - "type": "openDoor" - }, - { - "type": "setValue", - "name": "flag:door_MJ6_5_6", - "operator": "=", - "value": "null" - } - ] - } - } - }, + "autoEvent": {}, "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [ 87, 4,361,358,361,245, 0, 4, 4, 4, 4, 4, 21], - [ 0, 4, 4, 4, 4, 4, 81, 81, 0, 4,760, 81, 0], - [ 0, 81,761, 0,358, 0,750, 81,757, 4,361, 4,759], - [ 4, 4, 0, 4, 4, 4, 4, 4,360, 4, 0, 4, 0], - [684, 4, 21, 4, 0,366, 0, 4,362, 4, 81, 4,757], - [684, 4, 0, 4,683, 0,683, 4,360, 4,245, 4, 82], - [684, 82,750, 4, 4, 85, 4, 4, 4, 4, 0, 4,362], - [ 4, 4, 81, 4,759, 0,759, 4,750, 0, 21, 4,684], - [360,761, 0, 4, 4, 82, 4, 4, 82, 4, 4, 4, 4], - [ 4, 4, 0,758, 81,360, 0,761, 0,683, 0,758, 0], - [683, 4,245, 4, 4, 4, 4, 4,750, 4, 4, 81, 4], - [683, 81, 0, 4,684,684,757, 81, 0, 4,121, 0, 0], - [683, 4,684, 4,683,683, 0, 4, 21, 4, 0, 88, 0] + [ 91, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4,710,710, 4, 0, 0, 0, 4,710,710, 4, 4], + [ 4, 4,710,710, 0, 0, 0, 0, 0,710,710, 4, 4], + [ 4, 4,710,710, 4, 0,1183, 0, 4,710,710, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 4], + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 4], + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 4], + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 91, 4] ], "bgmap": [ diff --git a/project/floors/MJ7.js b/project/floors/MJ7.js index dffad77..7fed2b7 100644 --- a/project/floors/MJ7.js +++ b/project/floors/MJ7.js @@ -35,19 +35,19 @@ main.floors.MJ7= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [ 88, 4,360, 0,362, 4,683,683,683, 4,684,366,684], - [ 21, 4, 0,757, 0, 4, 4,760, 4, 4, 83, 4, 4], - [ 0, 4, 4, 81, 4, 4, 0, 0,758, 0, 21, 4, 21], - [758, 82, 0,683, 0,761, 81, 4, 4, 4, 4, 4, 21], - [ 4, 4, 4, 4, 4, 4, 0, 4, 0,757, 0, 4, 21], - [362, 0, 4,245, 82, 0,361,759, 0, 4,358, 81,761], - [683,759, 81, 0, 4, 4, 4, 4, 4, 4, 0, 4,361], - [358, 0, 4,361, 0,750, 0,362, 0, 81,245, 4, 4], - [ 4, 4, 4, 4, 81, 4, 4,760, 4, 4, 82, 4,360], - [361,683, 0, 0,758, 4,683,683,683, 4, 0, 81,245], - [ 4, 81, 4, 4, 4, 4, 4, 4, 4, 4,683, 4,360], - [ 4,761, 0,360, 0,750, 0, 21, 0, 82,758, 4, 4], - [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 87,759, 23] + [ 93, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 0, 4, 4, 4, 4,711,711,711, 4, 4, 4, 4, 4], + [ 0, 4, 4, 4, 4,711,711,711, 0, 0, 0, 4, 4], + [ 0, 4, 4, 4, 4, 0,1182, 0, 4, 4, 0, 4, 4], + [ 0, 4, 4, 4, 4, 4, 0, 4, 4, 4, 0, 4, 4], + [ 0, 4, 4, 4, 4, 4, 0, 4, 4, 4, 0, 4, 4], + [ 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 0, 4, 4], + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 93, 4, 4] ], "bgmap": [ diff --git a/project/floors/MJ8.js b/project/floors/MJ8.js index fbe8611..9bf8620 100644 --- a/project/floors/MJ8.js +++ b/project/floors/MJ8.js @@ -16,69 +16,7 @@ main.floors.MJ8= "firstArrive": [], "eachArrive": [], "parallelDo": "", - "events": { - "0,4": [ - { - "type": "if", - "condition": "(flag:hard===0)", - "true": [ - "\t[商人,hero]\b[this]另一个自己啊，我这有20000生命值，送给你吧！", - { - "type": "setValue", - "name": "status:hp", - "operator": "+=", - "value": "20000" - }, - { - "type": "hide", - "remove": true - } - ], - "false": [ - { - "type": "confirm", - "text": "我有20000生命值，\n你出2000金币就卖给你。", - "yes": [ - { - "type": "if", - "condition": "(status:money>=2000)", - "true": [ - { - "type": "setValue", - "name": "status:money", - "operator": "-=", - "value": "2000" - }, - { - "type": "setValue", - "name": "status:hp", - "operator": "+=", - "value": "20000" - }, - { - "type": "playSound", - "name": "确定" - }, - { - "type": "hide", - "remove": true - } - ], - "false": [ - { - "type": "playSound", - "name": "操作失败" - }, - "\t[行商,trader]\b[this]你的金币不足！" - ] - } - ], - "no": [] - } - ] - } - ] - }, + "events": {}, "changeFloor": { "10,12": { "floorId": ":before", @@ -90,64 +28,26 @@ main.floors.MJ8= } }, "beforeBattle": {}, - "afterBattle": { - "3,8": [ - { - "type": "setValue", - "name": "flag:door_MJ8_2_7", - "operator": "+=", - "value": "1" - } - ], - "3,6": [ - { - "type": "setValue", - "name": "flag:door_MJ8_2_7", - "operator": "+=", - "value": "1" - } - ] - }, + "afterBattle": {}, "afterGetItem": {}, "afterOpenDoor": {}, - "autoEvent": { - "2,7": { - "0": { - "condition": "flag:door_MJ8_2_7==2", - "currentFloor": true, - "priority": 0, - "delayExecute": false, - "multiExecute": false, - "data": [ - { - "type": "openDoor" - }, - { - "type": "setValue", - "name": "flag:door_MJ8_2_7", - "operator": "=", - "value": "null" - } - ] - } - } - }, + "autoEvent": {}, "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [684,684,684,760, 82,750, 4, 21, 21, 21, 4,358,360], - [ 4, 4, 4, 0, 4, 0, 4,685, 23,685, 81,358,360], - [362,362,362,757, 4,683, 4, 22, 22, 22, 4,358,360], - [ 4, 4, 4, 4, 4, 0, 4, 0,247, 0, 4, 4, 4], - [122, 0,245,683, 4,761, 4, 4, 83, 4, 4,683,365], - [ 4, 4, 4, 0, 4, 0,758, 0,683, 0, 82,760,363], - [ 0,684, 4,759, 4, 81, 4, 4, 4, 4, 4,683,364], - [366, 0, 85, 0, 81, 0,761, 21,361,683, 4, 4, 4], - [ 0, 21, 4,759, 4,245, 4, 4, 4, 4, 4, 0,360], - [ 4, 4, 4, 4, 4, 0, 4, 0,245, 0, 81,757, 0], - [ 87, 0,761, 0, 81, 0,750,361, 4,683, 4, 0,358], - [ 4, 81, 4, 4, 0, 4, 4, 4, 4, 0, 4, 4, 4], - [683,365,683, 4,683, 4, 21, 21,758, 0, 88,245,357] + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4,712,712,712, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4,712,712,712, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 0,1181, 0, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4], + [ 4, 4, 4, 0, 4, 4, 4, 4, 4, 4, 0, 4, 4], + [ 4, 4, 4, 0, 4, 4, 4, 4, 4, 4, 0, 4, 4], + [ 4, 4, 4, 0, 4, 4, 4, 4, 4, 4, 0, 4, 4], + [ 4, 4, 4, 0, 4, 4, 4, 4, 4, 4, 0, 4, 4], + [ 92, 0, 0, 0, 4, 4, 4, 4, 4, 4, 0, 4, 4], + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 4, 4], + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 91, 4, 4] ], "bgmap": [ diff --git a/project/floors/MJ9.js b/project/floors/MJ9.js index e2134bb..5e2e3bb 100644 --- a/project/floors/MJ9.js +++ b/project/floors/MJ9.js @@ -22,9 +22,12 @@ main.floors.MJ9= "floorId": ":before", "stair": "upFloor" }, - "6,8": { - "floorId": ":next", - "stair": "downFloor" + "11,10": { + "floorId": "MJ10", + "loc": [ + 11, + 10 + ] } }, "beforeBattle": {}, @@ -35,19 +38,19 @@ main.floors.MJ9= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [364, 0, 4,684, 4,362, 0, 4, 0,759, 21,363, 21], - [ 0,684, 4,366, 4, 0,757, 81,365, 4, 4, 4, 4], - [757, 4, 4,757, 4, 21, 0, 4, 0, 81,750, 0,760], - [ 0, 4, 0, 82, 4, 4, 4, 4,760, 4, 0, 4, 0], - [ 0, 81,759, 0, 0,245, 81, 21, 0, 4,361, 4,360], - [ 4, 4, 4, 4, 4, 4, 4, 0,683, 4,361, 4,360], - [ 0,760, 81, 81, 81,750, 0,245, 4, 4, 4, 4, 4], - [683, 4, 4, 4, 4, 4,683, 0, 81,757,361,360,362], - [ 0, 4,361,684,361, 4, 87, 4, 4, 4, 4, 4, 4], - [750, 4,358, 0,358, 4,245, 0,361, 81,245, 0,683], - [ 88, 4, 0,759, 0, 4, 4, 81, 4, 4, 4, 81, 4], - [ 81, 4, 4, 82, 4, 4, 0,759, 0, 4, 0,757, 0], - [245, 0, 21, 21, 21, 4,683, 0,684, 4,358, 0,362] + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4,713,713,713, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4,713,713,713, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 0,1180, 0, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4], + [ 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94, 4], + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], + [ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4] ], "bgmap": [ diff --git a/project/floors/YS10.js b/project/floors/YS10.js index f0de352..2d1882f 100644 --- a/project/floors/YS10.js +++ b/project/floors/YS10.js @@ -73,7 +73,14 @@ main.floors.YS10= "type": "if", "condition": "switch:A", "true": [ - "魔界剧情暂未开启，请通关西武帝国后再来哦！" + { + "type": "changeFloor", + "floorId": "MJ1", + "loc": [ + 6, + 11 + ] + } ], "false": [ { diff --git a/project/floors/YS9.js b/project/floors/YS9.js index 0a4cafe..7ffe3fc 100644 --- a/project/floors/YS9.js +++ b/project/floors/YS9.js @@ -88,7 +88,7 @@ main.floors.YS9= "operator": "+=", "value": "2" }, - "\t[孟芸,magicMaster]去吧，你的毕业任务是前往魔界，击杀百眼魔君！击杀百眼魔君之后，可以找江鹤依浩仙子提交任务获得奖励。" + "\t[孟芸,magicMaster]去吧，你的毕业任务是前往魔界，击杀幽冥魔君！击杀幽冥魔君之后，可以找江鹤依浩仙子提交任务获得奖励。" ] }, "afterGetItem": {}, @@ -146,7 +146,7 @@ main.floors.YS9= "type": "if", "condition": "(flag:shengqishi>1)", "true": [ - "\t[孟芸老师,magicMaster]\b[this,6,8]${flag:shengqishi_name}，你的任务……是去魔界，击杀一头魔龙。", + "\t[孟芸老师,magicMaster]\b[this,6,8]${flag:shengqishi_name}，你的任务……是去魔界，击杀美面魔帝。", "\t[莫析辉,hero]\b[hero]老师，${flag:shengqishi_name}的任务是不是太难了一些？", "\t[孟芸老师,magicMaster]\b[this,6,8]${flag:shengqishi_name}的实力比平常人也强一些，所以任务也更难一点，不过，光明圣子阁下可以帮他一起完成毕业任务。", "\t[莫析辉,hero]\b[hero]好。${flag:shengqishi_name}，你先退下吧！", diff --git a/project/icons.js b/project/icons.js index 1c7de97..6aa424e 100644 --- a/project/icons.js +++ b/project/icons.js @@ -145,7 +145,24 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 = "N1155": 35, "N1156": 36, "N1157": 37, - "N1158": 38 + "N1158": 38, + "N1161": 39, + "N1162": 40, + "N1163": 41, + "N1164": 42, + "N1165": 43, + "N1166": 44, + "N1167": 45, + "N1168": 46, + "N1170": 47, + "N1172": 48, + "N1173": 49, + "N1174": 50, + "N1175": 51, + "N1176": 52, + "N1177": 53, + "N1178": 54, + "N1179": 55 }, "npc48": { "npc0": 0, @@ -801,7 +818,14 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 = "E1133": 424, "E1134": 425, "E1136": 426, - "E1159": 427 + "E1159": 427, + "E1160": 428, + "E1169": 429, + "E1171": 430, + "E1180": 431, + "E1181": 432, + "E1182": 433, + "E1183": 434 }, "enemy48": { "angel": 0, diff --git a/project/images/dragon1_compress.png b/project/images/dragon1_compress.png new file mode 100644 index 0000000..cc79427 Binary files /dev/null and b/project/images/dragon1_compress.png differ diff --git a/project/images/dragonknight.png b/project/images/dragonknight.png new file mode 100644 index 0000000..c8a40ee Binary files /dev/null and b/project/images/dragonknight.png differ diff --git a/project/images/octopus.png b/project/images/octopus.png new file mode 100644 index 0000000..d40bda5 Binary files /dev/null and b/project/images/octopus.png differ diff --git a/project/maps.js b/project/maps.js index 2c5c833..21f5395 100644 --- a/project/maps.js +++ b/project/maps.js @@ -1059,6 +1059,30 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "1157": {"cls":"npcs","id":"N1157"}, "1158": {"cls":"npcs","id":"N1158"}, "1159": {"cls":"enemys","id":"E1159"}, + "1160": {"cls":"enemys","id":"E1160"}, + "1161": {"cls":"npcs","id":"N1161"}, + "1162": {"cls":"npcs","id":"N1162"}, + "1163": {"cls":"npcs","id":"N1163"}, + "1164": {"cls":"npcs","id":"N1164"}, + "1165": {"cls":"npcs","id":"N1165"}, + "1166": {"cls":"npcs","id":"N1166"}, + "1167": {"cls":"npcs","id":"N1167"}, + "1168": {"cls":"npcs","id":"N1168"}, + "1169": {"cls":"enemys","id":"E1169"}, + "1170": {"cls":"npcs","id":"N1170"}, + "1171": {"cls":"enemys","id":"E1171"}, + "1172": {"cls":"npcs","id":"N1172"}, + "1173": {"cls":"npcs","id":"N1173"}, + "1174": {"cls":"npcs","id":"N1174"}, + "1175": {"cls":"npcs","id":"N1175"}, + "1176": {"cls":"npcs","id":"N1176"}, + "1177": {"cls":"npcs","id":"N1177"}, + "1178": {"cls":"npcs","id":"N1178"}, + "1179": {"cls":"npcs","id":"N1179"}, + "1180": {"cls":"enemys","id":"E1180"}, + "1181": {"cls":"enemys","id":"E1181"}, + "1182": {"cls":"enemys","id":"E1182"}, + "1183": {"cls":"enemys","id":"E1183"}, "10013": {"cls":"tileset","id":"X10013","canBreak":true}, "10041": {"cls":"tileset","id":"X10041","canBreak":true}, "10110": {"cls":"tileset","id":"X10110","canBreak":false}, diff --git a/project/materials/enemys.png b/project/materials/enemys.png index 2e51eb7..0aec67f 100644 Binary files a/project/materials/enemys.png and b/project/materials/enemys.png differ diff --git a/project/materials/npcs.png b/project/materials/npcs.png index 75027bd..6f58180 100644 Binary files a/project/materials/npcs.png and b/project/materials/npcs.png differ