From 93fad2f637fd852b41e9deb4d0b73ad9413713ac Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Sun, 6 Aug 2023 22:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90todo?=
 =?UTF-8?q?=E5=BC=95=E8=B5=B7=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App2.vue             | 19 ++++++++++---------
 src/core/main/setting.ts |  6 ------
 src/plugin/game/hero.ts  |  4 ----
 src/ui/statusBar.vue     |  3 ++-
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/App2.vue b/src/App2.vue
index 9a8133b..b47bcc1 100644
--- a/src/App2.vue
+++ b/src/App2.vue
@@ -3,9 +3,9 @@
         <Start v-if="startOpened"></Start>
         <StatusBar v-if="showStatusBar"></StatusBar>
         <MarkedEnemy v-if="showMarkedEnemy && showStatusBar"></MarkedEnemy>
-        <Studied
+        <!-- <Studied
             v-if="showStudiedSkill && showStatusBar && showStudied"
-        ></Studied>
+        ></Studied> -->
         <Fixed v-if="showStatusBar && useFixed"></Fixed>
         <Chapter v-if="chapterShowed" :chapter="chapterContent"></Chapter>
         <CompleteAchievement
@@ -17,22 +17,23 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import {
-    showStatusBar,
-    showStudiedSkill,
-    startOpened
-} from './plugin/uiController';
+import { showStatusBar, startOpened } from './plugin/uiController';
 import { chapterContent, chapterShowed } from './plugin/ui/chapter';
 import { showMarkedEnemy } from './plugin/mark';
-import { showStudied, useFixed } from './plugin/settings';
 import { showComplete, completeAchi } from './plugin/ui/achievement';
 import MarkedEnemy from './ui/markedEnemy.vue';
 import StatusBar from './ui/statusBar.vue';
 import Chapter from './ui/chapter.vue';
-import Studied from './ui/studied.vue';
 import Fixed from './ui/fixed.vue';
 import Start from './ui/start.vue';
 import CompleteAchievement from './ui/completeAchievement.vue';
+import { mainSetting } from './core/main/setting';
+
+const useFixed = ref(true);
+
+mainSetting.on('valueChange', (key, n, o) => {
+    if (key === 'action.fixed') useFixed.value = n as boolean;
+});
 </script>
 
 <style lang="less" scoped>
diff --git a/src/core/main/setting.ts b/src/core/main/setting.ts
index 0a13ac4..628ec74 100644
--- a/src/core/main/setting.ts
+++ b/src/core/main/setting.ts
@@ -292,8 +292,6 @@ function handleScreenSetting<T extends number | boolean>(
     n: T,
     o: T
 ) {
-    if (n === o) return;
-
     if (key === 'fullscreen') {
         // 全屏
         triggerFullscreen(n as boolean);
@@ -336,8 +334,6 @@ function handleActionSetting<T extends number | boolean>(
     n: T,
     o: T
 ) {
-    if (n === o) return;
-
     if (key === 'autoSkill') {
         // 自动切换技能
         flags.autoSkill = n;
@@ -354,8 +350,6 @@ function handleUtilsSetting<T extends number | boolean>(
     n: T,
     o: T
 ) {
-    if (n === o) return;
-
     if (key === 'betterLoad') {
         // 加载优化
         core.setLocalStorage('betterLoad', n);
diff --git a/src/plugin/game/hero.ts b/src/plugin/game/hero.ts
index f097f8b..8c1c878 100644
--- a/src/plugin/game/hero.ts
+++ b/src/plugin/game/hero.ts
@@ -1,8 +1,6 @@
 /**
  * 获取勇士在某一点的属性
  * @param name 要获取的勇士属性
- * @param x 勇士所在横坐标
- * @param y 勇士所在纵坐标
  * @param floorId 勇士所在楼层
  */
 export function getHeroStatusOn(name: 'all', floorId?: FloorIds): HeroStatus;
@@ -26,8 +24,6 @@ export function getHeroStatusOn(
  * 获取一定状态下的勇士在某一点的属性
  * @param status 勇士的状态
  * @param name 要获取的勇士属性
- * @param x 勇士所在横坐标
- * @param y 勇士所在纵坐标
  * @param floorId 勇士所在楼层
  */
 export function getHeroStatusOf(
diff --git a/src/ui/statusBar.vue b/src/ui/statusBar.vue
index 6816013..f5257b4 100644
--- a/src/ui/statusBar.vue
+++ b/src/ui/statusBar.vue
@@ -178,8 +178,9 @@ watch(status, update);
  * 更新显示内容
  */
 function update() {
+    if (!core?.plugin?.hero?.getHeroStatusOn) return;
     toShow.forEach(v => {
-        hero[v] = core.plugin.getHeroStatusOn(v);
+        hero[v] = core.plugin.hero.getHeroStatusOn(v);
     });
     keys[0] = core.itemCount('yellowKey');
     keys[1] = core.itemCount('blueKey');