diff --git a/packages/client-base/package.json b/packages/client-base/package.json new file mode 100644 index 0000000..58d1293 --- /dev/null +++ b/packages/client-base/package.json @@ -0,0 +1,3 @@ +{ + "name": "@motajs/client-base" +} \ No newline at end of file diff --git a/packages/client-base/src/index.ts b/packages/client-base/src/index.ts new file mode 100644 index 0000000..ff0f25a --- /dev/null +++ b/packages/client-base/src/index.ts @@ -0,0 +1 @@ +export * from './keyCodes'; diff --git a/packages/client/src/keyCodes.ts b/packages/client-base/src/keyCodes.ts similarity index 100% rename from packages/client/src/keyCodes.ts rename to packages/client-base/src/keyCodes.ts diff --git a/packages/client/package.json b/packages/client/package.json index b649a52..879c2ec 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,8 @@ { "name": "@motajs/client", "dependencies": { - "@motajs/render": "workspace:*" + "@motajs/render": "workspace:*", + "@motajs/client-base": "workspace:*", + "@motajs/system": "workspace:*" } } \ No newline at end of file diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts index 8ab2f23..98a34ec 100644 --- a/packages/client/src/index.ts +++ b/packages/client/src/index.ts @@ -1,3 +1,3 @@ -export * from './keyCodes'; - +export * as Base from '@motajs/client-base'; export * as Render from '@motajs/render'; +export * as System from '@motajs/system'; diff --git a/packages/legacy-ui/package.json b/packages/legacy-ui/package.json index be28215..1edd02b 100644 --- a/packages/legacy-ui/package.json +++ b/packages/legacy-ui/package.json @@ -3,6 +3,7 @@ "dependencies": { "@motajs/render": "workspace:*", "@motajs/common": "workspace:*", - "@motajs/client": "workspace:*" + "@motajs/client": "workspace:*", + "@motajs/client-base": "workspace:*" } } \ No newline at end of file diff --git a/packages/legacy-ui/src/ui/hotkey.vue b/packages/legacy-ui/src/ui/hotkey.vue index ceee6c7..8babf31 100644 --- a/packages/legacy-ui/src/ui/hotkey.vue +++ b/packages/legacy-ui/src/ui/hotkey.vue @@ -41,7 +41,7 @@ import { GameUi } from '@/core/main/custom/ui'; import Column from '../components/colomn.vue'; import { mainUi } from '@/core/main/init/ui'; import { computed, onMounted, onUnmounted, reactive, ref } from 'vue'; -import { KeyCode, KeyCodeUtils } from '@motajs/client'; +import { KeyCode, KeyCodeUtils } from '@motajs/client-base'; import { generateBinary, keycode } from '../utils'; import { cloneDeep } from 'lodash-es'; import { gameKey } from '@/core/main/custom/hotkey'; diff --git a/packages/legacy-ui/src/utils.ts b/packages/legacy-ui/src/utils.ts index df1ab83..78c3683 100644 --- a/packages/legacy-ui/src/utils.ts +++ b/packages/legacy-ui/src/utils.ts @@ -3,7 +3,7 @@ import { MessageApi } from 'ant-design-vue/lib/message'; import { isNil } from 'lodash-es'; import { Animation, sleep, TimingFn } from 'mutate-animate'; import { Ref, ref } from 'vue'; -import { EVENT_KEY_CODE_MAP, KeyCode } from '@motajs/client'; +import { EVENT_KEY_CODE_MAP, KeyCode } from '@motajs/client-base'; import axios from 'axios'; import { decompressFromBase64 } from 'lz-string'; import { Keyboard, KeyboardEmits } from '@/core/main/custom/keyboard'; diff --git a/src/core/index.ts b/src/core/index.ts index 94f406a..37d4b4a 100644 --- a/src/core/index.ts +++ b/src/core/index.ts @@ -11,7 +11,7 @@ import { mainSetting, settingStorage } from './main/setting'; -import { KeyCode } from '@motajs/client'; +import { KeyCode } from '@motajs/client-base'; import '@/plugin'; import './package'; import { CustomToolbar } from './main/custom/toolbar'; diff --git a/src/core/main/action/move.ts b/src/core/main/action/move.ts index 780174f..9d4ec27 100644 --- a/src/core/main/action/move.ts +++ b/src/core/main/action/move.ts @@ -1,4 +1,4 @@ -import { KeyCode } from '@motajs/client'; +import { KeyCode } from '@motajs/client-base'; import { Hotkey, HotkeyData } from '../custom/hotkey'; import type { HeroMover, IMoveController } from '@/game/state/move'; import { Ticker } from 'mutate-animate'; diff --git a/src/core/main/custom/hotkey.ts b/src/core/main/custom/hotkey.ts index 7d7839d..61ee69e 100644 --- a/src/core/main/custom/hotkey.ts +++ b/src/core/main/custom/hotkey.ts @@ -1,4 +1,4 @@ -import { KeyCode } from '@motajs/client'; +import { KeyCode } from '@motajs/client-base'; import { deleteWith, generateBinary, diff --git a/src/core/main/custom/keyboard.ts b/src/core/main/custom/keyboard.ts index 947c74a..1196c1d 100644 --- a/src/core/main/custom/keyboard.ts +++ b/src/core/main/custom/keyboard.ts @@ -1,5 +1,5 @@ import { EventEmitter, Listener } from '@motajs/legacy-common'; -import { KeyCode } from '@motajs/client'; +import { KeyCode } from '@motajs/client-base'; import { gameKey } from './hotkey'; import { unwarpBinary } from './hotkey'; import { deleteWith, flipBinary } from '@motajs/legacy-ui'; diff --git a/src/core/main/init/hotkey.ts b/src/core/main/init/hotkey.ts index 150f9cc..1a80f1c 100644 --- a/src/core/main/init/hotkey.ts +++ b/src/core/main/init/hotkey.ts @@ -1,4 +1,4 @@ -import { KeyCode } from '@motajs/client'; +import { KeyCode } from '@motajs/client-base'; import { gameKey, HotkeyJSON } from '../custom/hotkey'; import { openDanmakuPoster, diff --git a/src/core/main/init/keyboard.ts b/src/core/main/init/keyboard.ts index 66b3634..6076300 100644 --- a/src/core/main/init/keyboard.ts +++ b/src/core/main/init/keyboard.ts @@ -1,4 +1,4 @@ -import { KeyCode } from '@motajs/client'; +import { KeyCode } from '@motajs/client-base'; import { Keyboard } from '../custom/keyboard'; const qweKey = new Keyboard('qwe'); // 字母键盘,A-Z diff --git a/src/core/main/init/toolbar.tsx b/src/core/main/init/toolbar.tsx index 4f81ac3..d9d6e38 100644 --- a/src/core/main/init/toolbar.tsx +++ b/src/core/main/init/toolbar.tsx @@ -1,4 +1,4 @@ -import { KeyCode, KeyCodeUtils } from '@motajs/client'; +import { KeyCode, KeyCodeUtils } from '@motajs/client-base'; import { CustomToolbar } from '../custom/toolbar'; import BoxAnimate from '@/components/boxAnimate.vue'; import { checkAssist, unwarpBinary } from '../custom/hotkey'; diff --git a/src/game/system.ts b/src/game/system.ts index ca8b391..31f5f01 100644 --- a/src/game/system.ts +++ b/src/game/system.ts @@ -13,7 +13,7 @@ import type { MotaSetting, SettingDisplayer } from '@/core/main/setting'; import type { GameStorage } from '@/core/main/storage'; import type { DamageEnemy, EnemyCollection } from './enemy/damage'; import type { specials } from './enemy/special'; -import type { KeyCode } from '@motajs/client'; +import type { KeyCode } from '@motajs/client-base'; import type { Ref } from 'vue'; import type * as battle from './enemy/battle'; import type * as hero from './state/hero'; diff --git a/src/module/render/ui/toolbar.tsx b/src/module/render/ui/toolbar.tsx index 882359b..b73fc22 100644 --- a/src/module/render/ui/toolbar.tsx +++ b/src/module/render/ui/toolbar.tsx @@ -22,7 +22,7 @@ import { gameKey } from '@/core/main/custom/hotkey'; import { generateKeyboardEvent } from '@/core/main/custom/keyboard'; import { transitioned } from '../use'; import { linear } from 'mutate-animate'; -import { KeyCode } from '@motajs/client'; +import { KeyCode } from '@motajs/client-base'; import { Progress } from '../components/misc'; interface ToolbarProps extends DefaultProps { diff --git a/src/package.json b/src/package.json index a9f4e78..7a0b899 100644 --- a/src/package.json +++ b/src/package.json @@ -2,6 +2,7 @@ "name": "@motajs/user", "dependencies": { "@motajs/client": "workspace:*", + "@motajs/client-base": "workspace:*", "@motajs/common": "workspace:*", "@motajs/render": "workspace:*", "@motajs/system": "workspace:*",