Shikong/scrcpy-mask
1
0
Fork 0
mirror of https://github.com/AkiChase/scrcpy-mask synced 2025-02-22 23:12:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(hotkey): double press skill conflict with other skill

Browse Source
This commit is contained in:
AkiChase 2024-05-06 09:12:43 +08:00
parent fd0f95e54d
commit 84841a8d14
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/hotkey.ts
View File

@ -252,7 +252,13 @@ function addCancelSkillShortcuts(
loopDownKeyCBMap.delete(cancelAbleKey); loopDownKeyCBMap.delete(cancelAbleKey);
upKeyCBMap.delete(cancelAbleKey); upKeyCBMap.delete(cancelAbleKey);
} }
// special case for double press skill
for (const [key, val] of doublePressedDownKey) {
if (val) {
loopDownKeyCBMap.delete(key);
doublePressedDownKey.set(key, false);
}
}
let distance = 0; let distance = 0;
while (distance <= 20) { while (distance <= 20) {
await touch({ await touch({
@ -308,6 +314,12 @@ function addTriggerWhenPressedSkillShortcuts(
key, key,
// down // down
async () => { async () => {
// up doublepress skill
for (const [key, val] of doublePressedDownKey) {
if (val) {
downKeyCBMap.get(key)?.();
}
}
const skillOffset = clientPosToSkillOffset( const skillOffset = clientPosToSkillOffset(
{ x: mouseX, y: mouseY }, { x: mouseX, y: mouseY },
rangeOrTime rangeOrTime
@ -337,6 +349,8 @@ function addTriggerWhenPressedSkillShortcuts(
} }
} }
// add shortcuts for trigger when double pressed skill (cancelable, but in another way)
const doublePressedDownKey = new Map<string, boolean>();
function addTriggerWhenDoublePressedSkillShortcuts( function addTriggerWhenDoublePressedSkillShortcuts(
key: string, key: string,
relativeSize: { w: number; h: number }, relativeSize: { w: number; h: number },
@ -348,12 +362,12 @@ function addTriggerWhenDoublePressedSkillShortcuts(
) { ) {
posX = Math.round((posX / relativeSize.w) * screenSizeW); posX = Math.round((posX / relativeSize.w) * screenSizeW);
posY = Math.round((posY / relativeSize.h) * screenSizeH); posY = Math.round((posY / relativeSize.h) * screenSizeH);
let curKeyDownFlag = false; doublePressedDownKey.set(key, false);
addShortcut( addShortcut(
key, key,
// down // down
async () => { async () => {
if (curKeyDownFlag === false) { if (doublePressedDownKey.get(key) === false) {
// first press: touch down // first press: touch down
const skillOffset = clientPosToSkillOffset( const skillOffset = clientPosToSkillOffset(
{ x: mouseX, y: mouseY }, { x: mouseX, y: mouseY },
@ -376,7 +390,7 @@ function addTriggerWhenDoublePressedSkillShortcuts(
intervalBetweenPos: 0, intervalBetweenPos: 0,
}); });
// set the flag to true // set the flag to true
curKeyDownFlag = true; doublePressedDownKey.set(key, true);
// add loop CB // add loop CB
loopDownKeyCBMap.set(key, async () => { loopDownKeyCBMap.set(key, async () => {
const loopSkillOffset = clientPosToSkillOffset( const loopSkillOffset = clientPosToSkillOffset(
@ -417,7 +431,7 @@ function addTriggerWhenDoublePressedSkillShortcuts(
}, },
}); });
// set the flag to false // set the flag to false
curKeyDownFlag = false; doublePressedDownKey.set(key, false);
} }
}, },
undefined, undefined,
@ -440,6 +454,12 @@ function addDirectionlessSkillShortcuts(
key, key,
// down // down
async () => { async () => {
// up doublepress skill
for (const [key, val] of doublePressedDownKey) {
if (val) {
downKeyCBMap.get(key)?.();
}
}
await touch({ await touch({
action: TouchAction.Down, action: TouchAction.Down,
pointerId, pointerId,
@ -490,6 +510,12 @@ function addDirectionalSkillShortcuts(
key, key,
// down // down
async () => { async () => {
// up doublepress skill
for (const [key, val] of doublePressedDownKey) {
if (val) {
downKeyCBMap.get(key)?.();
}
}
const skillOffset = clientPosToSkillOffset( const skillOffset = clientPosToSkillOffset(
{ x: mouseX, y: mouseY }, { x: mouseX, y: mouseY },
range range