From fec84878bff917104c110b8b2e167f92ebe5c5a3 Mon Sep 17 00:00:00 2001 From: Erdnase <1398341065@qq.com> Date: Tue, 18 Apr 2023 23:10:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9=E9=9A=BE?= =?UTF-8?q?=E5=BA=A6=E5=B1=82=E5=9B=BE=E7=89=87=E5=B7=A6=E7=A7=BB=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E5=A4=8DMT0=E6=A2=85=E8=8A=B1=E5=B1=8F?= =?UTF-8?q?=E9=9A=9C=E5=AF=B9=E8=AF=9D=E9=97=AE=E9=A2=98=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DMT10=E5=9B=9E=E5=BF=86=E5=89=A7=E6=83=85=E5=AF=B9?= =?UTF-8?q?=E8=AF=9D=E9=97=AE=E9=A2=98=20MT10=E5=9B=9E=E5=BF=86=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E4=B8=AD=E6=A5=BC=E5=B1=82=E5=88=87=E6=8D=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BD=AC=E5=9C=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/floors/MT0.js | 12 +++++++++++- project/floors/huxiao1.js | 6 +++++- project/floors/huxiao2.js | 17 +++++------------ project/floors/huxiao3.js | 4 ++-- project/floors/nandu.js | 4 ++-- project/plugins.js | 3 +++ 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/project/floors/MT0.js b/project/floors/MT0.js index 6c2589b..3be70a5 100644 --- a/project/floors/MT0.js +++ b/project/floors/MT0.js @@ -81,7 +81,7 @@ main.floors.MT0= }, { "type": "if", - "condition": "(core.isReplaying()||flag:SkipThePlot)", + "condition": "(core.isReplaying()||(flag:SkipThePlot||switch:A))", "true": [ { "type": "setValue", @@ -93,6 +93,11 @@ main.floors.MT0= "type": "hideImage", "code": 1, "time": 0 + }, + { + "type": "setValue", + "name": "switch:A", + "value": "true" } ], "false": [ @@ -114,6 +119,11 @@ main.floors.MT0= "type": "hideImage", "code": 1, "time": 0 + }, + { + "type": "setValue", + "name": "switch:A", + "value": "true" } ] } diff --git a/project/floors/huxiao1.js b/project/floors/huxiao1.js index 9229673..6e49e98 100644 --- a/project/floors/huxiao1.js +++ b/project/floors/huxiao1.js @@ -81,7 +81,7 @@ main.floors.huxiao1= "\r[#f49af1]就绝对不允许联盟和外人对我们妖社不利!", "\r[#f49af1].........", "\r[#fb928b]........但愿吧。", - "\r[#fb928b]嗜骨......你知道我们为什么要暗地与联盟作时吗", + "\r[#fb928b]嗜骨......你知道我们为什么要暗地与联盟作对吗", "\r[#f49af1]....这.......因为他们是........", "\r[#fb928b]不........天塔本身就不是为了我们魔物而建造的。", "\r[#fb928b]建造天塔的本性在于封印【那个人】", @@ -118,6 +118,10 @@ main.floors.huxiao1= "\r[#fb928b]要小心点那个家伙.....", "\r[#fb928b]那家伙精得很,别说漏了什么......", "\r[#f49af1]魔龙大人请放心,我一定不辜负您的重托！", + { + "type": "function", + "function": "function(){\ncore.maskPrepare();\n}" + }, { "type": "changeFloor", "floorId": "huxiao2", diff --git a/project/floors/huxiao2.js b/project/floors/huxiao2.js index 74be4ea..65f8109 100644 --- a/project/floors/huxiao2.js +++ b/project/floors/huxiao2.js @@ -19,14 +19,14 @@ main.floors.huxiao2= "events": { "1,0": [ { - "type": "setCurtain", - "time": 500 + "type": "function", + "function": "function(){\ncore.maskFliter(500,'013-Square01.png')\n}" }, "\r[#f49af1]毒尾..........你怎么又背着我喝那种东西........", "\r[#87e291]没事的嗜骨......只有喝下这个......", "\r[#87e291] ......才能让自己的毒性更强啊.........", "\r[#f49af1]你给我.........不要喝了......", - "\r[#f49af1]你难道不知道你的是你的寿命......", + "\r[#f49af1]你难道不知道你喝的是你的寿命......", "\r[#f49af1]喝的是你的时间吗！！！？", "\r[#f49af1]你难道就不为了你身边的人想想?", "\r[#f49af1]血尾呢？你们关系不是最好了吗？", @@ -65,15 +65,8 @@ main.floors.huxiao2= "\r[#87e291](咕噜咕噜......）......", "\r[#f49af1]...........(我什么都做不了)........", { - "type": "setCurtain", - "color": [ - 0, - 0, - 0, - 1 - ], - "time": 500, - "keep": true + "type": "function", + "function": "function(){\ncore.maskPrepare();\n}" }, { "type": "changeFloor", diff --git a/project/floors/huxiao3.js b/project/floors/huxiao3.js index 1711102..ff9c862 100644 --- a/project/floors/huxiao3.js +++ b/project/floors/huxiao3.js @@ -19,8 +19,8 @@ main.floors.huxiao3= "events": { "1,0": [ { - "type": "setCurtain", - "time": 500 + "type": "function", + "function": "function(){\ncore.maskFliter(500,'013-Square01.png')\n}" }, "\r[#87e291]海骑士大人..........您就行行好吧...........", "\r[#9decf8]毒尾,你回去吧。", diff --git a/project/floors/nandu.js b/project/floors/nandu.js index 735b7b7..7729b32 100644 --- a/project/floors/nandu.js +++ b/project/floors/nandu.js @@ -86,7 +86,7 @@ main.floors.nandu= "function": "function(){\ncore.drawImage(core.dom.wholeCtx, core.material.images.images['nanduxuanze.jpg'], 0, 0);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 1 ? \"\" : \"an\") + 'easy.png'], -30, -55, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 2 ? \"\" : \"an\") + 'normal.png'], -30, 20, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 3 ? \"\" : \"an\") + 'hard.png'], -30, 95, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 4 ? \"\" : \"an\") + 'hell.png'], -30, 170, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 5 || flags.hard == 0 ? \"\" : \"an\") + 'cheating.png'], -30, 245, 710 * 0.6, 487 * 0.6);\n}" }, { - "type": "showImage2", + "type": "showImage", "code": 6, "image": "0easy.png", "loc": [ @@ -213,7 +213,7 @@ main.floors.nandu= "false": [ { "type": "function", - "function": "function(){\ncore.drawImage(core.dom.wholeCtx, core.material.images.images['nanduxuanze.jpg'], 0, 0);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 1 ? \"\" : \"an\") + 'easy.png'], -30, -55, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 2 ? \"\" : \"an\") + 'normal.png'], -30, 20, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 3 ? \"\" : \"an\") + 'hard.png'], -30, 95, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 4 ? \"\" : \"an\") + 'hell.png'], -30, 170, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 5 || flags.hard == 0 ? \"\" : \"an\") + 'cheating.png'], -30, 245, 710 * 0.6, 487 * 0.6);\n\ncore.insertAction({ \"type\": \"showImage2\", \"code\": 6, \"image\": [\"0cheating.png\", \"0easy.png\", \"0normal.png\", \"0hard.png\", \"0hell.png\", \"0cheating.png\"][flags.hard], \"loc\": [-160, 0], \"opacity\": 1, \"time\": 0 })\n}" + "function": "function(){\ncore.drawImage(core.dom.wholeCtx, core.material.images.images['nanduxuanze.jpg'], 0, 0);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 1 ? \"\" : \"an\") + 'easy.png'], -30, -55, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 2 ? \"\" : \"an\") + 'normal.png'], -30, 20, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 3 ? \"\" : \"an\") + 'hard.png'], -30, 95, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 4 ? \"\" : \"an\") + 'hell.png'], -30, 170, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 5 || flags.hard == 0 ? \"\" : \"an\") + 'cheating.png'], -30, 245, 710 * 0.6, 487 * 0.6);\n\ncore.insertAction({ \"type\": \"showImage\", \"code\": 6, \"image\": [\"0cheating.png\", \"0easy.png\", \"0normal.png\", \"0hard.png\", \"0hell.png\", \"0cheating.png\"][flags.hard], \"loc\": [-160, 0], \"opacity\": 1, \"time\": 0 })\n}" } ] } diff --git a/project/plugins.js b/project/plugins.js index c1d2c82..ec32b45 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -3941,6 +3941,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = this.maskPrepare = function () { // 执行后画面将凝固 var mask = core.ui.createCanvas2("mask", 0, 0, core.__PIXELS__ + 161, core.__PIXELS__, 200); + if (flags.Memories_grayscale) { ///回忆中图片做旧 + core.setFilter("mask", 'saturate(25%)'); + } core.drawThumbnail(core.status.floorId, null, { ctx: mask, x: 161, y: 0, size: 1, damage: false, all: true }); core.drawImage('mask', 'caidan.png', 0, 0); // for (var m in core.canvas) {