diff --git a/project/floors/CETAI.js b/project/floors/CETAI.js index 6af71f4..5afbdec 100644 --- a/project/floors/CETAI.js +++ b/project/floors/CETAI.js @@ -37,12 +37,19 @@ main.floors.CETAI= "text": "Azure:哇哈哈哈哈哈哈哈哈终于看到个短小的事件了" }, { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "shengxiao.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 390, + 30, + "285.6", + "482.4" ], "dw": 100, "dh": 100, @@ -62,6 +69,14 @@ main.floors.CETAI= "enable": false, "noPass": null, "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, "data": [ { "type": "comment", @@ -83,36 +98,57 @@ main.floors.CETAI= "text": "否", "action": [ { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "jiekezixin.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 350, + 75, + "289.6", + "376.8" ], "opacity": 1, "time": 0 }, "\t[杰克].........................", { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "shaohuzixin.png", - "loc": [ + "sloc": [ 0, - 0 + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 }, "\t[邵虎]杰克，你怎么跑这里来了？", { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "jiekeyilv.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 350, + 75, + "289.6", + "376.8" ], "opacity": 1, "time": 0 @@ -124,12 +160,19 @@ main.floors.CETAI= "\t[杰克].......老大？", "\t[邵虎]怎么了？", { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "jiekezixin.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 350, + 75, + "289.6", + "376.8" ], "opacity": 1, "time": 0 @@ -166,7 +209,7 @@ main.floors.CETAI= "type": "animate", "name": "shenglvehao", "loc": [ - 10, + 11, 3 ] }, @@ -175,24 +218,38 @@ main.floors.CETAI= "time": 1000 }, { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "jiekezixin.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 350, + 75, + "289.6", + "376.8" ], "opacity": 1, "time": 0 }, "\t[杰克]那个.........老大。", { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "shaohuyilv.png", - "loc": [ + "sloc": [ 0, - 0 + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -200,12 +257,19 @@ main.floors.CETAI= "\t[邵虎]怎么了？", "\t[杰克]我想在这里多呆一会。你帮我留意一下我父亲的行踪好吗？", { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "shaohuzixin.png", - "loc": [ + "sloc": [ 0, - 0 + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -232,7 +296,7 @@ main.floors.CETAI= "number": "23", "loc": [ [ - 8, + 9, 3 ] ] @@ -250,12 +314,19 @@ main.floors.CETAI= ], "false": [ { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "jiekezixin.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 350, + 75, + "289.6", + "376.8" ], "opacity": 1, "time": 0 @@ -297,7 +368,7 @@ main.floors.CETAI= "type": "animate", "name": "sangang", "loc": [ - 4, + 5, 7 ] }, @@ -307,24 +378,38 @@ main.floors.CETAI= "value": "flag:juqing+1" }, { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "xianzi.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 330, + 50, + 320, + 480 ], "opacity": 1, "time": 0 }, "\t[守塔仙子]这花真漂亮呢，是吧......", { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "shaohusikao.png", - "loc": [ + "sloc": [ 0, - 0 + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -351,12 +436,19 @@ main.floors.CETAI= ], "false": [ { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "xianzi.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 330, + 50, + 320, + 480 ], "opacity": 1, "time": 0 @@ -413,29 +505,43 @@ main.floors.CETAI= "type": "animate", "name": "sangang", "loc": [ - 8, + 9, 6 ] }, { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "shaohusikao.png", - "loc": [ + "sloc": [ 0, - 0 + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 }, "\t[邵虎]媚骑士.........你跑到这来干什么？", { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "mei.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 330, + 50, + 328, + "413.6" ], "opacity": 1, "time": 0 @@ -443,48 +549,76 @@ main.floors.CETAI= "\t[媚骑士]这句话应该我问才对？", "\t[邵虎]没事，我喜欢来这里透透气，这里空气和风景都挺不错的。", { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "meimao.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 330, + 50, + 328, + "413.6" ], "opacity": 1, "time": 0 }, "\t[媚骑士]你还懂风景？", { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "meidaxiao.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 330, + 50, + 328, + "413.6" ], "opacity": 1, "time": 0 }, "\t[媚骑士]我说邵弟弟，我给你讲个故事好不好？", { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "shaohuyilv.png", - "loc": [ + "sloc": [ 0, - 0 + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 }, "\t[邵虎]...................", { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "meishihuai.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 330, + 50, + 328, + "413.6" ], "opacity": 1, "time": 0 @@ -499,24 +633,38 @@ main.floors.CETAI= "\t[媚骑士]她想念佣兵家族，想念曾经的骑士团，想念着每一座被她血刃的城池的繁荣。", "\t[媚骑士]她就像一把绑着鲜花的刀，注定不会在花丛中生活。", { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "meidaxiao.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 330, + 50, + 328, + "413.6" ], "opacity": 1, "time": 0 }, "\t[媚骑士]故事讲完了，邵弟弟，祝你好运咯~", { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "shaohusikao.png", - "loc": [ + "sloc": [ 0, - 0 + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -552,24 +700,38 @@ main.floors.CETAI= "text": "媚骑士讲完故事后再次对话" }, { - "type": "showImage", + "type": "showImage2", "code": 1, "image": "shaohusikao.png", - "loc": [ + "sloc": [ 0, - 0 + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 }, "\t[邵虎]....................", { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "mei.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 330, + 50, + 328, + "413.6" ], "opacity": 1, "time": 0 @@ -595,12 +757,19 @@ main.floors.CETAI= "text": "flag:338~-10层可以去死了" }, { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "meidaxiao.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 0 + 330, + 50, + 328, + "413.6" ], "opacity": 1, "time": 0 @@ -630,35 +799,34 @@ main.floors.CETAI= { "type": "move", "loc": [ - 10, + 11, 4 ], "time": 500, + "keep": true, "steps": [ - "left" - ], - "keep": true + "left:1" + ] }, { "type": "animate", "name": "shenglvehao", "loc": [ - 9, + 10, 4 ] }, { "type": "jump", "from": [ - 9, + 10, 4 ], "to": [ - 11, + 12, 4 ], - "time": 500, - "keep": false + "time": 500 }, { "type": "animate", diff --git a/project/floors/MT21.js b/project/floors/MT21.js index c7e8d71..eaab936 100644 --- a/project/floors/MT21.js +++ b/project/floors/MT21.js @@ -42,21 +42,28 @@ main.floors.MT21= "type": "comment", "text": "28shengqishi再触发9，8事件" }, - { - "type": "moveHero", - "steps": [ - "down:1" - ] - }, - { - "type": "animate", - "name": "gantanhao", - "loc": "hero" - }, { "type": "if", "condition": "(core.isReplaying()||flag:SkipThePlot)", "true": [ + { + "type": "if", + "condition": "core.isReplaying()", + "true": [ + { + "type": "if", + "condition": "switch:A", + "true": [ + { + "type": "moveHero", + "steps": [ + "down:1" + ] + } + ] + } + ] + }, { "type": "setValue", "name": "flag:SkipThePlot", @@ -138,6 +145,22 @@ main.floors.MT21= "type": "function", "function": "function(){\ncore.Confirmskip_On();\n}" }, + { + "type": "moveHero", + "steps": [ + "down:1" + ] + }, + { + "type": "setValue", + "name": "switch:A", + "value": "true" + }, + { + "type": "animate", + "name": "gantanhao", + "loc": "hero" + }, { "type": "showImage2", "code": 1, @@ -871,129 +894,124 @@ main.floors.MT21= "data": [ { "type": "if", - "condition": "(flag:137==1)", + "condition": "(flag:21fnpc==1)", "true": [ { - "type": "show" + "type": "showImage2", + "code": 4, + "image": "jiekedajiao.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 330, + 70, + "289.6", + "376.8" + ], + "opacity": 1, + "time": 0 + }, + "\t[杰克]估计又是........（嘀嘀咕咕....）", + { + "type": "hideImage", + "code": 4, + "time": 0 } ], "false": [ { - "type": "if", - "condition": "(flag:140==1)", - "true": [ - { - "type": "hide", - "remove": true - } + "type": "showImage2", + "code": 1, + "image": "jiekedajiao.png", + "sloc": [ + 0, + 0, + null ], - "false": [ - { - "type": "if", - "condition": "(flag:21fnpc==1)", - "true": [ - { - "type": "showImage2", - "code": 4, - "image": "jiekedajiao.png", - "sloc": [ - 0, - 0, - null - ], - "loc": [ - 330, - 70, - "289.6", - "376.8" - ], - "opacity": 1, - "time": 0 - }, - "\t[杰克]估计又是........（嘀嘀咕咕....）", - { - "type": "hideImage", - "code": 4, - "time": 0 - } - ], - "false": [ - "\t[杰克]老子存货不多了，靠！", - "\t[杰克]要是耽误我帮老大清塔以后就没这事了！", - { - "type": "sleep", - "time": 300 - }, - { - "type": "showImage2", - "code": 2, - "image": "shaohuzixin.png", - "sloc": [ - 0, - 0, - null - ], - "loc": [ - 80, - 50, - "291.2", - "466.4" - ], - "opacity": 1, - "time": 0 - }, - "\t[邵虎]杰克，发什么脾气啊？", - { - "type": "hideImage", - "code": 1, - "time": 0 - }, - { - "type": "showImage2", - "code": 3, - "image": "jiekeyilv.png", - "sloc": [ - 0, - 0, - null - ], - "loc": [ - 330, - 70, - "289.6", - "376.8" - ], - "opacity": 1, - "time": 0 - }, - "\t[杰克]诶...诶！！老..老大！？你怎么神出鬼没的啊。", - "\t[邵虎]怎么了？", - "\t[杰克]没事，刚才看到了一个联盟的熟人，敲诈了我点东西。", - "\t[邵虎]..........你也小心点啊。", - "\t[杰克]谁说不是呢！真是气人啊。估计又是........（嘀嘀咕咕....）", - { - "type": "hideImage", - "code": 2, - "time": 0 - }, - { - "type": "hideImage", - "code": 3, - "time": 0 - }, - { - "type": "setValue", - "name": "flag:21fnpc", - "value": "1" - }, - { - "type": "setValue", - "name": "flag:juqing", - "value": "flag:juqing+1" - } - ] - } - ] + "loc": [ + 330, + 70, + "289.6", + "376.8" + ], + "opacity": 1, + "time": 0 + }, + "\t[杰克]老子存货不多了，靠！", + "\t[杰克]要是耽误我帮老大清塔以后就没这事了！", + { + "type": "sleep", + "time": 300 + }, + { + "type": "showImage2", + "code": 2, + "image": "shaohuzixin.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" + ], + "opacity": 1, + "time": 0 + }, + "\t[邵虎]杰克，发什么脾气啊？", + { + "type": "hideImage", + "code": 1, + "time": 0 + }, + { + "type": "showImage2", + "code": 3, + "image": "jiekeyilv.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 330, + 70, + "289.6", + "376.8" + ], + "opacity": 1, + "time": 0 + }, + "\t[杰克]诶...诶！！老..老大！？你怎么神出鬼没的啊。", + "\t[邵虎]怎么了？", + "\t[杰克]没事，刚才看到了一个联盟的熟人，敲诈了我点东西。", + "\t[邵虎]..........你也小心点啊。", + "\t[杰克]谁说不是呢！真是气人啊。估计又是........（嘀嘀咕咕....）", + { + "type": "hideImage", + "code": 2, + "time": 0 + }, + { + "type": "hideImage", + "code": 3, + "time": 0 + }, + { + "type": "setValue", + "name": "flag:21fnpc", + "value": "1" + }, + { + "type": "setValue", + "name": "flag:juqing", + "value": "flag:juqing+1" } ] } diff --git a/project/floors/MT22.js b/project/floors/MT22.js index eb6e19b..f2890ef 100644 --- a/project/floors/MT22.js +++ b/project/floors/MT22.js @@ -520,8 +520,7 @@ main.floors.MT22= "\t[杰克]..............", "\t[杰克].......是吗。", "\t[杰克].......我懂了。在这里我会尽全力帮你的。", - "\t[邵虎]“要自省着前进。”汪洋大哥就是这么教我的。", - "\t[杰克]呵呵，彼此彼此。", + "\t[邵虎]呵呵，彼此彼此。", "\t[杰克]老大，你25层的异空间去过了没有？", "\t[邵虎]25层？我倒是知道有这么个地方，怎么？", "\t[杰克]如果体力不够的话，那里应该会有足够的补充。不过钥匙可能要很多。我这里有一把蓝钥匙，给老大先用吧。我自己可以拆墙的", diff --git a/project/floors/MT24.js b/project/floors/MT24.js index 8fd4def..c3416fb 100644 --- a/project/floors/MT24.js +++ b/project/floors/MT24.js @@ -468,7 +468,7 @@ main.floors.MT24= "opacity": 1, "time": 0 }, - "\t[邵虎]里这么乱，你也呆的下去？", + "\t[邵虎]这里这么乱，你也呆的下去？", { "type": "hideImage", "code": 2, diff --git a/project/floors/MT25.js b/project/floors/MT25.js index a05f073..90f1733 100644 --- a/project/floors/MT25.js +++ b/project/floors/MT25.js @@ -2826,6 +2826,17 @@ main.floors.MT25= "code": 5, "time": 0 }, + { + "type": "setBlock", + "number": "child", + "loc": [ + [ + 8, + 4 + ] + ], + "time": 0 + }, { "type": "move", "loc": [ @@ -2835,40 +2846,21 @@ main.floors.MT25= "time": 500, "keep": true, "steps": [ - "right", - "right", - "up", - "up", - "up", - "left", - "left", - "down", - "left", - "left", - "up", - "left", - "left", - "down", - "down", - "left", - "left", - "down", - "down", - "down", - "down", - "down", - "right", - "right", - "right", - "down", - "down", - "right", - "down", - "right", - "right", - "right", - "right", - "right" + "right:2", + "up:3", + "left:2", + "down:1", + "left:2", + "up:1", + "left:2", + "down:2", + "left:2", + "down:5", + "right:3", + "down:2", + "right:1", + "down:1", + "right:5" ] }, { diff --git a/project/floors/MT27.js b/project/floors/MT27.js index 6a9d398..812e23d 100644 --- a/project/floors/MT27.js +++ b/project/floors/MT27.js @@ -204,10 +204,7 @@ main.floors.MT27= { "type": "animate", "name": "wenhao", - "loc": [ - 2, - 5 - ] + "loc": "hero" }, { "type": "showImage2", @@ -672,17 +669,14 @@ main.floors.MT27= 5, 3 ], - "time": 200, + "time": 100, "keep": true, "steps": [ - "down", - "right", - "right", - "right", - "up", - "right", - "right", - "down" + "down:1", + "right:3", + "up:1", + "right:2", + "down:1" ] }, { diff --git a/project/floors/MT28.js b/project/floors/MT28.js index 26ffe88..3b548bd 100644 --- a/project/floors/MT28.js +++ b/project/floors/MT28.js @@ -38,19 +38,6 @@ main.floors.MT28= "parallelDo": "", "events": { "1,0": [ - { - "type": "if", - "condition": "(flag:133==1)", - "true": [ - { - "type": "setValue", - "name": "item:blueKey", - "operator": "-=", - "value": "1" - } - ], - "false": [] - }, { "type": "if", "condition": "(core.isReplaying()||flag:SkipThePlot)", @@ -71,19 +58,24 @@ main.floors.MT28= "remove": true }, { - "type": "moveHero", - "time": 500, - "steps": [ - "right:2" - ] + "type": "hide", + "loc": [ + [ + 8, + 5 + ] + ], + "remove": true }, { - "type": "changePos", + "type": "hide", "loc": [ - 6, - 5 + [ + 5, + 5 + ] ], - "direction": "left" + "remove": true } ], "false": [ @@ -183,6 +175,7 @@ main.floors.MT28= "type": "sleep", "time": 500 }, + "\t[金发骑士]呵......原来如此。", "\t[金发骑士]你就是邵虎吧？", { "type": "hideImage", @@ -460,14 +453,15 @@ main.floors.MT28= "value": "false" }, { - "type": "hide", + "type": "move", "loc": [ - [ - 5, - 5 - ] + 5, + 5 ], - "remove": true + "time": 500, + "steps": [ + "left:1" + ] }, { "type": "changePos", diff --git a/project/floors/MT30.js b/project/floors/MT30.js index 9b6064e..50c74f9 100644 --- a/project/floors/MT30.js +++ b/project/floors/MT30.js @@ -20,7 +20,7 @@ main.floors.MT30= [ 0,348,386, 2, 34, 0, 2, 4, 4, 2, 2, 2,215,352, 0], [ 0,348, 0, 2, 2,216, 2, 2, 4, 4, 2, 32, 0,352, 0], [ 0,348, 32,520, 2, 0, 31, 2, 2, 2, 2, 31, 2,352, 0], - [ 0,348, 2,551, 2, 2,384, 0,384, 2, 0,520, 0,352, 0], + [ 0,348, 2, 86, 2, 2,384, 0,384, 2, 0,520, 0,352, 0], [ 0,348, 2, 0, 0, 2, 34, 2, 0, 31, 0, 2, 31,352, 0], [ 0,349,346,346,346,346,346,346,346,346,346,346,346,347, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], @@ -48,6 +48,14 @@ main.floors.MT30= "name": "flag:SkipThePlot", "value": "false" }, + { + "type": "changePos", + "loc": [ + 6, + 1 + ], + "direction": "right" + }, { "type": "battle", "loc": [ @@ -115,10 +123,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -178,10 +186,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -202,15 +210,15 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 }, - "\t[邵虎]..........\\c[15]去找找杰克吧。说不定他会有办法。", + "\t[邵虎]..........\r[#fb928b]去找找杰克吧。\n\r\n说不定他会有办法。", { "type": "hideImage", "code": 21, @@ -233,28 +241,6 @@ main.floors.MT30= "operator": "+=", "value": "5" }, - { - "type": "hideHero" - }, - { - "type": "jumpHero", - "loc": [ - 6, - 1 - ], - "time": 500 - }, - { - "type": "showHero" - }, - { - "type": "changePos", - "loc": [ - 7, - 2 - ], - "direction": "right" - }, { "type": "show", "loc": [ @@ -369,10 +355,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -396,10 +382,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -422,10 +408,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -447,10 +433,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -506,10 +492,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -531,10 +517,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -556,10 +542,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -589,10 +575,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -615,10 +601,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -639,10 +625,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -654,9 +640,9 @@ main.floors.MT30= "\t[腐翼]........................", "\t[腐翼]........................", "\t[腐翼]........................", - "\t[腐翼]\\c[25]你...你说谁是小蝙蝠.........！！！", - "\t[腐翼]\\c[30]你才是小蝙蝠！！！", - "\t[腐翼]\\c[30]你们全家都是小蝙蝠！！！", + "\t[腐翼]\\c[44]你说谁是小蝙蝠.........！！！", + "\t[腐翼]\\c[49]你才是小蝙蝠！！！", + "\t[腐翼]\\c[52]你们全家都是小蝙蝠！！！", { "type": "hideImage", "code": 12, @@ -672,10 +658,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -698,10 +684,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -734,12 +720,6 @@ main.floors.MT30= "name": "yao1", "loc": "hero" }, - { - "type": "moveHero", - "steps": [ - "down:1" - ] - }, { "type": "move", "loc": [ @@ -750,35 +730,32 @@ main.floors.MT30= "keep": true, "steps": [ "down:1", - "left:2", - "down:1", + "left:1", + "leftdown:1", "left:1", "up:2", "right:3" ] }, - { - "type": "changePos", - "loc": [ - 9, - 4 - ], - "direction": "left" - }, - { - "type": "changePos", - "loc": [ - 9, - 4 - ], - "direction": "up" - }, { "type": "moveHero", "steps": [ "down:1" ] }, + { + "type": "changePos", + "direction": "left" + }, + { + "type": "changePos", + "direction": "up" + }, + { + "type": "animate", + "name": "yao2", + "loc": "hero" + }, { "type": "move", "loc": [ @@ -792,9 +769,10 @@ main.floors.MT30= ] }, { - "type": "animate", - "name": "yao2", - "loc": "hero" + "type": "moveHero", + "steps": [ + "backward:1" + ] }, { "type": "jumpHero", @@ -806,10 +784,6 @@ main.floors.MT30= }, { "type": "changePos", - "loc": [ - 8, - 3 - ], "direction": "right" }, { @@ -845,25 +819,25 @@ main.floors.MT30= 9, 3 ], - "time": 50, + "time": 200, "keep": true, "steps": [ - "right:2", - "up:2" + "right:1" ] }, { - "type": "jump", - "from": [ + "type": "move", + "loc": [ 10, - 1 + 3 ], - "to": [ - 7, - 4 - ], - "time": 100, - "keep": true + "time": 50, + "keep": true, + "steps": [ + "rightup:1", + "up:1", + "leftdown:3" + ] }, { "type": "animate", @@ -883,10 +857,6 @@ main.floors.MT30= }, { "type": "changePos", - "loc": [ - 9, - 4 - ], "direction": "left" }, { @@ -919,24 +889,19 @@ main.floors.MT30= }, { "type": "changePos", - "loc": [ - 8, - 3 - ], "direction": "down" }, { - "type": "jump", - "from": [ - 6, + "type": "move", + "loc": [ + 7, 4 ], - "to": [ - 10, - 1 - ], - "time": 200, - "keep": true + "time": 50, + "keep": true, + "steps": [ + "rightup:3" + ] }, { "type": "animate", @@ -951,7 +916,7 @@ main.floors.MT30= { "type": "move", "loc": [ - 11, + 10, 1 ], "time": 50, @@ -963,10 +928,6 @@ main.floors.MT30= }, { "type": "changePos", - "loc": [ - 8, - 3 - ], "direction": "right" }, { @@ -985,15 +946,13 @@ main.floors.MT30= { "type": "move", "loc": [ - 10, + 9, 3 ], "time": 50, "keep": true, "steps": [ - "left:1", - "up:1", - "left:1" + "leftup:1" ] }, { @@ -1014,10 +973,6 @@ main.floors.MT30= }, { "type": "changePos", - "loc": [ - 7, - 2 - ], "direction": "down" }, { @@ -1026,10 +981,6 @@ main.floors.MT30= }, { "type": "changePos", - "loc": [ - 7, - 2 - ], "direction": "right" }, { @@ -1054,53 +1005,17 @@ main.floors.MT30= "name": "yao2", "loc": "hero" }, - { - "type": "moveHero", - "time": 200, - "steps": [ - "left:1" - ] - }, { "type": "changePos", - "loc": [ - 6, - 2 - ], "direction": "right" }, - { - "type": "move", - "loc": [ - 8, - 2 - ], - "time": 200, - "keep": true, - "steps": [ - "left:1" - ] - }, - { - "type": "animate", - "name": "yao2", - "loc": "hero" - }, { "type": "moveHero", "time": 200, "steps": [ - "up:1" + "backward:1" ] }, - { - "type": "changePos", - "loc": [ - 6, - 1 - ], - "direction": "down" - }, { "type": "move", "loc": [ @@ -1118,21 +1033,17 @@ main.floors.MT30= "name": "yao2", "loc": "hero" }, + { + "type": "changePos", + "direction": "down" + }, { "type": "moveHero", "time": 200, "steps": [ - "left:1" + "backward:1" ] }, - { - "type": "changePos", - "loc": [ - 5, - 1 - ], - "direction": "right" - }, { "type": "move", "loc": [ @@ -1150,21 +1061,17 @@ main.floors.MT30= "name": "yao2", "loc": "hero" }, + { + "type": "changePos", + "direction": "right" + }, { "type": "moveHero", "time": 200, "steps": [ - "left:1" + "backward:1" ] }, - { - "type": "changePos", - "loc": [ - 4, - 1 - ], - "direction": "right" - }, { "type": "move", "loc": [ @@ -1177,6 +1084,22 @@ main.floors.MT30= "left:1" ] }, + { + "type": "animate", + "name": "yao2", + "loc": "hero" + }, + { + "type": "changePos", + "direction": "right" + }, + { + "type": "moveHero", + "time": 200, + "steps": [ + "backward:1" + ] + }, { "type": "waitAsync" }, @@ -1191,11 +1114,11 @@ main.floors.MT30= { "type": "jump", "from": [ - 4, + 5, 1 ], "to": [ - 9, + 10, 1 ], "time": 200, @@ -1210,8 +1133,8 @@ main.floors.MT30= "time": 50, "keep": true, "steps": [ - "left:2", - "down:1", + "left:1", + "leftdown:1", "left:3" ] }, @@ -1225,10 +1148,6 @@ main.floors.MT30= }, { "type": "changePos", - "loc": [ - 6, - 2 - ], "direction": "down" }, { @@ -1237,10 +1156,6 @@ main.floors.MT30= }, { "type": "changePos", - "loc": [ - 6, - 2 - ], "direction": "left" }, { @@ -1248,13 +1163,6 @@ main.floors.MT30= "name": "yao1", "loc": "hero" }, - { - "type": "moveHero", - "time": 200, - "steps": [ - "right:1" - ] - }, { "type": "move", "loc": [ @@ -1267,26 +1175,17 @@ main.floors.MT30= "right:1" ] }, - { - "type": "animate", - "name": "yao3", - "loc": "hero" - }, { "type": "moveHero", "time": 200, - "async": true, "steps": [ - "right:1" + "backward:1" ] }, { - "type": "changePos", - "loc": [ - 8, - 2 - ], - "direction": "left" + "type": "animate", + "name": "yao3", + "loc": "hero" }, { "type": "move", @@ -1301,27 +1200,35 @@ main.floors.MT30= "right:1" ] }, + { + "type": "moveHero", + "time": 200, + "async": true, + "steps": [ + "backward:1" + ] + }, { "type": "animate", "name": "yao2", "loc": "hero" }, + { + "type": "moveHero", + "time": 200, + "async": true, + "steps": [ + "left:1" + ] + }, { "type": "jumpHero", "dxy": [ - -2, + -1, 0 ], "time": 200 }, - { - "type": "changePos", - "loc": [ - 6, - 2 - ], - "direction": "right" - }, { "type": "animate", "name": "huangjinduanjian", @@ -1344,10 +1251,6 @@ main.floors.MT30= }, { "type": "changePos", - "loc": [ - 8, - 2 - ], "direction": "left" }, { @@ -1397,6 +1300,13 @@ main.floors.MT30= "left:1" ] }, + { + "type": "moveHero", + "time": 200, + "steps": [ + "left:1" + ] + }, { "type": "animate", "name": "huangjinduanjian", @@ -1624,10 +1534,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -1649,15 +1559,8 @@ main.floors.MT30= "keep": true }, { - "type": "setCurtain", - "color": [ - 0, - 0, - 0, - 1 - ], - "time": 200, - "keep": true + "type": "function", + "function": "function(){\ncore.maskPrepare();\n}" }, { "type": "changeFloor", @@ -1668,20 +1571,6 @@ main.floors.MT30= ] } ] - }, - { - "type": "choices", - "text": "是否跳过剧情", - "choices": [ - { - "text": "是", - "action": [] - }, - { - "text": "否", - "action": [] - } - ] } ], "13,0": [ @@ -1721,10 +1610,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -1747,10 +1636,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -1784,10 +1673,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -1821,10 +1710,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -1858,10 +1747,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -1895,10 +1784,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -1959,16 +1848,12 @@ main.floors.MT30= }, { "type": "changePos", - "loc": [ - 6, - 1 - ], "direction": "right" }, { "type": "jump", "from": [ - 6, + 7, 1 ], "dxy": [ @@ -1988,16 +1873,6 @@ main.floors.MT30= { "type": "waitAsync" }, - { - "type": "hide", - "loc": [ - [ - 10, - 3 - ] - ], - "remove": true - }, { "type": "setBgFgBlock", "name": "bg", @@ -2011,10 +1886,7 @@ main.floors.MT30= }, { "type": "battle", - "loc": [ - 10, - 3 - ] + "id": "E383" }, { "type": "playSound", @@ -2049,10 +1921,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -2112,10 +1984,10 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -2136,16 +2008,15 @@ main.floors.MT30= null ], "loc": [ - 0, + 80, 50, - 291, - 466 + "291.2", + "466.4" ], "opacity": 1, "time": 0 }, - "\t[邵虎]..........\\c[15]去找找杰克吧。", - "\t[邵虎]..........\\c[12]说不定他会有办法。", + "\t[邵虎]..........\r[#fb928b]去找找杰克吧。\n\r\n说不定他会有办法。", { "type": "hideImage", "code": 11, @@ -2231,46 +2102,24 @@ main.floors.MT30= "afterGetItem": { "10,1": [ { - "type": "setBlock", - "number": "N551", + "type": "openDoor", "loc": [ - [ - 11, - 2 - ] - ] - }, - { - "type": "hide", - "loc": [ - [ - 3, - 10 - ] + 3, + 10 ], - "remove": true + "async": true }, { - "type": "setBgFgBlock", - "name": "bg", - "number": "86", + "type": "closeDoor", + "id": "steelDoor", "loc": [ - [ - 11, - 2 - ] - ] + 11, + 2 + ], + "async": true }, { - "type": "setBgFgBlock", - "name": "bg", - "number": "323", - "loc": [ - [ - 3, - 10 - ] - ] + "type": "waitAsync" } ] }, @@ -2602,7 +2451,7 @@ main.floors.MT30= [ 0, 0, 0, 2, 0, 0, 2, 0, 0, 2, 2, 2, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], diff --git a/project/floors/wangyang30.js b/project/floors/wangyang30.js index dbba0b0..9b28705 100644 --- a/project/floors/wangyang30.js +++ b/project/floors/wangyang30.js @@ -33,16 +33,35 @@ main.floors.wangyang30= "events": { "1,0": [ { - "type": "setCurtain", - "time": 500 + "type": "function", + "function": "function(){\ncore.dom.wholeCtx.fillRect(0,0,core.dom.whole.width,core.dom.whole.height)\n}" }, { - "type": "showImage", + "type": "function", + "function": "function(){\nvar time = 500;\ntime /= Math.max(core.status.replay.speed, 1)\nvar per_time = 50,\n\tstep = 0,\n\tsteps = parseInt(time / per_time);\nvar animate = core.isReplaying() ? 0 : setInterval(function () {\n\tstep++;\n\tcore.dom.wholeCtx.globalAlpha = 1;\n\tcore.dom.wholeCtx.fillRect(0, 0, core.dom.whole.width, core.dom.whole.height);\n\tcore.dom.wholeCtx.globalAlpha = step / steps;\n\tcore.drawImage(core.dom.wholeCtx, core.material.images.images['30juqing.png'], 0, 0);\n\tif (step == steps) {\n\t\tclearInterval(animate);\n\t}\n}, per_time);\n}" + }, + { + "type": "setCurtain", + "time": 0 + }, + { + "type": "function", + "function": "function(){\ncore.maskFliter(500,'020-Flat01.png')\n}" + }, + { + "type": "showImage2", "code": 1, "image": "wangyangyouyu.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -54,12 +73,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 2, "image": "shaohuziya.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -71,12 +97,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 3, "image": "wangyangyouyu.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -88,24 +121,38 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 4, "image": "shaohuziya.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 }, - "\t[邵虎]呼......呼..........", + "\t[邵虎]呼.....唔..........", { - "type": "showImage", + "type": "showImage2", "code": 5, "image": "wangyangyouyu.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -117,12 +164,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 6, "image": "shaohuliuhan.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -135,12 +189,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 7, "image": "wangyangqianxiao.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -152,12 +213,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 8, "image": "shaohuyilv.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -170,12 +238,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", - "code": 8, + "type": "showImage2", + "code": 9, "image": "shaohusikao.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -190,12 +265,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 10, "image": "shaohuyilv.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -209,12 +291,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 11, "image": "wangyangyouyu.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -226,12 +315,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 12, "image": "shaohuzixin.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -244,12 +340,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 13, "image": "shaohuyilv.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -262,12 +365,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 14, "image": "wangyangqianxiao.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -281,12 +391,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 15, "image": "shaohuzixin.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -303,12 +420,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 16, "image": "shaohuyilv.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -323,12 +447,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 17, "image": "shaohujinzhang.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -341,12 +472,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 19, "image": "shaohuyilv.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -361,12 +499,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 20, "image": "wangyangyouyu.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -379,12 +524,19 @@ main.floors.wangyang30= "time": 0 }, { - "type": "showImage", + "type": "showImage2", "code": 21, "image": "shaohuzixin.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - -30, - 20 + 80, + 50, + "291.2", + "466.4" ], "opacity": 1, "time": 0 @@ -406,12 +558,19 @@ main.floors.wangyang30= "time": 500 }, { - "type": "showImage", + "type": "showImage2", "code": 22, "image": "wangyangyouyu.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -427,12 +586,19 @@ main.floors.wangyang30= "time": 500 }, { - "type": "showImage", + "type": "showImage2", "code": 23, "image": "wangyangyouyu.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -448,12 +614,19 @@ main.floors.wangyang30= "time": 500 }, { - "type": "showImage", + "type": "showImage2", "code": 24, "image": "wangyangyouyu.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -469,12 +642,19 @@ main.floors.wangyang30= "time": 500 }, { - "type": "showImage", + "type": "showImage2", "code": 25, "image": "wangyangyouyu.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 @@ -490,12 +670,19 @@ main.floors.wangyang30= "time": 500 }, { - "type": "showImage", + "type": "showImage2", "code": 26, "image": "wangyangyouyu.png", + "sloc": [ + 0, + 0, + null + ], "loc": [ - 180, - 15 + 330, + 60, + "322.4", + 448 ], "opacity": 1, "time": 0 diff --git a/project/items.js b/project/items.js index 2a84217..e513eab 100644 --- a/project/items.js +++ b/project/items.js @@ -180,10 +180,11 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "animate": "sword", "value": { "atk": 40 - } + }, + "percentage": {} }, - "itemEffect": "core.status.hero.atk += 50", - "itemEffectTip": "，攻击+50" + "itemEffect": "core.status.hero.atk += 40", + "itemEffectTip": "，攻击+40" }, "sword4": { "cls": "items", @@ -260,9 +261,10 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "type": 1, "value": { "def": 40 - } + }, + "percentage": {} }, - "itemEffect": "core.status.hero.def += 50", + "itemEffect": "core.status.hero.def += 40", "itemEffectTip": "，防御+40" }, "shield4": { diff --git a/project/maps.js b/project/maps.js index dd632cf..9351c49 100644 --- a/project/maps.js +++ b/project/maps.js @@ -66,7 +66,7 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "83": {"cls":"animates","id":"redDoor","trigger":"openDoor","doorInfo":{"time":160,"openSound":"door.ogg","closeSound":"door.ogg","keys":{"redKey":1}},"animate":1}, "84": {"cls":"animates","id":"greenDoor","trigger":"openDoor","doorInfo":{"time":160,"openSound":"door.ogg","closeSound":"door.ogg","keys":{"greenKey":1}},"animate":1}, "85": {"cls":"animates","id":"specialDoor","trigger":"openDoor","doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"specialKey":1}},"animate":1}, - "86": {"cls":"animates","id":"steelDoor","trigger":"openDoor","doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}},"animate":1,"canPass":false,"cannotOut":[],"cannotIn":[]}, + "86": {"cls":"animates","id":"steelDoor","trigger":"openDoor","doorInfo":{"time":160,"openSound":"door.ogg","closeSound":"door.ogg","keys":{"steelKey":1}},"animate":1,"canPass":false,"cannotOut":[],"cannotIn":[]}, "87": {"cls":"terrains","id":"upFloor","noPass":false}, "88": {"cls":"terrains","id":"downFloor","noPass":false,"canPass":false}, "89": {"cls":"animates","id":"portal","noPass":false}, diff --git a/project/materials/npcs.png b/project/materials/npcs.png index 3b20a50..482ba3c 100644 Binary files a/project/materials/npcs.png and b/project/materials/npcs.png differ