From 1c41dd2b391d29e62b733aa7db8e44d5420cacd6 Mon Sep 17 00:00:00 2001 From: Erdnase <1398341065@qq.com> Date: Thu, 16 Mar 2023 16:47:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=92=E5=B0=BE=E4=B9=9F=E6=B7=BB=E5=8A=A00.?= =?UTF-8?q?34=E5=90=B8=E8=A1=80=20=E8=BF=81=E7=A7=BB=E6=A0=B7=E6=9D=BF?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84MT10=E5=9B=9E=E5=BF=86=E5=89=A7?= =?UTF-8?q?=E6=83=85=E6=98=BE=E7=A4=BABUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _server/config.json | 1 + project/enemys.js | 2 +- project/floors/huxiao1.js | 5 ----- project/floors/huxiao3.js | 5 ----- project/functions.js | 19 ++++++++++--------- 5 files changed, 12 insertions(+), 20 deletions(-) create mode 100644 _server/config.json diff --git a/_server/config.json b/_server/config.json new file mode 100644 index 0000000..f22fdf2 --- /dev/null +++ b/_server/config.json @@ -0,0 +1 @@ +{"viewportLoc":[0,0],"editorLastFloorId":"U1"} \ No newline at end of file diff --git a/project/enemys.js b/project/enemys.js index 6bbdac0..7b430ad 100644 --- a/project/enemys.js +++ b/project/enemys.js @@ -66,7 +66,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "evilBat": {"name":"邪恶蝙蝠","hp":1000,"atk":1,"def":0,"money":0,"exp":0,"point":0,"special":[2,3]}, "M300": {"name":"墙妖","hp":50,"atk":420,"def":300,"money":100,"exp":10,"point":0,"special":3}, "M301": {"name":"汪洋","hp":10000,"atk":300,"def":0,"money":1000,"exp":100,"point":0,"special":0,"beforeBattle":[{"type":"animate","name":"hainazhijian","loc":[6,5]}],"afterBattle":[{"type":"setValue","name":"flag:255","value":"1"},{"type":"setValue","name":"flag:bofang","value":"0"},{"type":"trigger","loc":[0,1]}]}, - "M302": {"name":"毒尾","hp":1000,"atk":140,"def":30,"money":100,"exp":20,"point":0,"special":[11,12],"value":0.34,"add":false}, + "M302": {"name":"毒尾","hp":1000,"atk":140,"def":30,"money":100,"exp":20,"point":0,"special":[11,12],"value":0.34,"add":false,"vampire":0.34}, "M303": {"name":"血尾雕像","hp":5000,"atk":100,"def":0,"money":200,"exp":10,"point":0,"special":[15,11],"value":null,"add":false,"zone":100,"vampire":0.34}, "E340": {"name":"戾鬼","hp":49999,"atk":18973,"def":1800,"money":5000,"exp":500,"point":0,"special":0}, "E341": {"name":"媚儿","hp":25000,"atk":250,"def":180,"money":2500,"exp":250,"point":0,"special":0}, diff --git a/project/floors/huxiao1.js b/project/floors/huxiao1.js index ddf33c0..8b49162 100644 --- a/project/floors/huxiao1.js +++ b/project/floors/huxiao1.js @@ -69,11 +69,6 @@ main.floors.huxiao1= ], "textfont": 20 }, - { - "type": "setGlobalAttribute", - "name": "borderColor", - "value": "null" - }, "\r[#fb928b]从今天起,嗜骨,你就是我们妖社的中坚力量了。", "\r[#fb928b]你很好强,各方面素质都很不错。", "\r[#fb928b]我相信你能够胜任你的位置。", diff --git a/project/floors/huxiao3.js b/project/floors/huxiao3.js index 6efe31f..9088e08 100644 --- a/project/floors/huxiao3.js +++ b/project/floors/huxiao3.js @@ -82,11 +82,6 @@ main.floors.huxiao3= "name": "flag:Memories_grayscale", "value": "false" }, - { - "type": "setGlobalAttribute", - "name": "borderColor", - "value": "204,204,204,1" - }, { "type": "function", "function": "function(){\ncore.maskFliter(500,'013-Square01.png')\n}" diff --git a/project/functions.js b/project/functions.js index 44405ec..5f48e75 100644 --- a/project/functions.js +++ b/project/functions.js @@ -1661,12 +1661,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = core.ui.fillText(ctx, text, x, y, style); }; - //回忆画面 - if (core.status.hero.flags.Memories_grayscale) { - core.drawImage('caidan', 'caidan_grayscale.png', -161, 0); - core.dom.caidan1Ctx.drawImage(core.material.images.images['caidan_grayscale.png'], 0, 0) - return; - } + //手册和道具栏画面背景 if (core.status.event.id === 'book' || core.status.event.id === 'book-detail' || core.status.event.id === 'toolbox') { core.dom.caidan1Ctx.drawImage(core.material.images.images['black.png'], 0, 0) @@ -1751,9 +1746,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = } if (core.status.floorId == "nandu") { core.ui.clearMap(ctx = core.dom.statusCanvasCtx); - core.dom.statusCanvas.style.zIndex=80; - } - else core.dom.statusCanvas.style.zIndex=50; + core.dom.statusCanvas.style.zIndex = 80; + } else core.dom.statusCanvas.style.zIndex = 50; } } else if (core.flags.hideLeftStatusBar && !core.domStyle.isVertical) { // 横屏且隐藏状态栏 if (!core.dymCanvas['status']) @@ -1782,6 +1776,13 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = fill(core.setTwoDigits(core.itemCount('blueKey')), 46 + offset, 267, '#AAAADD'); fill(core.setTwoDigits(core.itemCount('redKey')), 81 + offset, 267, '#FF8888'); } + + //回忆画面 + if (core.status.hero.flags.Memories_grayscale) { + core.drawImage('caidan', 'caidan_grayscale.png', -161, 0); + core.dom.caidan1Ctx.drawImage(core.material.images.images['caidan_grayscale.png'], 0, 0) + core.ui.clearMap(ctx = core.dom.statusCanvasCtx); // 清空状态栏 + } }, "drawStatistics": function () { // 浏览地图时参与的统计项目