diff --git a/project/bgms/airuying.mp3 b/project/bgms/airuying.mp3 new file mode 100644 index 0000000..79cc126 Binary files /dev/null and b/project/bgms/airuying.mp3 differ diff --git a/project/data.js b/project/data.js index 271fd8b..fa02c0b 100644 --- a/project/data.js +++ b/project/data.js @@ -156,6 +156,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "zone" ], "bgms": [ + "airuying.mp3", "ending.mp3", "mingyunshouhu.mp3", "xian.mp3" @@ -1001,7 +1002,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = }, { "type": "setValue", - "name": "item:blueKey", + "name": "item:redKey", "operator": "+=", "value": "1" } diff --git a/project/floors/BH1.js b/project/floors/BH1.js index b58cb34..20a4a48 100644 --- a/project/floors/BH1.js +++ b/project/floors/BH1.js @@ -176,8 +176,8 @@ main.floors.BH1= "\t[???,N467]\b[this,0,6]啊?", "\t[光明骑士,N440]\b[this,2,7]殿下，这小子不清不楚的，你怎么能让他留在身边呢……", "\t[辉,hero]\b[hero]我意已决，不用多说。你叫什么名字？", - "\t[???,N467]\b[this,0,6]回殿下，我叫王州。", - "\t[辉,hero]\b[hero]那好，王州，你去圣子宫等着吧。我给你一些东西。", + "\t[???,N467]\b[this,0,6]回殿下，我叫唐佳成。", + "\t[辉,hero]\b[hero]那好，唐佳成，你去圣子宫等着吧。我给你一些东西。", { "type": "setValue", "name": "status:atk", @@ -196,8 +196,8 @@ main.floors.BH1= "operator": "-=", "value": "200" }, - "资助可怜的小乞丐王州，攻防-2，生命上限-200", - "\t[王州,N467]\b[this,0,6]谢谢圣子殿下！", + "资助可怜的小乞丐唐佳成，攻防-2，生命上限-200", + "\t[唐佳成,N467]\b[this,0,6]谢谢圣子殿下！", { "type": "hide", "loc": [ diff --git a/project/floors/GM2.js b/project/floors/GM2.js index 313ffd7..d228790 100644 --- a/project/floors/GM2.js +++ b/project/floors/GM2.js @@ -194,6 +194,15 @@ main.floors.GM2= "type": "turnBlock", "direction": "left" } + ], + "10,6": [ + "\t[莫析辉,hero]\b[hero]没事还是不去骑士团了吧！", + { + "type": "moveHero", + "steps": [ + "left:1" + ] + } ] }, "changeFloor": { diff --git a/project/floors/GM3.js b/project/floors/GM3.js index cf23a41..3e68c8e 100644 --- a/project/floors/GM3.js +++ b/project/floors/GM3.js @@ -138,11 +138,11 @@ main.floors.GM3= "shadow": 0 }, "data": [ - "\t[王州,N467]\b[this]圣子殿下！", - "\t[辉,hero]\b[hero]emmm，王州，你待在光明神殿最好还是找个事儿做。我总不能一直养着你吧?", - "\t[王州,N467]\b[this]是，我想当骑士！", + "\t[唐佳成,N467]\b[this]圣子殿下！", + "\t[辉,hero]\b[hero]emmm，唐佳成，你待在光明神殿最好还是找个事儿做。我总不能一直养着你吧?", + "\t[唐佳成,N467]\b[this]是，我想当骑士！", "\t[辉,hero]\b[hero]是个不错的想法，那你去教皇殿右边的骑士团吧！", - "\t[王州,N467]\b[this]是！" + "\t[唐佳成,N467]\b[this]是！" ] } }, diff --git a/project/floors/GM6.js b/project/floors/GM6.js index 6acca17..bdae73b 100644 --- a/project/floors/GM6.js +++ b/project/floors/GM6.js @@ -12,8 +12,139 @@ main.floors.GM6= "images": [], "ratio": 1, "defaultGround": "X30023", - "bgm": "mingyunshouhu.mp3", - "firstArrive": [], + "bgm": "airuying.mp3", + "firstArrive": [ + { + "type": "jumpHero", + "loc": [ + 1, + 6 + ], + "time": 500 + }, + { + "type": "changePos", + "direction": "right" + }, + "\t[汪周,N468]\b[this,6,3]立正！", + "\t[罗涛,N582]\b[this,3,4]骑士队长，没看到圣子殿下来了吗，还不快快迎接？", + { + "type": "turnBlock", + "direction": "left", + "loc": [ + [ + 6, + 3 + ] + ] + }, + { + "type": "turnBlock", + "direction": "left", + "loc": [ + [ + 4, + 6 + ] + ] + }, + { + "type": "turnBlock", + "direction": "left", + "loc": [ + [ + 8, + 6 + ] + ] + }, + "\t[汪周,N468]\b[this,6,3]圣子殿下，你屈尊来骑士队，真是令骑士队蓬荜生辉呀。", + "\t[莫析辉,hero]\b[hero]骑士队长客气了。只是这位骑士，怎么……", + { + "type": "turnBlock", + "direction": "down", + "loc": [ + [ + 6, + 3 + ] + ] + }, + "\t[汪周,N468]\b[this,6,3]凌依，你在干什么？圣子殿下来了，你还杵在那里，不知道要面向殿下吗？", + "\t[凌依,N574]\b[this,6,6]我眼里，只有骑士团的规矩，没有其他的！", + { + "type": "turnBlock", + "direction": "left", + "loc": [ + [ + 6, + 3 + ] + ] + }, + "\t[汪周,N468]\b[this,6,3]圣子殿下莫怪，这个凌依在骑士队也是数一数二的高手，他比罗涛、卢轩、牧迟丝毫不逊啊。所以有些傲气……", + "\t[莫析辉,hero]\b[hero]哈哈，高手有些傲气是应该的。凌依骑士，我看好你哦！", + "\t[凌依,N574]\b[this,6,6]多谢圣子殿下。", + "\t[罗涛,N582]\b[this,3,4]切！", + "\t[汪周,N468]\b[this,6,3]都解散了吧！", + { + "type": "hide", + "loc": [ + [ + 4, + 6 + ] + ], + "remove": true + }, + { + "type": "hide", + "loc": [ + [ + 8, + 6 + ] + ], + "remove": true + }, + "\t[罗涛,N582]\b[this,3,4]凌依，有本事来单挑一场么？", + "\t[凌依,N574]\b[this,6,6]呵，来啊！", + "\t[罗涛,N582]\b[this,3,4]我今天就替圣子殿下教训教训你！", + "\t[莫析辉,hero]\b[hero]那你们好好打，谁打赢了，我就奖他百两黄金！", + "\t[罗涛,N582]\b[this,3,4]是！", + { + "type": "turnBlock", + "direction": "left", + "loc": [ + [ + 6, + 6 + ] + ] + }, + "\t[凌依,N574]\b[this,6,6]谢圣子殿下！", + "\t[莫析辉,hero]\b[hero]去吧！", + { + "type": "hide", + "loc": [ + [ + 3, + 4 + ] + ], + "remove": true + }, + { + "type": "hide", + "loc": [ + [ + 6, + 6 + ] + ], + "remove": true + } + ], "eachArrive": [], "parallelDo": "", "events": {}, @@ -38,7 +169,7 @@ main.floors.GM6= [50049,50049,50049,50049,50049,50049,50049,50049,50049,50049,50049,50049,50049], [50049,50167, 0, 0, 0, 0, 0, 0, 0, 0, 0,50167,50049], [50049, 0, 0,20636, 0, 0,468, 0, 0,20636, 0, 0,50049], - [50049, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,50049], + [50049, 0, 0,584, 0, 0, 0, 0, 0, 0, 0, 0,50049], [50049,440, 0, 0, 0, 0, 0, 0, 0, 0, 0,440,50049], [ 94, 0, 0, 0,443, 0,577, 0,443, 0, 0, 0, 94], [50049,443, 0, 0, 0, 0, 0, 0, 0, 0, 0,443,50049], diff --git a/project/floors/SN10.js b/project/floors/SN10.js index 25aa108..94b15fe 100644 --- a/project/floors/SN10.js +++ b/project/floors/SN10.js @@ -39,11 +39,226 @@ main.floors.SN10= "\t[蜜茜娅,N489]\b[this,6,2]弟弟误会了，姐姐也是为了弟弟，锻炼锻炼啦。要知道，我养这么多怪物，也是不容易的，拿出来给弟弟练练手，也是促进弟弟的实力嘛。", "\t[蜜茜娅,N489]\b[this,6,2]还不快给圣子殿下上茶？", "\t[蝶影,N432]\b[this,7,4]是。", - "\t[莫析辉,hero]\b[hero]不必了，咱们直接研习光明法术吧！" + "\t[莫析辉,hero]\b[hero]不必了，咱们直接研习光明法术吧！", + "\t[蜜茜娅,N489]\b[this,6,2]也行。咱们光明神殿有一招联合绝技，光明裁决。专门克制黑暗的。", + "\t[莫析辉,hero]\b[hero]黑暗？", + "\t[蜜茜娅,N489]\b[this,6,2]是的，在很久很久以前，光明与黑暗并存。光明之神最终打败了黑暗之神，所以现在的光明神殿占据着大陆绝大部分。", + "\t[蜜茜娅,N489]\b[this,6,2]不过想来这光明裁决也用不上，毕竟黑暗神殿早已没落，要是黑暗神殿能卷土重来，那才是真正的笑话。", + "\t[莫析辉,hero]\b[hero]也是，光明神殿现在坐拥四大帝国，二十八大家族，黑暗神殿想要卷土重来，除非破除四大帝国，二十八大家族，否则，凭什么与光明神殿斗？", + "\t[蜜茜娅,N489]\b[this,6,2]唉，都是教皇爷爷和大长老逼我们练习。我和葛尔丹早就练烦了。我觉得与圣子弟弟更亲切，我们一定可以练习得更好。", + "\t[莫析辉,hero]\b[hero]嗯。听说姐姐与南荒帝国的二皇子订婚了，真是可喜可贺。", + "\t[蜜茜娅,N489]\b[this,6,2]那可比不过圣子弟弟，这么早就撩到了北寒帝国三公主。", + "\t[莫析辉,hero]\b[hero]圣女姐姐消息好灵通，居然知道了我与希娜联姻的事情。", + "\t[蜜茜娅,N489]\b[this,6,2]这有什么，圣子弟弟，咱们赶紧练习光明法术吧！", + "\t[莫析辉,hero]\b[hero]好。", + { + "type": "setCurtain", + "color": [ + 0, + 0, + 0, + 1 + ], + "time": 500, + "keep": true + }, + { + "type": "sleep", + "time": 500 + }, + "一天后", + { + "type": "setCurtain", + "time": 500 + }, + "修炼光明法术有成，光明宝典晋级！", + { + "type": "setValue", + "name": "item:I624", + "operator": "+=", + "value": "1" + }, + "\t[蜜茜娅,N489]\b[this,6,2]时候不早了，圣子弟弟早些回去吧！", + "\t[莫析辉,hero]\b[hero]好。", + "\t[蜜茜娅,N489]\b[this,6,2]对了，葛尔丹不是什么好东西，你可当心点呀。他表面上与你笑嘻嘻的，背地里说不准就给你一刀子。", + { + "type": "choices", + "text": "\t[到底相信谁？]选择", + "choices": [ + { + "text": "葛尔丹", + "action": [ + "与光明准圣子葛尔丹亲密度+1", + { + "type": "setValue", + "name": "flag:zhunshengzi", + "operator": "+=", + "value": "1" + } + ] + }, + { + "text": "蜜西娅", + "action": [ + "与光明圣女蜜西娅亲密度+1", + { + "type": "setValue", + "name": "flag:guangmingshengnv", + "operator": "+=", + "value": "1" + } + ] + } + ] + }, + "\t[莫析辉,hero]\b[hero]好。多谢圣女姐姐。", + "\t[罗涛,N582]\b[this,7,8]圣子殿下，教皇陛下说，要你有空去骑士团看看，了解了解光明神殿的架构。", + "\t[莫析辉,hero]\b[hero]嗯，我知道了，那就去看看吧！", + { + "type": "hide", + "loc": [ + [ + 7, + 8 + ] + ], + "remove": true + }, + { + "type": "hide", + "loc": [ + [ + 10, + 6 + ] + ], + "floorId": "GM2", + "remove": true + } ], "eachArrive": [], "parallelDo": "", - "events": {}, + "events": { + "10,3": [ + { + "type": "confirm", + "text": "确认要打开这个宝箱吗?", + "yes": [ + { + "type": "if", + "condition": "(status:mana<200)", + "true": [ + { + "type": "playSound", + "name": "操作失败" + }, + "你的魔力不足!" + ], + "false": [ + { + "type": "setValue", + "name": "status:mana", + "operator": "-=", + "value": "200" + }, + { + "type": "playSound", + "name": "door.mp3" + }, + { + "type": "setBlock", + "number": "X60341" + }, + "获得七阶血红宝石一枚、五阶黄宝石一枚、琼浆一瓶", + { + "type": "setValue", + "name": "item:I611", + "operator": "+=", + "value": "1" + }, + { + "type": "setValue", + "name": "item:I357", + "operator": "+=", + "value": "1" + }, + { + "type": "setValue", + "name": "item:I415", + "operator": "+=", + "value": "1" + } + ] + } + ], + "no": [] + } + ], + "2,3": [ + { + "type": "confirm", + "text": "确认要打开这个宝箱吗?", + "yes": [ + { + "type": "if", + "condition": "(status:mana<200)", + "true": [ + { + "type": "playSound", + "name": "操作失败" + }, + "你的魔力不足!" + ], + "false": [ + { + "type": "setValue", + "name": "status:mana", + "operator": "-=", + "value": "200" + }, + { + "type": "playSound", + "name": "door.mp3" + }, + { + "type": "setBlock", + "number": "X60341" + }, + "获得黄钥匙*5，蓝钥匙*1，金币*100", + { + "type": "setValue", + "name": "item:yellowKey", + "operator": "+=", + "value": "5" + }, + { + "type": "setValue", + "name": "item:blueKey", + "operator": "+=", + "value": "1" + }, + { + "type": "setValue", + "name": "status:money", + "operator": "+=", + "value": "100" + } + ] + } + ], + "no": [] + } + ], + "5,4": [ + "\t[牧迟,N473]\b[this]守护骑士牧迟，永远忠于圣女殿下！" + ], + "7,4": [ + "\t[蝶影,N432]\b[this]圣子殿下，在这里的两个红色的大宝箱，里面有好东西哦！" + ], + "6,2": [ + "\t[蜜茜娅,N489]\b[this]啊，你说我怎么知道你和希娜的婚事的，当然是听说啦，听说啦！" + ] + }, "changeFloor": { "6,12": { "floorId": "SN9", @@ -63,8 +278,8 @@ main.floors.SN10= "map": [ [ 0,50049,50049,50049,50049,50049,50049,50049,50049,50049,50049,50049, 0], [ 0,50049,50049,50049,50049,50049,50071,50049,50049,50049,50049,50049, 0], - [ 0, 0,60549, 0, 0,50100,489,50100, 0, 0,60549, 0, 0], - [30858,30859,60355,50162,50163, 0, 0, 0,50162,50163,60355,30856,30857], + [ 0, 0,60355, 0, 0,50100,489,50100, 0, 0,60355, 0, 0], + [30858,30859,60549,50162,50163, 0, 0, 0,50162,50163,60549,30856,30857], [ 0, 0, 0, 0, 0,473, 0,432, 0, 0, 0, 0, 0], [50164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,50164], [ 0, 0,50165,50094, 0, 0, 0, 0, 0,50095,50165, 0, 0], diff --git a/project/maps.js b/project/maps.js index 3997056..1b0a843 100644 --- a/project/maps.js +++ b/project/maps.js @@ -963,5 +963,6 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "1065": {"cls":"enemys","id":"E1065"}, "1066": {"cls":"enemys","id":"E1066"}, "1067": {"cls":"terrains","id":"T1067"}, - "10111": {"cls":"tileset","id":"X10111","event":["这个宝箱是空的!"]} + "10111": {"cls":"tileset","id":"X10111","event":["这个宝箱是空的!"]}, + "60341": {"cls":"tileset","id":"X60341","event":["这个宝箱是空的!"]} } \ No newline at end of file