Merge bcb03d1043 into 820dc5bf4c

packages-user/client-modules/src/render/components/index.ts

@@ -1,8 +1,11 @@
 export * from './choices';
 export * from './icons';
+export * from './input';
+export * from './list';
 export * from './misc';
 export * from './page';
 export * from './scroll';
 export * from './textbox';
 export * from './textboxTyper';
+export * from './thumbnail';
 export * from './tip';

packages-user/client-modules/src/render/ui/main.tsx

@@ -28,8 +28,7 @@ import { ReplayingStatus } from './toolbar';
 import { getHeroStatusOn, HeroSkill, NightSpecial } from '@user/data-state';
 import { jumpIgnoreFloor } from '@user/legacy-plugin-data';
 import { hook } from '@user/data-base';
-import { FloorDamageExtends } from '../elements/damage';
-import { FloorItemDetail } from '../elements/itemDetail';
+import { FloorDamageExtends, FloorItemDetail } from '../elements';
 import { LayerGroupPortal } from '../legacy/portal';
 import { LayerGroupFilter } from '../legacy/gameCanvas';
 import { LayerGroupHalo } from '../legacy/halo';

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

@@ -14,12 +14,10 @@ import {
     onMounted,
     shallowReactive
 } from 'vue';
-import { getConfirm, Page, PageExpose } from '../components';
+import { getConfirm, Page, PageExpose, Thumbnail } from '../components';
 import { useKey } from '../use';
 import { MAP_WIDTH } from '../shared';
-import { getSave, SaveData } from '../utils';
-import { Thumbnail } from '../components/thumbnail';
-import { adjustGrid, IGridLayoutData } from '../utils/layout';
+import { getSave, SaveData, adjustGrid, IGridLayoutData } from '../utils';
 
 export const enum SaveMode {
     Save,

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

@@ -19,7 +19,7 @@ import { gameKey } from '@motajs/system-action';
 import { generateKeyboardEvent } from '@motajs/system-action';
 import { getVitualKeyOnce } from '@motajs/legacy-ui';
 import { getAllSavesData, getSaveData, syncFromServer } from '../utils';
-import { getInput } from '../components/input';
+import { getInput } from '../components';
 import { openStatistics } from './statistics';
 import { saveWithExist } from './save';
 import { compressToBase64 } from 'lz-string';

packages-user/client-modules/src/render/ui/statistics.tsx

@@ -5,8 +5,7 @@ import {
     UIComponentProps
 } from '@motajs/system-ui';
 import { defineComponent } from 'vue';
-import { ListPage } from '../components/list';
-import { waitbox } from '../components';
+import { waitbox, ListPage } from '../components';
 import { DefaultProps } from '@motajs/render-vue';
 import { ItemState } from '@user/data-state';
 

packages-user/client-modules/src/render/ui/statusBar.tsx

@@ -10,7 +10,7 @@ import {
 } from '@motajs/render';
 import { transitionedColor } from '../use';
 import { linear } from 'mutate-animate';
-import { Scroll } from '../components/scroll';
+import { Scroll } from '../components';
 import { getArea, MinimapDrawer } from '@motajs/legacy-ui';
 import {
     NumpadToolbar,

packages-user/client-modules/src/render/ui/toolbar.tsx

@@ -24,6 +24,7 @@ import { SetupComponentOptions } from '@motajs/system-ui';
 import { saveSave, saveLoad } from './save';
 import { mainUIController } from './controller';
 import { MAIN_WIDTH, MAIN_HEIGHT } from '../shared';
+import { openSettings } from './settings';
 
 interface ToolbarProps extends DefaultProps {
     loc?: ElementLocator;
@@ -115,7 +116,9 @@ export const PlayingToolbar = defineComponent<
     };
     const danmaku = () => requestAnimationFrame(openDanmakuPoster);
     const replay = () => core.ui._drawReplay();
-    const settings = () => core.openSettings(true);
+    const settings = () => {
+        openSettings(mainUIController, [420, 240, 240, 400, 0.5, 0.5]);
+    };
 
     return () => (
         <container loc={props.loc} cursor="pointer">
@@ -241,6 +244,7 @@ export const NumpadToolbar = defineComponent<
 >((props, { emit }) => {
     const numpad = () => emit('numpad');
     const nums = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
+    const font = new Font('Verdana', 14);
 
     const ctrlEnabled = ref(false);
     const shiftEnabled = ref(false);
@@ -314,6 +318,7 @@ export const NumpadToolbar = defineComponent<
                             <text
                                 text={v.toString()}
                                 loc={middle(col, row)}
+                                font={font}
                                 noevent
                             />
                         ];
@@ -332,6 +337,7 @@ export const NumpadToolbar = defineComponent<
                 text="Ctrl"
                 loc={[59, 93, void 0, void 0, 0.5, 0.5]}
                 fillStyle={ctrlTextColor.value}
+                font={font}
                 noevent
             />
             <g-rectr
@@ -346,6 +352,7 @@ export const NumpadToolbar = defineComponent<
                 text="Shift"
                 loc={[108, 93, void 0, void 0, 0.5, 0.5]}
                 fillStyle={shiftTextColor.value}
+                font={font}
                 noevent
             />
             <g-rectr
@@ -360,6 +367,7 @@ export const NumpadToolbar = defineComponent<
                 text="Alt"
                 loc={[154, 93, void 0, void 0, 0.5, 0.5]}
                 fillStyle={altTextColor.value}
+                font={font}
                 noevent
             />
             <NumpadIcon loc={ic(0, 2)} strokeStyle="gold" onClick={numpad} />

packages-user/client-modules/src/render/utils/index.ts

@@ -1,2 +1,3 @@
+export * from './layout';
 export * from './saves';
 export * from './use';

public/libs/events.js

@@ -3406,10 +3406,7 @@ events.prototype.load = function (fromUserAction) {
 
 ////// 点击设置按钮时的操作 //////
 events.prototype.openSettings = function (fromUserAction) {
-    if (core.isReplaying()) return;
-    if (!this._checkStatus('settings', fromUserAction)) return;
-    core.playSound('打开界面');
-    core.ui._drawSettings();
+    // deprecated.
 };
 
 // ------ 一些事件的具体执行过程 ------ //