refactor: 将 system-action 与 system-ui 合并至 system

packages/legacy-system/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@motajs/legacy-system",
     "dependencies": {
-        "@motajs/system-action": "workspace:*"
+        "@motajs/system": "workspace:*"
     }
-}
+}

packages/legacy-system/src/keyboard.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts" setup>
-import { checkAssist, Keyboard, KeyboardEmits } from '@motajs/system-action';
+import { checkAssist, Keyboard, KeyboardEmits } from '@motajs/system';
 import { KeyCodeUtils } from '@motajs/client-base';
 import { nextTick, onUnmounted, ref } from 'vue';
 

packages/legacy-system/src/misc.tsx

@@ -1,4 +1,4 @@
-import { Keyboard } from '@motajs/system-action';
+import { Keyboard } from '@motajs/system';
 import KeyboardUI from './keyboard.vue';
 
 interface VirtualKeyProps {

packages/legacy-ui/package.json

@@ -6,6 +6,6 @@
         "@motajs/client": "workspace:*",
         "@motajs/client-base": "workspace:*",
         "@motajs/legacy-system": "workspace:*",
-        "@motajs/system-action": "workspace:*"
+        "@motajs/system": "workspace:*"
     }
-}
+}

packages/legacy-ui/src/preset/keyboard.ts

@@ -1,5 +1,5 @@
 import { KeyCode } from '@motajs/client-base';
-import { Keyboard } from '@motajs/system-action';
+import { Keyboard } from '@motajs/system';
 
 const qweKey = new Keyboard('qwe'); // 字母键盘，A-Z
 const numKey = new Keyboard('num'); // 数字键盘，1-0

packages/legacy-ui/src/preset/settings.tsx

@@ -1,7 +1,7 @@
 import type { SettingComponent, SettingComponentProps } from '../setting';
 import { Button, InputNumber, Radio } from 'ant-design-vue';
 import { mainUi } from './uiIns';
-import { gameKey } from '@motajs/system-action';
+import { gameKey } from '@motajs/system';
 
 interface Components {
     Default: SettingComponent;

packages/legacy-ui/src/ui/book.vue

@@ -45,7 +45,7 @@ import BookDetail from './bookDetail.vue';
 import { LeftOutlined } from '@ant-design/icons-vue';
 import { ToShowEnemy, detailInfo } from '../tools/book';
 import { getDetailedEnemy } from '../tools/fixed';
-import { gameKey } from '@motajs/system-action';
+import { gameKey } from '@motajs/system';
 import { mainSetting } from '../preset/settingIns';
 import { isMobile } from '../use';
 import { IMountedVBind } from '../interface';

packages/legacy-ui/src/ui/bookDetail.vue

@@ -77,7 +77,7 @@ import EnemySpecial from '../panel/enemySpecial.vue';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
 import EnemyCritical from '../panel/enemyCritical.vue';
 import { detailInfo } from '../tools/book';
-import { gameKey } from '@motajs/system-action';
+import { gameKey } from '@motajs/system';
 import { Divider } from 'ant-design-vue';
 
 const props = defineProps<{

packages/legacy-ui/src/ui/equipbox.vue

@@ -184,7 +184,7 @@ import BoxAnimate from '../components/boxAnimate.vue';
 import { type, getStatusLabel } from '../utils';
 import { cancelGlobalDrag, isMobile, tip, useDrag } from '../use';
 import { hyper } from 'mutate-animate';
-import { gameKey } from '@motajs/system-action';
+import { gameKey } from '@motajs/system';
 import { IMountedVBind } from '../interface';
 import { isNil } from 'lodash-es';
 import { Divider, Select, SelectOption } from 'ant-design-vue';

packages/legacy-ui/src/ui/fly.vue

@@ -99,7 +99,7 @@ import {
 } from '@ant-design/icons-vue';
 import { debounce } from 'lodash-es';
 import { tip } from '../use';
-import { gameKey } from '@motajs/system-action';
+import { gameKey } from '@motajs/system';
 import { createChangable } from '../tools/common';
 import { mainSetting } from '../preset/settingIns';
 import { GameStorage } from '@motajs/legacy-system';

packages/legacy-ui/src/ui/hotkey.vue

@@ -36,12 +36,11 @@
 </template>
 
 <script lang="ts" setup>
-import { Hotkey } from '@motajs/system-action';
+import { Hotkey, gameKey } from '@motajs/system';
 import Column from '../components/colomn.vue';
 import { computed, onMounted, onUnmounted, reactive, ref } from 'vue';
 import { KeyCode, KeyCodeUtils } from '@motajs/client-base';
 import { cloneDeep } from 'lodash-es';
-import { gameKey } from '@motajs/system-action';
 import { generateBinary, keycode } from '@motajs/legacy-common';
 import { IMountedVBind } from '../interface';
 

packages/legacy-ui/src/ui/settings.vue

@@ -84,7 +84,7 @@ import { RightOutlined, LeftOutlined } from '@ant-design/icons-vue';
 import { splitText } from '../utils';
 import Scroll from '../components/scroll.vue';
 import { isMobile } from '../use';
-import { gameKey } from '@motajs/system-action';
+import { gameKey } from '@motajs/system';
 import { IMountedVBind } from '../interface';
 import { Divider } from 'ant-design-vue';
 

packages/legacy-ui/src/ui/shop.vue

@@ -172,7 +172,7 @@ import {
 import { splitText } from '../utils';
 import Scroll from '../components/scroll.vue';
 import BoxAnimate from '../components/boxAnimate.vue';
-import { gameKey } from '@motajs/system-action';
+import { gameKey } from '@motajs/system';
 import { IMountedVBind } from '../interface';
 import { tip } from '../use';
 import { Divider } from 'ant-design-vue';

packages/legacy-ui/src/ui/toolbox.vue

@@ -116,7 +116,7 @@ import { isMobile } from '../use';
 import { type } from '../utils';
 import { hyper } from 'mutate-animate';
 import { Divider, message } from 'ant-design-vue';
-import { gameKey } from '@motajs/system-action';
+import { gameKey } from '@motajs/system';
 import { IMountedVBind } from '../interface';
 import { isNil } from 'lodash-es';
 

packages/legacy-ui/src/uiUtils.ts

@@ -1,5 +1,5 @@
 import { KeyCode } from '@motajs/client-base';
-import { KeyboardEmits, Keyboard, isAssist } from '@motajs/system-action';
+import { KeyboardEmits, Keyboard, isAssist } from '@motajs/system';
 import { mainUi } from './preset/uiIns';
 
 /**

packages/render-vue/package.json

@@ -3,6 +3,6 @@
     "dependencies": {
         "@motajs/common": "workspace:*",
         "@motajs/render": "workspace:*",
-        "@motajs/system-action": "workspace:*"
+        "@motajs/system": "workspace:*"
     }
 }

packages/system-action/package.json

@@ -1,6 +0,0 @@
-{
-    "name": "@motajs/system-action",
-    "dependencies": {
-        "@motajs/common": "workspace:*"
-    }
-}

packages/system-ui/package.json

@@ -1,7 +0,0 @@
-{
-    "name": "@motajs/system-ui",
-    "dependencies": {
-        "@motajs/common": "workspace:*",
-        "@motajs/render": "workspace:*"
-    }
-}

packages/system/package.json

@@ -1,7 +1,6 @@
 {
     "name": "@motajs/system",
     "dependencies": {
-        "@motajs/system-ui": "workspace:*",
-        "@motajs/system-action": "workspace:*"
+        "@motajs/common": "workspace:*"
     }
-}
+}

packages/system/src/index.ts

@@ -1,2 +1,2 @@
-export * from '@motajs/system-action';
-export * from '@motajs/system-ui';
+export * from './action';
+export * from './ui';