Merge pull request #8 from AkiChase/dev

Scrcpy Mask v0.1.3

package.json

@@ -1,7 +1,7 @@
 {
   "name": "scrcpy-mask",
   "private": true,
-  "version": "0.1.2",
+  "version": "0.1.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scrcpy-mask"
-version = "0.1.2"
+version = "0.1.3"
 description = "A Tauri App"
 authors = ["AkiChase"]
 edition = "2021"

src-tauri/tauri.conf.json

@@ -1,6 +1,6 @@
 {
   "productName": "scrcpy-mask",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "identifier": "com.akichase.mask",
   "build": {
     "beforeDevCommand": "pnpm dev",

src/components/keyboard/KeyBoard.vue

@@ -122,8 +122,10 @@ function isKeyUnique(curKey: string): boolean {
 function setCurButtonKey(curKey: string) {
   if (
     keyboardStore.activeButtonIndex === -1 ||
-    keyboardStore.activeButtonIndex >= store.editKeyMappingList.length||
+    keyboardStore.activeButtonIndex >= store.editKeyMappingList.length ||
-    keyboardStore.showButtonSettingFlag||
+    keyboardStore.showButtonSettingFlag ||
+    keyboardStore.activeButtonIndex >= store.editKeyMappingList.length ||
+    keyboardStore.showButtonSettingFlag ||
     keyboardStore.showButtonAddFlag
   )
     return;
@@ -233,26 +235,31 @@ onActivated(() => {
 });
 
 onBeforeRouteLeave(() => {
-  document.removeEventListener("keyup", handleKeyUp);
+  return new Promise((resolve, _) => {
-  document.removeEventListener("wheel", handleMouseWheel);
+    document.removeEventListener("keyup", handleKeyUp);
-  if (keyboardStore.edited) {
+    document.removeEventListener("wheel", handleMouseWheel);
-    dialog.warning({
+    if (keyboardStore.edited) {
-      title: "Warning",
+      dialog.warning({
-      content: "当前方案尚未保存，是否保存？",
+        title: "Warning",
-      positiveText: "保存",
+        content: "当前方案尚未保存，是否保存？",
-      negativeText: "取消",
+        positiveText: "保存",
-      onPositiveClick: () => {
+        negativeText: "取消",
-        if (store.applyEditKeyMappingList()) {
+        onPositiveClick: () => {
-          keyboardStore.edited = false;
+          if (store.applyEditKeyMappingList()) {
-        } else {
+            keyboardStore.edited = false;
-          message.error("存在重复按键，无法保存");
+            resolve(true);
-        }
+          } else {
-      },
+            message.error("存在重复按键，无法保存");
-      onNegativeClick: () => {
+            resolve(false);
-        resetKeyMappingConfig();
+          }
-      },
+        },
-    });
+        onNegativeClick: () => {
-  }
+          resetKeyMappingConfig();
+          resolve(true);
+        },
+      });
+    } else resolve(true);
+  });
 });
 </script>
 

src/hotkey.ts

@@ -51,8 +51,8 @@ function clientPosToSkillOffset(
   // The center of the game display is higher than the center of the mask
   clientPos.y -= maskSizeH * 0.066;
 
-// w450 : h315 = 100 : 70, so the true offsetX is 0.7 * cOffsetX
+  // w450 : h315 = 100 : 70, so the true offsetX is 0.7 * cOffsetX
-  const cOffsetX = (clientPos.x - 70 - centerX)*0.7;
+  const cOffsetX = (clientPos.x - 70 - centerX) * 0.7;
   const cOffsetY = clientPos.y - 30 - centerY;
   const offsetD = Math.sqrt(cOffsetX ** 2 + cOffsetY ** 2);
   if (offsetD == 0) {
@@ -731,11 +731,27 @@ function handleMouseWheel(event: WheelEvent) {
   if (event.deltaY > 0 && event.timeStamp - lastWheelDownTime > 50) {
     lastWheelDownTime = event.timeStamp;
     // WheelDown
-    downKeyCBMap.get("WheelDown")?.();
+    if (downKeyMap.has("WheelDown")) {
+      if (!downKeyMap.get("WheelDown")) {
+        downKeyMap.set("WheelDown", true);
+        downKeyCBMap.get("WheelDown")?.();
+      } else {
+        downKeyMap.set("WheelDown", false);
+        upKeyCBMap.get("WheelDown")?.();
+      }
+    }
   } else if (event.deltaY < 0 && event.timeStamp - lastWheelUpTime > 50) {
     lastWheelUpTime = event.timeStamp;
     // WheelUp
-    downKeyCBMap.get("WheelUp")?.();
+    if (downKeyMap.has("WheelUp")) {
+      if (!downKeyMap.get("WheelUp")) {
+        downKeyMap.set("WheelUp", true);
+        downKeyCBMap.get("WheelUp")?.();
+      } else {
+        downKeyMap.set("WheelUp", false);
+        upKeyCBMap.get("WheelUp")?.();
+      }
+    }
   }
 }