From 1e58dbe4114d4bf3d14e5fc072a1f3911a03e04e Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Sun, 19 Nov 2023 20:47:21 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=AE=9A=E7=82=B9=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=80=AA=E7=89=A9=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/main/init/fixed.ts  | 11 +++++++++--
 src/core/main/init/hotkey.ts |  9 +++++++--
 src/ui/bookDetail.vue        |  2 --
 src/ui/fixedDetail.vue       | 26 +++++++++++++++-----------
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/core/main/init/fixed.ts b/src/core/main/init/fixed.ts
index e3d275b..93865d9 100644
--- a/src/core/main/init/fixed.ts
+++ b/src/core/main/init/fixed.ts
@@ -1,6 +1,6 @@
 import { debounce } from 'lodash-es';
-import { gameListener } from '../game';
-import { fixedUi } from './ui';
+import { gameListener, hook } from '../game';
+import { fixedUi, mainUi } from './ui';
 import { ref } from 'vue';
 import { sleep } from 'mutate-animate';
 
@@ -53,3 +53,10 @@ gameListener.on('mouseMove', e => {
         showFixed(hovered);
     }
 });
+
+hook.once('mounted', () => {
+    mainUi.on('start', () => {
+        showFixed.cancel();
+        closeFixed();
+    });
+});
diff --git a/src/core/main/init/hotkey.ts b/src/core/main/init/hotkey.ts
index c66d30e..2ed8b5e 100644
--- a/src/core/main/init/hotkey.ts
+++ b/src/core/main/init/hotkey.ts
@@ -3,6 +3,7 @@ import { Hotkey } from '../custom/hotkey';
 import { generateBinary, keycode } from '@/plugin/utils';
 import { hovered } from './fixed';
 import { hasMarkedEnemy, markEnemy, unmarkEnemy } from '@/plugin/mark';
+import { mainUi } from './ui';
 
 export const mainScope = Symbol.for('@key_main');
 export const gameKey = new Hotkey('gameKey', '游戏按键');
@@ -405,8 +406,12 @@ gameKey
             else markEnemy(id);
         }
     })
-    .realize('special', () => {})
-    .realize('critical', () => {})
+    .realize('special', () => {
+        mainUi.open('fixedDetail', { panel: 'special' });
+    })
+    .realize('critical', () => {
+        mainUi.open('fixedDetail', { panel: 'critical' });
+    })
     .realize('restart', () => {
         core.confirmRestart();
     })
diff --git a/src/ui/bookDetail.vue b/src/ui/bookDetail.vue
index 9378cc5..595cb2f 100644
--- a/src/ui/bookDetail.vue
+++ b/src/ui/bookDetail.vue
@@ -76,8 +76,6 @@ import { useDrag } from '../plugin/use';
 import EnemySpecial from '../panel/enemySpecial.vue';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
 import EnemyCritical from '../panel/enemyCritical.vue';
-import { KeyCode } from '../plugin/keyCodes';
-import { keycode } from '../plugin/utils';
 import { sleep } from 'mutate-animate';
 import EnemyTarget from '../panel/enemyTarget.vue';
 import { detailInfo } from '../plugin/ui/book';
diff --git a/src/ui/fixedDetail.vue b/src/ui/fixedDetail.vue
index 86d1ff3..79317e2 100644
--- a/src/ui/fixedDetail.vue
+++ b/src/ui/fixedDetail.vue
@@ -9,12 +9,15 @@
 </template>
 
 <script lang="ts" setup>
-import { getDetailedEnemy, getLocFromMouseLoc } from '../plugin/ui/fixed';
+import { getDetailedEnemy } from '../plugin/ui/fixed';
 import BookDetail from './bookDetail.vue';
 import { detailInfo } from '../plugin/ui/book';
+import { hovered } from '@/core/main/init/fixed';
+import { GameUi } from '@/core/main/custom/ui';
 
 const props = defineProps<{
     num: number;
+    ui: GameUi;
     panel?: 'special' | 'critical' | 'target';
 }>();
 
@@ -22,16 +25,17 @@ const panel = props.panel ?? 'special';
 
 detailInfo.pos = 0;
 
-const [x, y] = flags.mouseLoc;
-const [mx, my] = getLocFromMouseLoc(x, y);
-const enemy = core.status.thisMap.enemy.list.find(v => {
-    return v.x === mx && v.y === my;
-});
-if (enemy) {
-    const detail = getDetailedEnemy(enemy);
-    detailInfo.enemy = detail;
-} else {
-    close();
+if (hovered) {
+    const { x, y } = hovered;
+    const enemy = core.status.thisMap.enemy.list.find(v => {
+        return v.x === x && v.y === y;
+    });
+    if (enemy) {
+        const detail = getDetailedEnemy(enemy);
+        detailInfo.enemy = detail;
+    } else {
+        close();
+    }
 }
 
 function close() {