fix: 怪物手册的键盘操作滚动

This commit is contained in:
unanmed 2024-05-01 14:04:52 +08:00
parent 471b3071f9
commit 23375f03f1
8 changed files with 91 additions and 54 deletions

View File

@ -31,6 +31,13 @@ main.floors.MT53=
14, 14,
7 7
] ]
},
"7,0": {
"floorId": "MT56",
"loc": [
7,
14
]
} }
}, },
"beforeBattle": {}, "beforeBattle": {},

View File

@ -18,7 +18,7 @@ main.floors.MT54=
"parallelDo": "", "parallelDo": "",
"events": { "events": {
"9,13": [ "9,13": [
"注意,对于同时拥有二连击、三连击等连击属性时,各连击之间为乘算叠加", "注意,对于同时拥有二连击、三连击等连击属性时,各连击之间为乘算叠加。而对于两个四连击及以上的连击叠加,则会根据杀戮光环的技能说明方式进行叠加,一般是加算",
"那个开关一定要试着去触发一下" "那个开关一定要试着去触发一下"
], ],
"7,9": [ "7,9": [

View File

@ -43,16 +43,16 @@ main.floors.MT55=
"cannotMoveIn": {}, "cannotMoveIn": {},
"map": [ "map": [
[648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648], [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, 28,482,648, 28, 0,648, 0,578,376,482,648, 28, 33,648],
[648, 0, 0,648, 0, 0,219, 0,648, 0, 0,648, 0, 0,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,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,103,482,594, 21, 0,492, 0, 29, 0,482,648, 33, 27,648],
[648, 0, 0,648, 0, 0,648,648,648,648,656,648, 29, 33,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,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, 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, 0, 0,648], [648,648,648,648,492,648,648, 0, 28,656, 0, 0,484, 0,648],
[648, 27, 29,601, 0, 28,648,494,648,648,657,648,648,648,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,648, 29, 28,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,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,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], [648,376,381,249,403,378,648, 33,657, 0, 27, 0,482, 0,648],

View File

@ -16,8 +16,24 @@ main.floors.MT56=
"firstArrive": [], "firstArrive": [],
"eachArrive": [], "eachArrive": [],
"parallelDo": "", "parallelDo": "",
"events": {}, "events": {
"changeFloor": {}, "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": {}, "beforeBattle": {},
"afterBattle": {}, "afterBattle": {},
"afterGetItem": {}, "afterGetItem": {},
@ -26,20 +42,32 @@ main.floors.MT56=
"cannotMove": {}, "cannotMove": {},
"cannotMoveIn": {}, "cannotMoveIn": {},
"map": [ "map": [
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648, 0,482,648,390, 21,396,648,482,482,492,482,403,482,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648,381, 0,249, 0,484, 0,648,648,648,648,378, 22,376,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648,657,648,648,648,648,648,648, 27, 0,648,648,648,249,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648, 0, 0, 0, 0,563, 0,657,484, 28,648,378, 0,482,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648,648,648,648,220,648,494,648,648,648,648,596,648,648,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648, 0,482, 0, 0,648, 27, 0,648, 0,648, 0, 0, 0,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 92, 0,648,648,657,648,484, 29,596,103,539,482, 0,482, 94],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648, 0,648,660,484,648, 28, 0,648, 27,648,648,648,648,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648,578,648,648,648,648,648,648,648, 0,648, 0,243, 0,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648, 0,381,482, 28, 0,492,482,648,482,648, 0,648, 0,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648,648,648,648,648, 0,648,482,648, 0,219, 0,648, 0,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648, 0, 0, 0,648,243,648,648,648,648,648,648,648, 0,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [648, 0, 0, 0,601, 0, 0, 0, 0, 0, 0, 0,220, 0,648],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
], ],
"bgmap": [
],
"fgmap": [
],
"bg2map": [
],
"fg2map": [
]
} }

View File

@ -205,7 +205,7 @@ void main() {
if (sheltered > 0.5 && d.z < 0.5) strength = 0.0; // 遮挡逻辑 if (sheltered > 0.5 && d.z < 0.5) strength = 0.0; // 遮挡逻辑
strengthTotal += strength; // 累计强度 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; if (strengthTotal > 1.0) strengthTotal = 1.0;

View File

@ -24,7 +24,7 @@ export namespace BluePalace {
const blocks = core.status.maps[floorId].blocks; const blocks = core.status.maps[floorId].blocks;
const ctx = core.createCanvas(`@doorConvert`, 0, 0, 480, 480, 35); 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[] = []; const toConvert: DoorConvertInfo[] = [];
blocks.forEach(v => { blocks.forEach(v => {

View File

@ -242,6 +242,9 @@ export function tip(
class: 'antdv-message' class: 'antdv-message'
}); });
} }
sleep(2000).then(() => {
tip('info', `注意,不推荐使用浏览器的缩放功能,使用游戏内的缩放即可`);
});
/** /**
* *

View File

@ -71,7 +71,6 @@ const scroll = ref(0);
const drag = ref(false); const drag = ref(false);
const detail = ref(false); const detail = ref(false);
const selected = ref(0); const selected = ref(0);
let detailClosing = false;
const settingScale = mainSetting.getValue('ui.bookScale', 100) / 100; const settingScale = mainSetting.getValue('ui.bookScale', 100) / 100;
const scale = isMobile const scale = isMobile
@ -139,7 +138,7 @@ async function exit() {
function checkScroll() { function checkScroll() {
const h = window.innerHeight; 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) { if (y < 0) {
scroll.value += y - 20; scroll.value += y - 20;
} }