From 80730a6891fff7693ad472f6b877b1cbc6bbc1bf Mon Sep 17 00:00:00 2001 From: Erdnase <1398341065@qq.com> Date: Wed, 15 Mar 2023 20:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BFRM=E6=B8=90=E5=8F=98=E6=8F=92=E4=BB=B6?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=2016=E5=B1=82=E5=89=A7=E6=83=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E7=BB=8F=E9=AA=8C=E5=95=86=E5=BA=97=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/floors/MT16.js | 301 +++++++++++++++++++++++++++++--------- project/floors/XIANJIE.js | 10 ++ project/maps.js | 4 +- project/plugins.js | 20 +-- 4 files changed, 251 insertions(+), 84 deletions(-) diff --git a/project/floors/MT16.js b/project/floors/MT16.js index 64ed9ac..b80cea3 100644 --- a/project/floors/MT16.js +++ b/project/floors/MT16.js @@ -66,7 +66,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -136,7 +136,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -206,7 +206,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -276,7 +276,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -346,7 +346,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -416,7 +416,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -486,7 +486,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -556,7 +556,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -626,7 +626,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -696,7 +696,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -766,7 +766,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -836,7 +836,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -906,7 +906,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -985,7 +985,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -1450,7 +1450,7 @@ main.floors.MT16= "opacity": 1, "time": 0 }, - "\t[杰克]这里似乎封印着类似于11层东南角的机遗迹一样的东西。", + "\t[杰克]这里似乎封印着类似于11层东南角的机械遗迹一样的东西。", "\t[邵虎]..........好吧......我会注意的。", { "type": "hideImage", @@ -1483,60 +1483,71 @@ main.floors.MT16= ] } ], - "11,7": [ - { - "type": "if", - "condition": "(flag:xianjie2==1)", - "true": [ - { - "type": "setBlock", - "number": "339", - "loc": [ - [ - 11, - 7 - ] - ] - }, - { - "type": "hide", - "remove": true - } - ], - "false": [ - { - "type": "if", - "condition": "(flag:xianjie==15)", - "true": [ - { - "type": "setBlock", - "number": "89", - "loc": [ - [ - 12, - 1 + "11,7": { + "trigger": "action", + "enable": true, + "noPass": null, + "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, + "data": [ + { + "type": "if", + "condition": "(flag:xianjie2==1)", + "true": [ + { + "type": "hide", + "remove": true + } + ], + "false": [ + { + "type": "if", + "condition": "(flag:xianjie==15)", + "true": [ + { + "type": "openDoor", + "loc": [ + 11, + 7 ] - ] - }, - { - "type": "setValue", - "name": "flag:xianjie", - "operator": "+=", - "value": "1", - "norefresh": true - }, - { - "type": "setValue", - "name": "flag:xianjie2", - "operator": "+=", - "value": "1" - } - ], - "false": [] - } - ] - } - ], + }, + { + "type": "setBlock", + "number": "89", + "loc": [ + [ + 12, + 1 + ] + ] + }, + { + "type": "setValue", + "name": "flag:xianjie", + "operator": "+=", + "value": "1", + "norefresh": true + }, + { + "type": "setValue", + "name": "flag:xianjie2", + "operator": "+=", + "value": "1" + } + ], + "false": [] + } + ] + } + ] + }, "6,1": [ { "type": "function", @@ -1593,7 +1604,7 @@ main.floors.MT16= "true": [ { "type": "setBlock", - "number": "339", + "number": "372", "loc": [ [ 11, @@ -1606,7 +1617,133 @@ main.floors.MT16= } ] } - ] + ], + "8,8": { + "trigger": "action", + "enable": true, + "noPass": null, + "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, + "data": [ + { + "type": "if", + "condition": "flag:112", + "true": [ + { + "type": "vibrate", + "direction": "horizontal", + "time": 1000, + "speed": 10, + "power": 10, + "async": true + }, + { + "type": "openDoor", + "loc": [ + 8, + 8 + ] + }, + { + "type": "openDoor", + "loc": [ + 5, + 4 + ] + }, + { + "type": "openDoor", + "loc": [ + 9, + 4 + ] + }, + { + "type": "openDoor", + "loc": [ + 5, + 8 + ] + }, + { + "type": "openDoor", + "loc": [ + 9, + 8 + ] + } + ], + "false": [] + } + ] + }, + "5,4": { + "trigger": "action", + "enable": true, + "noPass": null, + "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, + "data": [] + }, + "5,8": { + "trigger": "action", + "enable": true, + "noPass": null, + "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, + "data": [] + }, + "9,4": { + "trigger": "action", + "enable": true, + "noPass": null, + "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, + "data": [] + }, + "9,8": { + "trigger": "action", + "enable": true, + "noPass": null, + "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, + "data": [] + } }, "changeFloor": { "8,4": { @@ -1620,7 +1757,25 @@ main.floors.MT16= "time": 200 } }, - "afterBattle": {}, + "afterBattle": { + "6,4": [ + { + "type": "setValue", + "name": "flag:112", + "value": "true" + }, + { + "type": "setBlock", + "number": "372", + "loc": [ + [ + 8, + 8 + ] + ] + } + ] + }, "afterGetItem": {}, "afterOpenDoor": {}, "cannotMove": {}, @@ -1630,11 +1785,11 @@ main.floors.MT16= [ 0,348,475, 0, 28, 0,475, 0, 2,475,475,218, 0,352, 0], [ 0,348,218, 0, 2, 0, 0, 21, 2,206, 0, 0, 32,352, 0], [ 0,348, 0,475, 2, 2, 2, 2, 2, 81, 2, 2, 27,352, 0], - [ 0,348, 0,206, 81,372,213, 0, 87,372, 2,475, 31,352, 0], + [ 0,348, 0,206, 81,361,213, 0, 87,361, 2,475, 31,352, 0], [ 0,348, 2, 2, 2, 32, 0, 0, 0,206, 2, 0, 0,352, 0], [ 0,348,475, 21, 2, 2, 2, 32, 2, 2, 2, 21,475,352, 0], [ 0,348, 0, 0, 2,206, 0, 0, 0, 32, 2, 2, 2,352, 0], - [ 0,348, 31,475, 2,372, 88,123,372,372, 81,206, 0,352, 0], + [ 0,348, 31,475, 2,361, 88,123,361,361, 81,206, 0,352, 0], [ 0,348, 27, 2, 2, 81, 2, 2, 2, 2, 2,475, 0,352, 0], [ 0,348, 32,475, 0,206, 2, 21, 0, 0, 2,475,218,352, 0], [ 0,348, 0,218, 0,475, 2,475,475, 0, 28, 0, 0,352, 0], diff --git a/project/floors/XIANJIE.js b/project/floors/XIANJIE.js index e723ffd..fdc2b4e 100644 --- a/project/floors/XIANJIE.js +++ b/project/floors/XIANJIE.js @@ -11,10 +11,20 @@ main.floors.XIANJIE= "firstArrive": [], "events": { "7,1": [ + { + "type": "setValue", + "name": "flag:isRMshop", + "value": "true" + }, { "type": "openShop", "id": "expShop1", "open": true + }, + { + "type": "setValue", + "name": "flag:isRMshop", + "value": "false" } ] }, diff --git a/project/maps.js b/project/maps.js index 3783a81..dd632cf 100644 --- a/project/maps.js +++ b/project/maps.js @@ -246,14 +246,14 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "358": {"cls":"animates","id":"A358"}, "359": {"cls":"animates","id":"A359"}, "360": {"cls":"animates","id":"A360"}, - "361": {"cls":"animates","id":"A361"}, + "361": {"cls":"animates","id":"A361","animate":1,"trigger":"openDoor","doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}}}, "362": {"cls":"animates","id":"A362"}, "363": {"cls":"animates","id":"A363"}, "364": {"cls":"animates","id":"A364"}, "365": {"cls":"animates","id":"A365"}, "366": {"cls":"animates","id":"A366"}, "367": {"cls":"animates","id":"A367","event":null,"canPass":true}, - "368": {"cls":"animates","id":"A368"}, + "368": {"cls":"animates","id":"A368","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}}}, "369": {"cls":"animates","id":"A369"}, "370": {"cls":"animates","id":"A370"}, "371": {"cls":"npcs","id":"N371"}, diff --git a/project/plugins.js b/project/plugins.js index de7841d..c064b9a 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -3902,19 +3902,21 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = // 准备渐变 this.maskPrepare = function () { // 执行后画面将凝固 - core.ui.createCanvas2("mask", 0, 0, core.__PIXELS__, core.__PIXELS__, 155); - for (var m in core.canvas) { - core.dymCanvas.mask.drawImage(core.canvas[m].canvas, 0, 0); - }; + var mask = core.ui.createCanvas2("mask", 0, 0, core.__PIXELS__ + 161, core.__PIXELS__, 200); + 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) { + // core.dymCanvas.mask.drawImage(core.canvas[m].canvas, 0, 0); + // }; } // 执行渐变 this.maskFliter = function (time, sample) { // sample为渐变图名称，渐变图需要在全塔属性注册 - var tempCanvas = core.bigmap.tempCanvas; - var tempWidth = core.__PIXELS__, - tempHeight = core.__PIXELS__; - tempCanvas.canvas.width = tempWidth; - tempCanvas.canvas.height = tempHeight; + var tempCanvas = core.ui.createCanvas2("mask2", 0, 0, core.__PIXELS__ + 161, core.__PIXELS__, 200); + var tempWidth = tempCanvas.canvas.width, + tempHeight = tempCanvas.canvas.height; + //tempCanvas.canvas.width = tempWidth; + //tempCanvas.canvas.height = tempHeight; tempCanvas.clearRect(0, 0, tempWidth, tempHeight); tempCanvas.drawImage(core.material.images.images[sample], 0, 0, tempWidth, tempHeight); // 读取渐变图开始处理