From 6278a85aeaf6cb8362ccfdcc5d45f675f32f83e1 Mon Sep 17 00:00:00 2001
From: AkiChase <1003019131@qq.com>
Date: Thu, 2 May 2024 16:10:41 +0800
Subject: [PATCH] fix(hotkey): The skill indicator issue

---
 src/components/Mask.vue |  2 +-
 src/hotkey.ts           | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/Mask.vue b/src/components/Mask.vue
index 0974f63..d3105f0 100644
--- a/src/components/Mask.vue
+++ b/src/components/Mask.vue
@@ -67,7 +67,7 @@ function toStartServer() {
     <div @contextmenu.prevent class="mask" id="maskElement"></div>
     <div class="button-layer">
       <!-- <div style="position: absolute;height: 100%;width: 1px;background-color: red;left: 50%;"></div>
-      <div style="position: absolute;width: 100%;height: 1px;background-color: red;top: 55%;"></div> -->
+      <div style="position: absolute;width: 100%;height: 1px;background-color: red;top: 56.6%;"></div> -->
       <template
         v-for="button in store.keyMappingConfigList[store.curKeyMappingIndex]
           .list"
diff --git a/src/hotkey.ts b/src/hotkey.ts
index 5ef9b5f..b115b3c 100644
--- a/src/hotkey.ts
+++ b/src/hotkey.ts
@@ -40,16 +40,19 @@ function clientyToPosOffsety(clienty: number, posy: number, scale = 1) {
   return Math.round(offsetY * scale);
 }
 
-// TODO ? 技能指示器的指向实际上是有投影变换的（可见王者技能范围不是圆而是椭圆），需要一定的算法，不能仅仅相对（x:50%, y:55%)的位置
-
 function clientPosToSkillOffset(
   clientPos: { x: number; y: number },
   range: number
 ): { offsetX: number; offsetY: number } {
   const maxLength = (100 / maskSizeH) * screenSizeH;
   const centerX = maskSizeW * 0.5;
-  const centerY = maskSizeH * 0.55;
-  const cOffsetX = clientPos.x - 70 - centerX;
+  const centerY = maskSizeH * 0.5;
+
+  // 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
+  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) {