From faf7b9b6542d88dad32739546f12bf027922b244 Mon Sep 17 00:00:00 2001 From: unanmed <1319491857@qq.com> Date: Fri, 19 Apr 2024 22:17:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=20&=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=AA=E7=89=A9=E6=89=8B=E5=86=8C=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/enemyOne.vue | 4 ++-- src/ui/toolEditor.vue | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/components/enemyOne.vue b/src/components/enemyOne.vue index a81ca21..ed499c9 100644 --- a/src/components/enemyOne.vue +++ b/src/components/enemyOne.vue @@ -223,12 +223,12 @@ function enter() { @media screen and (max-width: 600px) { .rightbar { width: 80%; - font-size: 85%; + font-size: 110%; } .leftbar { width: 20%; - font-size: 80%; + font-size: 100%; } .enemy-container { diff --git a/src/ui/toolEditor.vue b/src/ui/toolEditor.vue index 6cd5589..96d1b2f 100644 --- a/src/ui/toolEditor.vue +++ b/src/ui/toolEditor.vue @@ -204,12 +204,15 @@ import { isMobile } from '@/plugin/use'; import Scroll from '@/components/scroll.vue'; import { deleteWith, tip } from '@/plugin/utils'; import { Modal } from 'ant-design-vue'; +import { mainSetting } from '@/core/main/setting'; const props = defineProps<{ ui: GameUi; num: number; }>(); +const scale = mainSetting.getValue('ui.toolbarScale', 100) / 100; + const list = CustomToolbar.list; const selected = ref(0); @@ -518,9 +521,9 @@ onUnmounted(() => { .tool-preview-item { display: flex; - margin: 5px; - min-width: 50px; - height: 50px; + margin: v-bind('5 * scale + "px"'); + min-width: v-bind('50 * scale + "px"'); + height: v-bind('50 * scale + "px"'); background-color: #222; border: 1.5px solid #ddd8; justify-content: center; @@ -547,7 +550,7 @@ onUnmounted(() => { #tool-left { width: 100%; - height: 100%; + flex-basis: 40%; max-height: 40vh; display: flex; flex-direction: row; @@ -565,7 +568,11 @@ onUnmounted(() => { #tool-info { width: 100%; - height: 100%; + flex-basis: 60%; + + #tool-detail { + height: 100%; + } } .divider {