AncTe/HumanBreak
1
1
Fork 0
mirror of https://github.com/unanmed/HumanBreak.git synced 2025-06-28 05:07:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 设置界面换用新的

Browse Source
This commit is contained in:
unanmed 2025-06-24 23:28:36 +08:00
parent a165e97027
commit e3edac3d55
7 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages-user/client-modules/src/action/hotkey.ts
View File

@ -489,9 +489,6 @@ gameKey
.realize('fly', () => {
core.useFly(true);
})
.realize('menu', () => {
core.openSettings(true);
})
.realize('replay', () => {
core.ui._drawReplay();
})

11
packages-user/client-modules/src/render/action.ts
View File

@ -1,6 +1,12 @@
import { gameKey } from '@motajs/system-action';
import { MAIN_WIDTH, MAIN_HEIGHT } from './shared';
import { saveSave, mainUIController, openStatistics, saveLoad } from './ui';
import {
saveSave,
mainUIController,
openStatistics,
saveLoad,
openSettings
} from './ui';
export function createAction() {
gameKey
@ -12,5 +18,8 @@ export function createAction() {
})
.realize('load', () => {
saveLoad(mainUIController, [0, 0, MAIN_WIDTH, MAIN_HEIGHT]);
})
.realize('menu', () => {
openSettings(mainUIController, [420, 240, 240, 400, 0.5, 0.5]);
});
}

12
packages-user/client-modules/src/render/components/choices.tsx
View File

@ -144,7 +144,7 @@ export const ConfirmBox = defineComponent<
<Background
loc={[0, 0, props.width, height.value]}
winskin={props.winskin}
color={props.color}
color={props.color ?? '#333'}
border={props.border}
zIndex={0}
/>
@ -444,11 +444,13 @@ export const Choices = defineComponent<
}
});
key.realize('moveDown', () => {
const page = pageCom.value?.now() ?? 0;
if (selected.value === choiceCountPerPage.value - 1) {
pageCom.value?.movePage(1);
selected.value = 0;
if (page < pages.value - 1) {
pageCom.value?.movePage(1);
selected.value = 0;
}
} else {
const page = pageCom.value?.now() ?? 1;
const index = page * choiceCountPerPage.value + selected.value;
if (index < props.choices.length - 1) {
selected.value++;
@ -458,7 +460,7 @@ export const Choices = defineComponent<
key.realize('moveLeft', () => pageCom.value?.movePage(-1));
key.realize('moveRight', () => pageCom.value?.movePage(1));
key.realize('confirm', () => {
const page = pageCom.value?.now() ?? 1;
const page = pageCom.value?.now() ?? 0;
const index = page * choiceCountPerPage.value + selected.value;
emit('choose', props.choices[index][0]);
});

4
packages-user/client-modules/src/render/components/misc.tsx
View File

@ -309,8 +309,8 @@ export const Selection = defineComponent<SelectionProps>(props => {
isWinskin.value ? core.material.images.images[props.winskin!] : null
);
const fixedLoc = computed<ElementLocator>(() => {
const [x = 0, y = 0, width = 200, height = 200] = props.loc;
return [x + 1, y + 1, width - 2, height - 2];
const [x = 0, y = 0, width = 200, height = 200, ax, ay] = props.loc;
return [x + 1, y + 1, width - 2, height - 2, ax, ay];
});
const renderWinskin = (canvas: MotaOffscreenCanvas2D) => {

2
packages-user/client-modules/src/render/index.tsx
View File

@ -38,7 +38,7 @@ export function createRender() {
mainRenderer.show();
});
Font.setDefaults(new Font('normal'));
Font.setDefaults(new Font('normal', 18));
}
export * from './components';

2
packages-user/client-modules/src/render/ui/save.tsx
View File

@ -204,7 +204,9 @@ export const Save = defineComponent<SaveProps, SaveEmits, keyof SaveEmits>(
const index = getIndex(i, page);
promises.push(getSave(index + 1));
}
const before = now.value;
const data = await Promise.all(promises);
if (before !== now.value) return;
data.forEach((v, i) => {
if (v) {

56
packages-user/client-modules/src/render/ui/settings.tsx
View File

@ -1,6 +1,7 @@
import { ElementLocator } from '@motajs/render';
import {
GameUI,
IUIMountable,
SetupComponentOptions,
UIComponentProps
} from '@motajs/system-ui';
@ -21,13 +22,15 @@ import { getAllSavesData, getSaveData, syncFromServer } from '../utils';
import { getInput } from '../components/input';
import { openStatistics } from './statistics';
export interface SettingsProps extends Partial<ChoicesProps>, UIComponentProps {
export interface MainSettingsProps
extends Partial<ChoicesProps>,
UIComponentProps {
loc: ElementLocator;
}
const settingsProps = {
const mainSettingsProps = {
props: ['loc', 'controller', 'instance']
} satisfies SetupComponentOptions<SettingsProps>;
} satisfies SetupComponentOptions<MainSettingsProps>;
const enum MainChoice {
SystemSetting,
@ -43,7 +46,7 @@ const enum MainChoice {
Back
}
export const MainSettings = defineComponent<SettingsProps>(props => {
export const MainSettings = defineComponent<MainSettingsProps>(props => {
const choices: ChoiceItem[] = [
[MainChoice.SystemSetting, '系统设置'],
[MainChoice.VirtualKey, '虚拟键盘'],
@ -106,9 +109,11 @@ export const MainSettings = defineComponent<SettingsProps>(props => {
choices={choices}
width={240}
onChoose={choose}
maxHeight={400}
interval={8}
/>
);
}, settingsProps);
}, mainSettingsProps);
const enum ReplayChoice {
Start,
@ -120,7 +125,7 @@ const enum ReplayChoice {
Back
}
export const ReplaySettings = defineComponent<SettingsProps>(props => {
export const ReplaySettings = defineComponent<MainSettingsProps>(props => {
const choice: ChoiceItem[] = [
[ReplayChoice.Start, '从头回放录像'],
[ReplayChoice.StartFromSave, '从存档开始回放'],
@ -186,9 +191,10 @@ export const ReplaySettings = defineComponent<SettingsProps>(props => {
choices={choice}
width={240}
onChoose={choose}
interval={8}
/>
);
}, settingsProps);
}, mainSettingsProps);
const enum GameInfoChoice {
Statistics,
@ -199,7 +205,7 @@ const enum GameInfoChoice {
Back
}
export const GameInfo = defineComponent<SettingsProps>(props => {
export const GameInfo = defineComponent<MainSettingsProps>(props => {
const choices: ChoiceItem[] = [
[GameInfoChoice.Statistics, '数据统计'],
[GameInfoChoice.Project, '查看工程'],
@ -272,9 +278,10 @@ export const GameInfo = defineComponent<SettingsProps>(props => {
choices={choices}
width={240}
onChoose={choose}
interval={8}
/>
);
});
}, mainSettingsProps);
const enum SyncSaveChoice {
// ----- 主菜单
@ -289,7 +296,7 @@ const enum SyncSaveChoice {
NowSave
}
export const SyncSave = defineComponent<SettingsProps>(props => {
export const SyncSave = defineComponent<MainSettingsProps>(props => {
const choices: ChoiceItem[] = [
[SyncSaveChoice.ToServer, '同步存档至服务器'],
[SyncSaveChoice.FromServer, '从服务器加载存档'],
@ -340,11 +347,12 @@ export const SyncSave = defineComponent<SettingsProps>(props => {
width={240}
choices={choices}
onChoose={choose}
interval={8}
/>
);
});
}, mainSettingsProps);
export const SyncSaveSelect = defineComponent<SettingsProps>(props => {
export const SyncSaveSelect = defineComponent<MainSettingsProps>(props => {
const choices: ChoiceItem[] = [
[SyncSaveChoice.AllSaves, '同步全部存档'],
[SyncSaveChoice.NowSave, '同步当前存档'],
@ -392,11 +400,12 @@ export const SyncSaveSelect = defineComponent<SettingsProps>(props => {
width={240}
choices={choices}
onChoose={choose}
interval={8}
/>
);
});
}, mainSettingsProps);
export const DownloadSaveSelect = defineComponent<SettingsProps>(props => {
export const DownloadSaveSelect = defineComponent<MainSettingsProps>(props => {
const choices: ChoiceItem[] = [
[SyncSaveChoice.AllSaves, '下载全部存档'],
[SyncSaveChoice.NowSave, '下载当前存档'],
@ -460,11 +469,12 @@ export const DownloadSaveSelect = defineComponent<SettingsProps>(props => {
width={240}
choices={choices}
onChoose={choose}
interval={8}
/>
);
});
}, mainSettingsProps);
export const ClearSaveSelect = defineComponent<SettingsProps>(props => {
export const ClearSaveSelect = defineComponent<MainSettingsProps>(props => {
const choices: ChoiceItem[] = [
[SyncSaveChoice.AllSaves, '清空全部塔存档'],
[SyncSaveChoice.NowSave, '清空当前塔存档'],
@ -568,9 +578,10 @@ export const ClearSaveSelect = defineComponent<SettingsProps>(props => {
width={240}
choices={choices}
onChoose={choose}
interval={8}
/>
);
});
}, mainSettingsProps);
/** @see {@link MainSettings} */
export const MainSettingsUI = new GameUI('main-settings', MainSettings);
@ -592,3 +603,14 @@ export const ClearSaveSelectUI = new GameUI(
'clear-save-select',
ClearSaveSelect
);
export function openSettings(
controller: IUIMountable,
loc: ElementLocator,
props?: MainSettingsProps
) {
controller.open(MainSettingsUI, {
...props,
loc
});
}