From e666b85ba3780e43d6983b84727b391c4aebaf8f Mon Sep 17 00:00:00 2001 From: unanmed <1319491857@qq.com> Date: Thu, 25 Sep 2025 18:24:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=86=99=E6=AD=BB=E7=9A=84?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E6=94=B9=E4=B8=BA=E5=85=A8=E5=B1=80=E5=B8=B8?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client-modules/src/render/action.ts | 9 +- .../src/render/components/choices.tsx | 40 ++++--- .../src/render/components/floorSelect.tsx | 46 +++++--- .../src/render/components/page.tsx | 19 +++- .../src/render/components/scroll.tsx | 2 + .../src/render/components/textbox.tsx | 2 +- .../src/render/elements/layer.ts | 32 +++--- .../client-modules/src/render/shared.ts | 100 +++++++++++++++-- .../client-modules/src/render/ui/save.tsx | 48 +++++--- .../client-modules/src/render/ui/settings.tsx | 105 ++++++++---------- .../src/render/ui/statusBar.tsx | 6 +- .../client-modules/src/render/ui/title.tsx | 57 ++++++---- .../client-modules/src/render/ui/toolbar.tsx | 17 +-- .../client-modules/src/render/ui/viewmap.tsx | 44 ++++++-- packages/render-style/src/font.ts | 14 ++- 15 files changed, 354 insertions(+), 187 deletions(-) diff --git a/packages-user/client-modules/src/render/action.ts b/packages-user/client-modules/src/render/action.ts index c6d5232..c9b5ff4 100644 --- a/packages-user/client-modules/src/render/action.ts +++ b/packages-user/client-modules/src/render/action.ts @@ -1,5 +1,5 @@ import { gameKey } from '@motajs/system-action'; -import { MAIN_WIDTH, MAIN_HEIGHT } from './shared'; +import { MAIN_WIDTH, MAIN_HEIGHT, POP_BOX_WIDTH, CENTER_LOC } from './shared'; import { saveSave, mainUIController, @@ -9,6 +9,7 @@ import { ReplaySettingsUI, openViewMap } from './ui'; +import { ElementLocator } from '@motajs/render-core'; export function createAction() { gameKey @@ -22,11 +23,13 @@ export function createAction() { saveLoad(mainUIController, [0, 0, MAIN_WIDTH, MAIN_HEIGHT]); }) .realize('menu', () => { - openSettings(mainUIController, [420, 240, 240, 400, 0.5, 0.5]); + const loc = CENTER_LOC.slice() as ElementLocator; + loc[2] = POP_BOX_WIDTH; + openSettings(mainUIController, loc); }) .realize('replay', () => { mainUIController.open(ReplaySettingsUI, { - loc: [420, 240, void 0, void 0, 0.5, 0.5] + loc: CENTER_LOC }); }) .realize('viewMap', () => { diff --git a/packages-user/client-modules/src/render/components/choices.tsx b/packages-user/client-modules/src/render/components/choices.tsx index 32cc2f5..020f8d9 100644 --- a/packages-user/client-modules/src/render/components/choices.tsx +++ b/packages-user/client-modules/src/render/components/choices.tsx @@ -505,27 +505,25 @@ export const Choices = defineComponent< color={props.color ?? '#333'} border={props.border} /> - {hasTitle.value && ( - - )} - {hasText.value && ( - - )} +