From 020551bd90cfb91b2e32766caf6dbad6fa9d26ac Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Sun, 21 Apr 2024 14:48:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=8F=E5=9C=B0=E5=9B=BE=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E6=AF=94=E4=BE=8B=20&=20=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/main/storage.ts |  9 +++++++++
 src/ui/fly.vue           | 32 +++++++++++++++-----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/core/main/storage.ts b/src/core/main/storage.ts
index 56db08b..4d8211b 100644
--- a/src/core/main/storage.ts
+++ b/src/core/main/storage.ts
@@ -98,6 +98,15 @@ export class GameStorage<T extends object = any> {
     static get(key: string) {
         return this.list.find(v => v.key === key);
     }
+
+    /**
+     * 与Symbol.for类似
+     */
+    static for(key: string) {
+        const s = this.get(key);
+        if (s) return s;
+        else return new GameStorage(key);
+    }
 }
 
 window.addEventListener('beforeunload', () => {
diff --git a/src/ui/fly.vue b/src/ui/fly.vue
index 119bfe1..8bb9380 100644
--- a/src/ui/fly.vue
+++ b/src/ui/fly.vue
@@ -89,12 +89,7 @@
 <script lang="ts" setup>
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 import Scroll from '../components/scroll.vue';
-import {
-    getArea,
-    getMapDrawData,
-    getMapData,
-    MinimapDrawer
-} from '../plugin/ui/fly';
+import { getArea, getMapData, MinimapDrawer } from '../plugin/ui/fly';
 import { cancelGlobalDrag, isMobile, useDrag, useWheel } from '../plugin/use';
 import {
     LeftOutlined,
@@ -103,12 +98,13 @@ import {
     DoubleRightOutlined
 } from '@ant-design/icons-vue';
 import { debounce } from 'lodash-es';
-import { downloadCanvasImage, tip } from '../plugin/utils';
+import { tip } from '../plugin/utils';
 import { GameUi } from '@/core/main/custom/ui';
 import { gameKey } from '@/core/main/init/hotkey';
 import { createChangable } from '@/plugin/ui/common';
 import { mainUi } from '@/core/main/init/ui';
 import { mainSetting } from '@/core/main/setting';
+import { GameStorage } from '@/core/main/storage';
 
 const props = defineProps<{
     num: number;
@@ -124,11 +120,13 @@ const nowArea = ref(
 const nowFloor = ref(core.status.floorId);
 const noBorder = ref(true);
 const tradition = ref(false);
-let scale =
-    ((isMobile ? 1.5 : 3) * mainSetting.getValue('ui.mapScale', 100)) / 100;
+const settingScale = mainSetting.getValue('ui.mapScale', 100) / 100;
+let scale = (isMobile ? 1.5 : 3) * settingScale;
 
-noBorder.value = core.getLocalStorage('noBorder', true);
-tradition.value = core.getLocalStorage('flyTradition', false);
+const storage = GameStorage.for(GameStorage.fromAuthor('AncTe', 'flyConfig'));
+
+noBorder.value = storage.getValue('noBorder', true);
+tradition.value = storage.getValue('flyTradition', false);
 
 const floor = computed(() => {
     return core.status.maps[nowFloor.value];
@@ -139,10 +137,10 @@ watch(nowFloor, n => {
     draw();
 });
 watch(nowArea, n => {
-    scale = 3;
-    lastScale = 3;
+    scale = 3 * settingScale;
+    lastScale = 3 * settingScale;
     drawer.nowArea = n;
-    drawer.scale = 3;
+    drawer.scale = 3 * settingScale;
     drawer.ox = 0;
     drawer.oy = 0;
     if (area[n] && !area[n].includes(nowFloor.value))
@@ -150,13 +148,13 @@ watch(nowArea, n => {
             area[n].find(v => v === core.status.floorId) ?? area[n][0];
 });
 watch(noBorder, n => {
-    core.setLocalStorage('noBorder', n);
-    drawer.noBorder = true;
+    storage.setValue('noBorder', n);
+    drawer.noBorder = n;
     drawer.drawedThumbnail = {};
     drawer.drawMap();
 });
 watch(tradition, n => {
-    core.setLocalStorage('flyTradition', n);
+    storage.setValue('flyTradition', n);
 });
 
 let map: HTMLCanvasElement;