From fbeff7054f17013bc73939078997ad008f0049e5 Mon Sep 17 00:00:00 2001 From: bdf1 Date: Fri, 11 Nov 2022 02:29:36 +1300 Subject: [PATCH] fix(mt0): fix statusBar when first enter, duration when first enter MT0, some of the talking in MT0 --- _server/config.json | 2 +- project/floors/MT0.js | 246 +++++++++++++++++++++------------------ project/floors/MUDI.js | 1 + project/floors/nandu.js | 19 ++- project/images/black.png | Bin 30054 -> 921654 bytes 5 files changed, 144 insertions(+), 124 deletions(-) diff --git a/_server/config.json b/_server/config.json index b30ba26..5e06dd2 100644 --- a/_server/config.json +++ b/_server/config.json @@ -1 +1 @@ -{"viewportLoc":[0,0],"editorLastFloorId":"mishi"} \ No newline at end of file +{"viewportLoc":[0,0],"editorLastFloorId":"guantong"} \ No newline at end of file diff --git a/project/floors/MT0.js b/project/floors/MT0.js index b8e290d..2181a3d 100644 --- a/project/floors/MT0.js +++ b/project/floors/MT0.js @@ -505,15 +505,22 @@ main.floors.MT0= "time": 3000 }, { - "type": "showImage", - "code": 1, + "type": "showImage2", + "code": 2, "image": "shaohusikao.png", - "loc": [ + "sloc": [ 0, - 20 + 0, + null + ], + "loc": [ + 80, + 50, + 291, + 466 ], "opacity": 1, - "time": 0 + "time": 500 }, { "type": "sleep", @@ -533,16 +540,11 @@ main.floors.MT0= "type": "sleep", "time": 3000 }, - "\t[邵虎]我知道你在那里,快给我出来。", + "\t[邵虎]我知道你在那里......快给我出来。", { "type": "sleep", "time": 1000 }, - { - "type": "hideImage", - "code": 1, - "time": 0 - }, { "type": "playSound", "name": "magic.mp3", @@ -567,144 +569,162 @@ main.floors.MT0= "code": 1, "image": "xianzileng.png", "loc": [ - 180, - 0 + 170, + 50 ], "opacity": 1, - "time": 0 + "time": 500 }, { "type": "sleep", "time": 1000 }, - "\t[？？？].................", + "\t[???]................", { "type": "sleep", "time": 2000 }, + { + "type": "showImage2", + "code": 2, + "image": "shaohuyilv.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 80, + 50, + 291, + 466 + ], + "opacity": 1, + "time": 500 + }, + "\t[邵虎]........（女孩子！？）", + { + "type": "sleep", + "time": 2000 + }, + { + "type": "showImage2", + "code": 2, + "image": "shaohusikao.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 80, + 50, + 291, + 466 + ], + "opacity": 1, + "time": 500 + }, + "\t[邵虎]........（漂浮在半空中的女孩子......是妖精吗？）", + { + "type": "sleep", + "time": 1000 + }, + { + "type": "showImage", + "code": 1, + "image": "xianzi.png", + "loc": [ + 170, + 50 + ], + "opacity": 1, + "time": 500 + }, + { + "type": "sleep", + "time": 1000 + }, + "\t[???]你......你好.........", + "\t[邵虎]........你是谁........", + "\t[???]我是这座塔的守塔仙子........", + "\t[守塔仙子]邵....啊不.....这位勇士，请你回去吧。塔里过于凶险..........", + "\t[邵虎]谢谢你的好意....不过我还是要进去的。", + "\t[守塔仙子]为什么......这座塔并没有什么宝藏，也不值得你来探索......", + "\t[邵虎]仙子，有些事情是不可以选择的。", + "\t[守塔仙子]啊..............", + "\t[邵虎]有些事情是自己必须要去做的......你明白吗？", + "\t[守塔仙子]你.......你是指.........", + "\t[邵虎]我想守护的人和教我怎样守护别人的人在里面，我怕他们有危险，所以我必须走这一趟。", + { + "type": "showImage", + "code": 1, + "image": "xianzileng.png", + "loc": [ + 170, + 50 + ], + "opacity": 1, + "time": 500 + }, + "\t[守塔仙子]是吗......（我也......）", { "type": "hideImage", "code": 1, "time": 0 }, { - "type": "showImage", - "code": 1, - "image": "shaohuyilv.png", + "type": "animate", + "name": "shenglvehao", "loc": [ - 0, - 20 - ], - "opacity": 1, - "time": 0 - }, - "\t[邵虎].............（女孩子!?）", - { - "type": "sleep", - "time": 2000 + 8, + 6 + ] }, { "type": "showImage", "code": 1, - "image": "shaohusikao.png", - "loc": [ - 0, - 20 - ], - "opacity": 1, - "time": 0 - }, - "\t[邵虎]...............（漂浮在半空中的女孩子..........是妖精吗?）", - { - "type": "sleep", - "time": 1000 - }, - { - "type": "showImage", - "code": 1, - "image": "shaohusikao.png", - "loc": [ - -20, - 20 - ], - "opacity": 1, - "time": 0 - }, - { - "type": "showImage", - "code": 2, - "image": "xianzi.png", - "loc": [ - 180, - 0 - ], - "opacity": 1, - "time": 0 - }, - { - "type": "sleep", - "time": 1000 - }, - "\t[？？？]你......你好........", - "\t[邵虎]............你是谁............", - "\t[守塔仙子]我是这座塔的守塔仙子.............", - "\t[守塔仙子]邵.........啊不........这位勇士,请你回去吧,塔里过于凶险...........", - "\t[邵虎]谢谢你的好意.....不过我还是要进去的。", - "\t[守塔仙子]为什么..........这座塔并没有什么宝藏，也不值得你来探索........", - "\t[邵虎]仙子,有些事情是不可以选择的。", - "\t[守塔仙子]啊.........", - "\t[邵虎]有些事情是自己必须要去做的........你明白吗?", - "\t[守塔仙子]你.....你是指......", - "\t[邵虎]我想守护的人和教我怎样守护别人的人在里面,我怕他们有危险,所以我必须走这一趟。", - { - "type": "showImage", - "code": 2, "image": "xianzileng.png", "loc": [ - 180, - 0 + 170, + 50 ], "opacity": 1, - "time": 0 + "time": 500 }, - "\t[守塔仙子]是吗........（我也....）", "\t[守塔仙子]（是为了爱的坚持吗......）", - "\t[守塔仙子]（我没理由阻拦他呢.......）", - { - "type": "showImage", - "code": 2, - "image": "xianziwunai.png", - "loc": [ - 180, - 0 - ], - "opacity": 1, - "time": 0 - }, - "\t[守塔仙子]既、既然你一定要进塔的话,一定要小心啊。", + "\t[守塔仙子]（我没理由阻拦他呢......）", { "type": "showImage", "code": 1, - "image": "shaohuzixin.png", - "loc": [ - -20, - 20 - ], - "opacity": 1, - "time": 0 - }, - { - "type": "showImage", - "code": 2, "image": "xianziwunai.png", "loc": [ - 180, - 0 + 170, + 50 ], "opacity": 1, - "time": 0 + "time": 500 }, - "\t[邵虎]放心。（她好像还有什么想说的?）", + "\t[守塔仙子]既、既然你一定要进塔的话，一定要小心啊。", + { + "type": "showImage2", + "code": 2, + "image": "shaohuzixin.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 80, + 50, + 291, + 466 + ], + "opacity": 1, + "time": 500 + }, + "\t[邵虎]放心。（她好像还有什么想说的？）", { "type": "hideImage", "code": 1, diff --git a/project/floors/MUDI.js b/project/floors/MUDI.js index fd6917c..cd8a465 100644 --- a/project/floors/MUDI.js +++ b/project/floors/MUDI.js @@ -656,6 +656,7 @@ main.floors.MUDI= 7, 11 ], + "direction": "down", "time": 0 }, { diff --git a/project/floors/nandu.js b/project/floors/nandu.js index becc9f1..5808693 100644 --- a/project/floors/nandu.js +++ b/project/floors/nandu.js @@ -8,7 +8,7 @@ main.floors.nandu= "cannotViewMap": true, "images": [ { - "name": "nanduxuanze.jpg", + "name": "black.png", "canvas": "whole", "x": 0, "y": 0 @@ -19,7 +19,7 @@ main.floors.nandu= 0, 0, 0, - 1 + 0 ], "firstArrive": [ { @@ -63,15 +63,13 @@ main.floors.nandu= "keep": true }, { - "type": "setCurtain", - "color": [ - 0, - 0, - 0, - 0 - ], + "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['nanduxuanze.jpg'], 0, 0);\n\tif (step == steps) {\n\t\tclearInterval(animate);\n\t}\n}, per_time);\n}" + }, + { + "type": "sleep", "time": 500, - "keep": true + "noSkip": true }, { "type": "setValue", @@ -270,6 +268,7 @@ main.floors.nandu= 7, 11 ], + "direction": "down", "time": 0 }, { diff --git a/project/images/black.png b/project/images/black.png index 59e1e9d5b9c0ffcba9e251da5eea25c064f29dc2..24b92ea2b48b0b2a4b0cb9bfffcdc0ca850e8914 100644 GIT binary patch delta 168 zcmaF%igDWl3somyGXXvZ5HJH`4Ipk{Vqkc{$iTqJAOR9)U=ZNjXlPox(Lrqha9=0@ Dt-v;% delta 47 ncmdnCz~b2}MinRDv{D8zFawerK%4@_j0_TBaf8y0hEAmb_4o*D