diff --git a/packages-user/client-base/package.json b/packages-user/client-base/package.json index c215f6c..d09d55b 100644 --- a/packages-user/client-base/package.json +++ b/packages-user/client-base/package.json @@ -1,7 +1,7 @@ { "name": "@user/client-base", "dependencies": { - "@motajs/render-assets": "workspace:*", + "@motajs/render": "workspace:*", "@motajs/client-base": "workspace:*" } } diff --git a/packages-user/client-modules/package.json b/packages-user/client-modules/package.json index 4100cb0..919a733 100644 --- a/packages-user/client-modules/package.json +++ b/packages-user/client-modules/package.json @@ -8,8 +8,7 @@ "@motajs/legacy-common": "workspace:*", "@motajs/legacy-ui": "workspace:*", "@motajs/types": "workspace:*", - "@motajs/system-action": "workspace:*", - "@motajs/system-ui": "workspace:*", + "@motajs/system": "workspace:*", "@user/data-base": "workspace:*", "@user/data-state": "workspace:*", "@user/legacy-plugin-data": "workspace:*" diff --git a/packages-user/client-modules/src/action/hotkey.ts b/packages-user/client-modules/src/action/hotkey.ts index 04b124e..284c4df 100644 --- a/packages-user/client-modules/src/action/hotkey.ts +++ b/packages-user/client-modules/src/action/hotkey.ts @@ -1,5 +1,5 @@ import { KeyCode } from '@motajs/client-base'; -import { gameKey, HotkeyJSON } from '@motajs/system-action'; +import { gameKey, HotkeyJSON } from '@motajs/system'; import { GameStorage } from '@motajs/legacy-system'; export const mainScope = Symbol.for('@key_main'); diff --git a/packages-user/client-modules/src/action/move.ts b/packages-user/client-modules/src/action/move.ts index 49372b4..f539be5 100644 --- a/packages-user/client-modules/src/action/move.ts +++ b/packages-user/client-modules/src/action/move.ts @@ -1,5 +1,5 @@ import { KeyCode } from '@motajs/client-base'; -import { Hotkey, HotkeyData } from '@motajs/system-action'; +import { Hotkey, HotkeyData } from '@motajs/system'; import { HeroMover, IMoveController } from '@user/data-state'; import { Ticker } from 'mutate-animate'; import { mainScope } from './hotkey'; diff --git a/packages-user/client-modules/src/render/action.ts b/packages-user/client-modules/src/render/action.ts index 28b7a4e..ab0cced 100644 --- a/packages-user/client-modules/src/render/action.ts +++ b/packages-user/client-modules/src/render/action.ts @@ -1,4 +1,4 @@ -import { gameKey } from '@motajs/system-action'; +import { gameKey } from '@motajs/system'; import { POP_BOX_WIDTH, CENTER_LOC, FULL_LOC } from './shared'; import { saveSave, diff --git a/packages-user/client-modules/src/render/components/choices.tsx b/packages-user/client-modules/src/render/components/choices.tsx index 14f668c..277def6 100644 --- a/packages-user/client-modules/src/render/components/choices.tsx +++ b/packages-user/client-modules/src/render/components/choices.tsx @@ -4,7 +4,7 @@ import { Background, Selection } from './misc'; import { TextContent, TextContentProps } from './textbox'; import { TextAlign } from './textboxTyper'; import { Page, PageExpose } from './page'; -import { GameUI, IUIMountable, SetupComponentOptions } from '@motajs/system-ui'; +import { GameUI, IUIMountable, SetupComponentOptions } from '@motajs/system'; import { useKey } from '../use'; import { sleep } from 'mutate-animate'; import { DefaultProps } from '@motajs/render-vue'; diff --git a/packages-user/client-modules/src/render/components/floorSelect.tsx b/packages-user/client-modules/src/render/components/floorSelect.tsx index 46e5c3a..30a67a5 100644 --- a/packages-user/client-modules/src/render/components/floorSelect.tsx +++ b/packages-user/client-modules/src/render/components/floorSelect.tsx @@ -1,5 +1,5 @@ import { DefaultProps } from '@motajs/render-vue'; -import { SetupComponentOptions } from '@motajs/system-ui'; +import { SetupComponentOptions } from '@motajs/system'; import { clamp, isNil } from 'lodash-es'; import { computed, defineComponent, onMounted, ref, watch } from 'vue'; import { Scroll, ScrollExpose } from './scroll'; diff --git a/packages-user/client-modules/src/render/components/icons.tsx b/packages-user/client-modules/src/render/components/icons.tsx index 8a5ae4b..7445311 100644 --- a/packages-user/client-modules/src/render/components/icons.tsx +++ b/packages-user/client-modules/src/render/components/icons.tsx @@ -1,6 +1,6 @@ import { ElementLocator } from '@motajs/render'; import { DefaultProps, GraphicPropsBase } from '@motajs/render-vue'; -import { SetupComponentOptions } from '@motajs/system-ui'; +import { SetupComponentOptions } from '@motajs/system'; import { computed, defineComponent, diff --git a/packages-user/client-modules/src/render/components/input.tsx b/packages-user/client-modules/src/render/components/input.tsx index d51e9dc..fa024aa 100644 --- a/packages-user/client-modules/src/render/components/input.tsx +++ b/packages-user/client-modules/src/render/components/input.tsx @@ -13,7 +13,7 @@ import { import { transitionedColor, useKey } from '../use'; import { linear } from 'mutate-animate'; import { Background, Selection } from './misc'; -import { GameUI, IUIMountable, SetupComponentOptions } from '@motajs/system-ui'; +import { GameUI, IUIMountable, SetupComponentOptions } from '@motajs/system'; import { KeyCode } from '@motajs/client-base'; export interface InputProps extends DefaultProps, Partial { diff --git a/packages-user/client-modules/src/render/components/list.tsx b/packages-user/client-modules/src/render/components/list.tsx index 446d52b..a672345 100644 --- a/packages-user/client-modules/src/render/components/list.tsx +++ b/packages-user/client-modules/src/render/components/list.tsx @@ -2,7 +2,7 @@ import { DefaultProps } from '@motajs/render-vue'; import { computed, defineComponent, ref, SlotsType, VNode } from 'vue'; import { Selection } from './misc'; import { ElementLocator, Font } from '@motajs/render'; -import { SetupComponentOptions } from '@motajs/system-ui'; +import { SetupComponentOptions } from '@motajs/system'; import { Scroll } from './scroll'; export interface ListProps extends DefaultProps { diff --git a/packages-user/client-modules/src/render/components/misc.tsx b/packages-user/client-modules/src/render/components/misc.tsx index f2e9ff0..e28e0e4 100644 --- a/packages-user/client-modules/src/render/components/misc.tsx +++ b/packages-user/client-modules/src/render/components/misc.tsx @@ -6,7 +6,7 @@ import { Scroll, ScrollExpose, ScrollProps } from './scroll'; import { transitioned } from '../use'; import { hyper } from 'mutate-animate'; import { logger } from '@motajs/common'; -import { GameUI, IUIMountable, SetupComponentOptions } from '@motajs/system-ui'; +import { GameUI, IUIMountable, SetupComponentOptions } from '@motajs/system'; import { clamp } from 'lodash-es'; interface ProgressProps extends DefaultProps { diff --git a/packages-user/client-modules/src/render/components/page.tsx b/packages-user/client-modules/src/render/components/page.tsx index 2ea71b6..b185204 100644 --- a/packages-user/client-modules/src/render/components/page.tsx +++ b/packages-user/client-modules/src/render/components/page.tsx @@ -10,7 +10,7 @@ import { } from 'vue'; import { clamp, isNil } from 'lodash-es'; import { ElementLocator, Font } from '@motajs/render'; -import { SetupComponentOptions } from '@motajs/system-ui'; +import { SetupComponentOptions } from '@motajs/system'; import { DefaultProps } from '@motajs/render-vue'; /** 圆角矩形页码距离容器的边框大小,与 pageSize 相乘 */ diff --git a/packages-user/client-modules/src/render/components/scroll.tsx b/packages-user/client-modules/src/render/components/scroll.tsx index 49c1b3a..b5222d9 100644 --- a/packages-user/client-modules/src/render/components/scroll.tsx +++ b/packages-user/client-modules/src/render/components/scroll.tsx @@ -29,7 +29,7 @@ import { import { hyper, linear, Transition } from 'mutate-animate'; import { clamp } from 'lodash-es'; import { transitioned } from '../use'; -import { SetupComponentOptions } from '@motajs/system-ui'; +import { SetupComponentOptions } from '@motajs/system'; import { DefaultProps } from '@motajs/render-vue'; export const enum ScrollDirection { diff --git a/packages-user/client-modules/src/render/components/textbox.tsx b/packages-user/client-modules/src/render/components/textbox.tsx index cdff71d..3484862 100644 --- a/packages-user/client-modules/src/render/components/textbox.tsx +++ b/packages-user/client-modules/src/render/components/textbox.tsx @@ -29,7 +29,7 @@ import { WordBreak, TextAlign } from './textboxTyper'; -import { SetupComponentOptions } from '@motajs/system-ui'; +import { SetupComponentOptions } from '@motajs/system'; import { texture } from '../elements'; import { DefaultProps } from '@motajs/render-vue'; diff --git a/packages-user/client-modules/src/render/components/thumbnail.tsx b/packages-user/client-modules/src/render/components/thumbnail.tsx index 06e1b35..ecab03f 100644 --- a/packages-user/client-modules/src/render/components/thumbnail.tsx +++ b/packages-user/client-modules/src/render/components/thumbnail.tsx @@ -1,7 +1,7 @@ import { ElementLocator, MotaOffscreenCanvas2D, Sprite } from '@motajs/render'; import { SpriteProps } from '@motajs/render-vue'; import { defineComponent, ref, watch } from 'vue'; -import { SetupComponentOptions } from '@motajs/system-ui'; +import { SetupComponentOptions } from '@motajs/system'; export interface ThumbnailProps extends SpriteProps { /** 缩略图的位置 */ diff --git a/packages-user/client-modules/src/render/components/tip.tsx b/packages-user/client-modules/src/render/components/tip.tsx index 4ef3c3c..f1e3204 100644 --- a/packages-user/client-modules/src/render/components/tip.tsx +++ b/packages-user/client-modules/src/render/components/tip.tsx @@ -5,7 +5,7 @@ import { transitioned } from '../use'; import { hyper } from 'mutate-animate'; import { debounce } from 'lodash-es'; import { texture } from '../elements'; -import { SetupComponentOptions } from '@motajs/system-ui'; +import { SetupComponentOptions } from '@motajs/system'; import { DefaultProps } from '@motajs/render-vue'; export interface TipProps extends DefaultProps { diff --git a/packages-user/client-modules/src/render/scene.ts b/packages-user/client-modules/src/render/scene.ts index 4defeb4..93df39f 100644 --- a/packages-user/client-modules/src/render/scene.ts +++ b/packages-user/client-modules/src/render/scene.ts @@ -1,3 +1,3 @@ -import { UIController } from '@motajs/system-ui'; +import { UIController } from '@motajs/system'; export const sceneController = new UIController('main-scene'); diff --git a/packages-user/client-modules/src/render/ui/controller.tsx b/packages-user/client-modules/src/render/ui/controller.tsx index 7563745..4f90d6a 100644 --- a/packages-user/client-modules/src/render/ui/controller.tsx +++ b/packages-user/client-modules/src/render/ui/controller.tsx @@ -4,7 +4,7 @@ import { SetupComponentOptions, UIComponentProps, UIController -} from '@motajs/system-ui'; +} from '@motajs/system'; import { defineComponent } from 'vue'; import { MAIN_HEIGHT, MAIN_WIDTH } from '../shared'; diff --git a/packages-user/client-modules/src/render/ui/main.tsx b/packages-user/client-modules/src/render/ui/main.tsx index a911e2c..e22b778 100644 --- a/packages-user/client-modules/src/render/ui/main.tsx +++ b/packages-user/client-modules/src/render/ui/main.tsx @@ -8,7 +8,7 @@ import { // import { WeatherController } from '../weather'; import { defineComponent, onUnmounted, reactive, ref } from 'vue'; import { Textbox, Tip } from '../components'; -import { GameUI } from '@motajs/system-ui'; +import { GameUI } from '@motajs/system'; import { ENABLE_RIGHT_STATUS_BAR, MAIN_HEIGHT, diff --git a/packages-user/client-modules/src/render/ui/save.tsx b/packages-user/client-modules/src/render/ui/save.tsx index 87360f9..a23cef4 100644 --- a/packages-user/client-modules/src/render/ui/save.tsx +++ b/packages-user/client-modules/src/render/ui/save.tsx @@ -5,7 +5,7 @@ import { IUIMountable, SetupComponentOptions, UIComponentProps -} from '@motajs/system-ui'; +} from '@motajs/system'; import { defineComponent, ref, diff --git a/packages-user/client-modules/src/render/ui/settings.tsx b/packages-user/client-modules/src/render/ui/settings.tsx index 3acf24a..7cbafba 100644 --- a/packages-user/client-modules/src/render/ui/settings.tsx +++ b/packages-user/client-modules/src/render/ui/settings.tsx @@ -4,7 +4,7 @@ import { IUIMountable, SetupComponentOptions, UIComponentProps -} from '@motajs/system-ui'; +} from '@motajs/system'; import { defineComponent } from 'vue'; import { ChoiceItem, @@ -15,8 +15,7 @@ import { waitbox } from '../components'; import { mainUi } from '@motajs/legacy-ui'; -import { gameKey } from '@motajs/system-action'; -import { generateKeyboardEvent } from '@motajs/system-action'; +import { gameKey, generateKeyboardEvent } from '@motajs/system'; import { getVitualKeyOnce } from '@motajs/legacy-ui'; import { getAllSavesData, getSaveData, syncFromServer } from '../utils'; import { getInput } from '../components'; diff --git a/packages-user/client-modules/src/render/ui/statistics.tsx b/packages-user/client-modules/src/render/ui/statistics.tsx index 122cfae..2c601f4 100644 --- a/packages-user/client-modules/src/render/ui/statistics.tsx +++ b/packages-user/client-modules/src/render/ui/statistics.tsx @@ -3,7 +3,7 @@ import { IUIMountable, SetupComponentOptions, UIComponentProps -} from '@motajs/system-ui'; +} from '@motajs/system'; import { defineComponent } from 'vue'; import { waitbox, ListPage, TextContent } from '../components'; import { DefaultProps } from '@motajs/render-vue'; diff --git a/packages-user/client-modules/src/render/ui/statusBar.tsx b/packages-user/client-modules/src/render/ui/statusBar.tsx index f991079..4010f76 100644 --- a/packages-user/client-modules/src/render/ui/statusBar.tsx +++ b/packages-user/client-modules/src/render/ui/statusBar.tsx @@ -1,4 +1,4 @@ -import { GameUI, SetupComponentOptions } from '@motajs/system-ui'; +import { GameUI, SetupComponentOptions } from '@motajs/system'; import { computed, ComputedRef, defineComponent, shallowReactive } from 'vue'; import { TextContent } from '../components'; import { ElementLocator, Font, SizedCanvasImageSource } from '@motajs/render'; diff --git a/packages-user/client-modules/src/render/ui/title.tsx b/packages-user/client-modules/src/render/ui/title.tsx index 2ddcc53..87ee433 100644 --- a/packages-user/client-modules/src/render/ui/title.tsx +++ b/packages-user/client-modules/src/render/ui/title.tsx @@ -3,7 +3,7 @@ import { GameUI, SetupComponentOptions, UIComponentProps -} from '@motajs/system-ui'; +} from '@motajs/system'; import { defineComponent, nextTick, onMounted, ref } from 'vue'; import { BUTTONS_HEIGHT, diff --git a/packages-user/client-modules/src/render/ui/toolbar.tsx b/packages-user/client-modules/src/render/ui/toolbar.tsx index 219f117..c2d3d89 100644 --- a/packages-user/client-modules/src/render/ui/toolbar.tsx +++ b/packages-user/client-modules/src/render/ui/toolbar.tsx @@ -12,14 +12,13 @@ import { ViewMapIcon } from '../components/icons'; import { getVitualKeyOnce } from '@motajs/legacy-ui'; -import { gameKey } from '@motajs/system-action'; -import { generateKeyboardEvent } from '@motajs/system-action'; +import { gameKey, generateKeyboardEvent } from '@motajs/system'; import { transitioned } from '../use'; import { linear } from 'mutate-animate'; import { KeyCode } from '@motajs/client-base'; import { Progress } from '../components/misc'; import { generateBinary } from '@motajs/legacy-common'; -import { SetupComponentOptions } from '@motajs/system-ui'; +import { SetupComponentOptions } from '@motajs/system'; import { saveSave, saveLoad } from './save'; import { mainUIController } from './controller'; import { MAIN_HEIGHT, FULL_LOC, POP_BOX_WIDTH, CENTER_LOC } from '../shared'; diff --git a/packages-user/client-modules/src/render/ui/viewmap.tsx b/packages-user/client-modules/src/render/ui/viewmap.tsx index 0ac2bdb..1fb600e 100644 --- a/packages-user/client-modules/src/render/ui/viewmap.tsx +++ b/packages-user/client-modules/src/render/ui/viewmap.tsx @@ -12,7 +12,7 @@ import { IUIMountable, SetupComponentOptions, UIComponentProps -} from '@motajs/system-ui'; +} from '@motajs/system'; import { computed, defineComponent, diff --git a/packages-user/client-modules/src/render/use.ts b/packages-user/client-modules/src/render/use.ts index 2ff7eee..ea6990e 100644 --- a/packages-user/client-modules/src/render/use.ts +++ b/packages-user/client-modules/src/render/use.ts @@ -1,4 +1,4 @@ -import { Hotkey, gameKey } from '@motajs/system-action'; +import { Hotkey, gameKey } from '@motajs/system'; import { loading } from '@user/data-base'; import { TimingFn, Transition } from 'mutate-animate'; import { diff --git a/packages-user/client-modules/src/render/utils/saves.ts b/packages-user/client-modules/src/render/utils/saves.ts index 5524ad0..419c104 100644 --- a/packages-user/client-modules/src/render/utils/saves.ts +++ b/packages-user/client-modules/src/render/utils/saves.ts @@ -1,6 +1,6 @@ import { compressToBase64, decompressFromBase64 } from 'lz-string'; import { getConfirm, waitbox } from '../components'; -import { IUIMountable } from '@motajs/system-ui'; +import { IUIMountable } from '@motajs/system'; import { SyncSaveFromServerResponse } from '@motajs/client-base'; import { CENTER_LOC, POP_BOX_WIDTH } from '../shared'; diff --git a/packages-user/data-state/src/legacy/move.ts b/packages-user/data-state/src/legacy/move.ts index 9dafbc6..f2caba0 100644 --- a/packages-user/data-state/src/legacy/move.ts +++ b/packages-user/data-state/src/legacy/move.ts @@ -701,7 +701,7 @@ loading.once('coreInit', () => { // 注册按键操作 Mota.r(() => { const { HeroKeyMover } = Mota.require('@user/client-modules'); - const { gameKey } = Mota.require('@motajs/system-action'); + const { gameKey } = Mota.require('@motajs/system'); const keyMover = new HeroKeyMover(gameKey, heroMover); heroMoveCollection.keyMover = keyMover; }); diff --git a/packages-user/entry-client/package.json b/packages-user/entry-client/package.json index c5076f1..db7635d 100644 --- a/packages-user/entry-client/package.json +++ b/packages-user/entry-client/package.json @@ -5,14 +5,8 @@ "@motajs/client-base": "workspace:*", "@motajs/common": "workspace:*", "@motajs/render": "workspace:*", - "@motajs/render-assets": "workspace:*", - "@motajs/render-core": "workspace:*", - "@motajs/render-elements": "workspace:*", - "@motajs/render-style": "workspace:*", "@motajs/render-vue": "workspace:*", "@motajs/system": "workspace:*", - "@motajs/system-ui": "workspace:*", - "@motajs/system-action": "workspace:*", "@motajs/legacy-common": "workspace:*", "@motajs/legacy-client": "workspace:*", "@motajs/legacy-data": "workspace:*", diff --git a/packages-user/entry-client/src/create.ts b/packages-user/entry-client/src/create.ts index 4429786..f6531be 100644 --- a/packages-user/entry-client/src/create.ts +++ b/packages-user/entry-client/src/create.ts @@ -7,8 +7,6 @@ import * as LegacyUI from '@motajs/legacy-ui'; import * as Render from '@motajs/render'; import * as RenderVue from '@motajs/render-vue'; import * as System from '@motajs/system'; -import * as SystemAction from '@motajs/system-action'; -import * as SystemUI from '@motajs/system-ui'; import * as UserClientBase from '@user/client-base'; import * as ClientModules from '@user/client-modules'; import * as LegacyPluginClient from '@user/legacy-plugin-client'; @@ -28,8 +26,6 @@ export function create() { Mota.register('@motajs/render', Render); Mota.register('@motajs/render-vue', RenderVue); Mota.register('@motajs/system', System); - Mota.register('@motajs/system-action', SystemAction); - Mota.register('@motajs/system-ui', SystemUI); Mota.register('@user/client-base', UserClientBase); Mota.register('@user/client-modules', ClientModules); Mota.register('@user/legacy-plugin-client', LegacyPluginClient); diff --git a/packages-user/entry-data/src/mota.ts b/packages-user/entry-data/src/mota.ts index fff3dd4..17d3d20 100644 --- a/packages-user/entry-data/src/mota.ts +++ b/packages-user/entry-data/src/mota.ts @@ -8,8 +8,6 @@ import type * as LegacyUI from '@motajs/legacy-ui'; import type * as Render from '@motajs/render'; import type * as RenderVue from '@motajs/render-vue'; import type * as System from '@motajs/system'; -import type * as SystemAction from '@motajs/system-action'; -import type * as SystemUI from '@motajs/system-ui'; import type * as ClientModules from '@user/client-modules'; import type * as DataBase from '@user/data-base'; import type * as DataFallback from '@user/data-fallback'; @@ -33,8 +31,6 @@ interface ModuleInterface { '@motajs/render': typeof Render; '@motajs/render-vue': typeof RenderVue; '@motajs/system': typeof System; - '@motajs/system-action': typeof SystemAction; - '@motajs/system-ui': typeof SystemUI; '@user/client-modules': typeof ClientModules; '@user/data-base': typeof DataBase; '@user/data-fallback': typeof DataFallback; diff --git a/packages/legacy-system/package.json b/packages/legacy-system/package.json index 488ee33..6420a75 100644 --- a/packages/legacy-system/package.json +++ b/packages/legacy-system/package.json @@ -1,6 +1,6 @@ { "name": "@motajs/legacy-system", "dependencies": { - "@motajs/system-action": "workspace:*" + "@motajs/system": "workspace:*" } -} \ No newline at end of file +} diff --git a/packages/legacy-system/src/keyboard.vue b/packages/legacy-system/src/keyboard.vue index b27e354..ddeff3c 100644 --- a/packages/legacy-system/src/keyboard.vue +++ b/packages/legacy-system/src/keyboard.vue @@ -21,7 +21,7 @@