From 23375f03f16e7993b86eba3639d688985f034ae1 Mon Sep 17 00:00:00 2001 From: unanmed <1319491857@qq.com> Date: Wed, 1 May 2024 14:04:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=80=AA=E7=89=A9=E6=89=8B=E5=86=8C?= =?UTF-8?q?=E7=9A=84=E9=94=AE=E7=9B=98=E6=93=8D=E4=BD=9C=E6=BB=9A=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/project/floors/MT53.js | 7 +++ public/project/floors/MT54.js | 2 +- public/project/floors/MT55.js | 16 ++--- public/project/floors/MT56.js | 110 +++++++++++++++++++++------------- src/core/fx/shadow.ts | 2 +- src/game/mechanism/misc.ts | 2 +- src/plugin/utils.ts | 3 + src/ui/book.vue | 3 +- 8 files changed, 91 insertions(+), 54 deletions(-) diff --git a/public/project/floors/MT53.js b/public/project/floors/MT53.js index 653932b..bf024fd 100644 --- a/public/project/floors/MT53.js +++ b/public/project/floors/MT53.js @@ -31,6 +31,13 @@ main.floors.MT53= 14, 7 ] + }, + "7,0": { + "floorId": "MT56", + "loc": [ + 7, + 14 + ] } }, "beforeBattle": {}, diff --git a/public/project/floors/MT54.js b/public/project/floors/MT54.js index cc4750a..6179ba6 100644 --- a/public/project/floors/MT54.js +++ b/public/project/floors/MT54.js @@ -18,7 +18,7 @@ main.floors.MT54= "parallelDo": "", "events": { "9,13": [ - "注意，对于同时拥有二连击、三连击等连击属性时，各连击之间为乘算叠加", + "注意，对于同时拥有二连击、三连击等连击属性时，各连击之间为乘算叠加。而对于两个四连击及以上的连击叠加，则会根据杀戮光环的技能说明方式进行叠加，一般是加算", "那个开关一定要试着去触发一下" ], "7,9": [ diff --git a/public/project/floors/MT55.js b/public/project/floors/MT55.js index f926f12..e156233 100644 --- a/public/project/floors/MT55.js +++ b/public/project/floors/MT55.js @@ -43,16 +43,16 @@ main.floors.MT55= "cannotMoveIn": {}, "map": [ [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648], - [648, 0, 0,648, 0, 0,648, 0,578, 0, 0,648, 0, 0,648], - [648, 0, 0,648, 0, 0,219, 0,648, 0, 0,648, 0, 0,648], + [648, 28,482,648, 28, 0,648, 0,578,376,482,648, 28, 33,648], + [648, 0,381,492,482, 27,219, 0,648,482,403,494, 33, 29,648], [648,601,648,648,648,648,648,563,648,648,648,648,657,648,648], - [648,103, 0,594, 0, 0,648, 0, 0, 0, 0,648, 33, 27,648], - [648, 0, 0,648, 0, 0,648,648,648,648,656,648, 29, 33,648], + [648,103,482,594, 21, 0,492, 0, 29, 0,482,648, 33, 27,648], + [648,381, 0,648, 0,484,648,648,648,648,657,648, 29, 33,648], [648,657,648,648,648,648,648, 0, 27, 0,482,648,648,243,648], - [648, 0, 0, 0, 0, 0,660,381,103,648,648,648, 0, 0, 94], - [648,648,648,648,492,648,648, 0, 28,656, 0, 0, 0, 0,648], - [648, 27, 29,601, 0, 28,648,494,648,648,657,648,648,648,648], - [648,482, 28,648, 27, 0,492, 0,381,482, 0,648, 29, 28,648], + [648, 0, 0, 0,381, 0,660, 0,103,648,648,648, 0, 0, 94], + [648,648,648,648,492,648,648, 0, 28,656, 0, 0,484, 0,648], + [648, 27, 29,596, 0, 28,648,494,648,648,657,648,648,648,648], + [648,482, 28,648, 27, 0,492, 0,381,482, 0,492, 29, 28,648], [648,240,648,648,648,492,648,243,648,648,648,648, 27, 33,648], [648,484,378,648,376,491,648, 0,648, 0, 28,648,648,220,648], [648,376,381,249,403,378,648, 33,657, 0, 27, 0,482, 0,648], diff --git a/public/project/floors/MT56.js b/public/project/floors/MT56.js index 0673895..414cdb9 100644 --- a/public/project/floors/MT56.js +++ b/public/project/floors/MT56.js @@ -1,45 +1,73 @@ main.floors.MT56= { -"floorId": "MT56", -"title": "苍蓝之殿-左下", -"name": "56", -"width": 15, -"height": 15, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"cannotViewMap": false, -"images": [], -"ratio": 8, -"defaultGround": "T650", -"bgm": "palaceSouth.mp3", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"cannotMove": {}, -"cannotMoveIn": {}, -"map": [ - [ 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + "floorId": "MT56", + "title": "苍蓝之殿-左下", + "name": "56", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 8, + "defaultGround": "T650", + "bgm": "palaceSouth.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": { + "3,8": [ + { + "type": "function", + "async": true, + "function": "function(){\nMota.require('module', 'Mechanism').BluePalace.doorConvert(3, 8);\n}" + } + ] + }, + "changeFloor": { + "7,14": { + "floorId": "MT53", + "loc": [ + 7, + 0 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648], + [648, 0,482,648,390, 21,396,648,482,482,492,482,403,482,648], + [648,381, 0,249, 0,484, 0,648,648,648,648,378, 22,376,648], + [648,657,648,648,648,648,648,648, 27, 0,648,648,648,249,648], + [648, 0, 0, 0, 0,563, 0,657,484, 28,648,378, 0,482,648], + [648,648,648,648,220,648,494,648,648,648,648,596,648,648,648], + [648, 0,482, 0, 0,648, 27, 0,648, 0,648, 0, 0, 0,648], + [ 92, 0,648,648,657,648,484, 29,596,103,539,482, 0,482, 94], + [648, 0,648,660,484,648, 28, 0,648, 27,648,648,648,648,648], + [648,578,648,648,648,648,648,648,648, 0,648, 0,243, 0,648], + [648, 0,381,482, 28, 0,492,482,648,482,648, 0,648, 0,648], + [648,648,648,648,648, 0,648,482,648, 0,219, 0,648, 0,648], + [648, 0, 0, 0,648,243,648,648,648,648,648,648,648, 0,648], + [648, 0, 0, 0,601, 0, 0, 0, 0, 0, 0, 0,220, 0,648], + [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], + "bgmap": [ + +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] } \ No newline at end of file diff --git a/src/core/fx/shadow.ts b/src/core/fx/shadow.ts index 4cd51d0..7a4f5a5 100644 --- a/src/core/fx/shadow.ts +++ b/src/core/fx/shadow.ts @@ -205,7 +205,7 @@ void main() { if (sheltered > 0.5 && d.z < 0.5) strength = 0.0; // 遮挡逻辑 strengthTotal += strength; // 累计强度 - lightColor = mix(lightColor, vec4(c.rgb, c.a * strength), strength); // 混合光源颜色 + lightColor = mix(lightColor, vec4(c.rgb, c.a), strength); // 混合光源颜色 } if (strengthTotal > 1.0) strengthTotal = 1.0; diff --git a/src/game/mechanism/misc.ts b/src/game/mechanism/misc.ts index b6ee5da..9ee7696 100644 --- a/src/game/mechanism/misc.ts +++ b/src/game/mechanism/misc.ts @@ -24,7 +24,7 @@ export namespace BluePalace { const blocks = core.status.maps[floorId].blocks; const ctx = core.createCanvas(`@doorConvert`, 0, 0, 480, 480, 35); - const time = core.values.animateSpeed / 4; + const time = core.values.animateSpeed / 3; const toConvert: DoorConvertInfo[] = []; blocks.forEach(v => { diff --git a/src/plugin/utils.ts b/src/plugin/utils.ts index 9948581..b3489d8 100644 --- a/src/plugin/utils.ts +++ b/src/plugin/utils.ts @@ -242,6 +242,9 @@ export function tip( class: 'antdv-message' }); } +sleep(2000).then(() => { + tip('info', `注意，不推荐使用浏览器的缩放功能，使用游戏内的缩放即可`); +}); /** * 设置文字分段换行等 diff --git a/src/ui/book.vue b/src/ui/book.vue index 15d51eb..84a4975 100644 --- a/src/ui/book.vue +++ b/src/ui/book.vue @@ -71,7 +71,6 @@ const scroll = ref(0); const drag = ref(false); const detail = ref(false); const selected = ref(0); -let detailClosing = false; const settingScale = mainSetting.getValue('ui.bookScale', 100) / 100; const scale = isMobile @@ -139,7 +138,7 @@ async function exit() { function checkScroll() { const h = window.innerHeight; - const y = selected.value * h * 0.2 - scroll.value; + const y = (selected.value * h * scale) / 100 - scroll.value; if (y < 0) { scroll.value += y - 20; }