From 9806c0bce98ba703383978c4244491570b496ac9 Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Sat, 22 Apr 2023 10:04:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=80=AA=E7=89=A9=E6=89=8B?=
 =?UTF-8?q?=E5=86=8C=E7=9A=84=E6=8C=89=E9=94=AE=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts             |  1 +
 public/project/functions.js | 13 ++++++++++---
 src/panel/enemyTarget.vue   |  2 +-
 src/ui/book.vue             |  5 ++++-
 src/ui/chapter.vue          |  4 ++--
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index ee98312..46765fe 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -11,6 +11,7 @@ declare module '@vue/runtime-core' {
     AProgress: typeof import('ant-design-vue/es')['Progress']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
+    ASlider: typeof import('ant-design-vue/es')['Slider']
     ASwitch: typeof import('ant-design-vue/es')['Switch']
     Box: typeof import('./src/components/box.vue')['default']
     BoxAnimate: typeof import('./src/components/boxAnimate.vue')['default']
diff --git a/public/project/functions.js b/public/project/functions.js
index 366747f..8bf5b6a 100644
--- a/public/project/functions.js
+++ b/public/project/functions.js
@@ -1222,7 +1222,11 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = {
                     core.actions._clickGameInfo_openComments();
                     break;
                 case 49: // 1: 断灭之刃
-                    if (!flags.bladeOn || flags.autoSkill) break;
+                    if (!flags.bladeOn) break;
+                    if (!flags.autoSkill) {
+                        core.tip('error', '已开启自动切换技能！');
+                        break;
+                    }
                     core.status.route.push('key:49'); // 将按键记在录像中
                     core.playSound('光标移动');
                     if (flags.blade) flags.blade = false;
@@ -1245,8 +1249,11 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = {
                     }
                     break;
                 case 51: // 3: 铸剑为盾
-                    if (!flags.shieldOn || flags.autoSkill) break;
-                    console.log(1);
+                    if (!flags.shieldOn) break;
+                    if (!flags.autoSkill) {
+                        core.tip('error', '已开启自动切换技能！');
+                        break;
+                    }
                     core.status.route.push('key:51'); // 将按键记在录像中
                     core.playSound('光标移动');
                     if (flags.shield) flags.shield = false;
diff --git a/src/panel/enemyTarget.vue b/src/panel/enemyTarget.vue
index 85207ea..799f6df 100644
--- a/src/panel/enemyTarget.vue
+++ b/src/panel/enemyTarget.vue
@@ -33,7 +33,7 @@ const marked = ref(hasMarkedEnemy(enemy.id));
 function mark() {
     if (marked.value) unmarkEnemy(enemy.id);
     if (!marked.value) markEnemy(enemy.id);
-    marked.value = !marked.value;
+    marked.value = hasMarkedEnemy(enemy.id);
 }
 </script>
 
diff --git a/src/ui/book.vue b/src/ui/book.vue
index 155f6e4..a86a261 100644
--- a/src/ui/book.vue
+++ b/src/ui/book.vue
@@ -161,7 +161,10 @@ function keyup(e: KeyboardEvent) {
     if (c === KeyCode.KeyX || c === KeyCode.Escape) {
         exit();
     }
-    if (c === KeyCode.Enter && !detail.value) {
+    if (
+        (c === KeyCode.Enter || c === KeyCode.KeyC || c === KeyCode.Space) &&
+        !detail.value
+    ) {
         select(enemy[selected.value], selected.value);
     }
 }
diff --git a/src/ui/chapter.vue b/src/ui/chapter.vue
index 36e2db3..4f4ac0d 100644
--- a/src/ui/chapter.vue
+++ b/src/ui/chapter.vue
@@ -41,8 +41,8 @@ onMounted(async () => {
     can.style.width = `${window.innerWidth}px`;
     can.style.height = `${window.innerHeight}px`;
     text.style.left = `${w + 10}px`;
-    text.style.top = `${window.innerHeight / 2 - h * 0.025}px`;
-    text.style.height = `${h * 0.05}px`;
+    text.style.top = `47.5vh`;
+    text.style.height = `5vh`;
     text.style.width = `${textWidth}px`;
 
     let soundPlayed = false;