diff --git a/packages-user/client-modules/package.json b/packages-user/client-modules/package.json
index f5cf7e0..b2a97bb 100644
--- a/packages-user/client-modules/package.json
+++ b/packages-user/client-modules/package.json
@@ -10,6 +10,7 @@
         "@motajs/legacy-ui": "workspace:*",
         "@motajs/types": "workspace:*",
         "@motajs/system": "workspace:*",
+        "@user/data-common": "workspace:*",
         "@user/data-base": "workspace:*",
         "@user/data-state": "workspace:*"
     }
diff --git a/packages-user/client-modules/src/render/map/extension/hero.ts b/packages-user/client-modules/src/render/map/extension/hero.ts
index 3ecaeac..dc0c003 100644
--- a/packages-user/client-modules/src/render/map/extension/hero.ts
+++ b/packages-user/client-modules/src/render/map/extension/hero.ts
@@ -2,11 +2,14 @@ import {
     degradeFace,
     FaceDirection,
     getFaceMovement,
+    // @ts-expect-error 需要重构
     HeroAnimateDirection,
+    // @ts-expect-error 需要重构
     IHeroMoveController,
+    // @ts-expect-error 需要重构
     IHeroMoveControllerHooks,
     nextFaceDirection
-} from '@user/data-base';
+} from '@user/data-common';
 import { IMapLayer } from '@user/data-base';
 import { IMapRenderer, IMapRendererTicker, IMovingBlock } from '../types';
 import { isNil } from 'lodash-es';
diff --git a/packages-user/client-modules/src/render/map/extension/manager.ts b/packages-user/client-modules/src/render/map/extension/manager.ts
index 2850779..46825aa 100644
--- a/packages-user/client-modules/src/render/map/extension/manager.ts
+++ b/packages-user/client-modules/src/render/map/extension/manager.ts
@@ -1,3 +1,4 @@
+// @ts-expect-error 需要重构
 import { IHeroMoveController } from '@user/data-base';
 import { IMapLayer } from '@user/data-base';
 import {
diff --git a/packages-user/client-modules/src/render/map/extension/types.ts b/packages-user/client-modules/src/render/map/extension/types.ts
index e06064c..ffeb09a 100644
--- a/packages-user/client-modules/src/render/map/extension/types.ts
+++ b/packages-user/client-modules/src/render/map/extension/types.ts
@@ -1,9 +1,11 @@
 import { ITexture, Font } from '@motajs/render';
 import {
     FaceDirection,
+    // @ts-expect-error 需要重构
     HeroAnimateDirection,
+    // @ts-expect-error 需要重构
     IHeroMoveController
-} from '@user/data-base';
+} from '@user/data-common';
 import { IMapLayer } from '@user/data-base';
 
 import { IMapRenderResult } from '../types';
diff --git a/packages-user/client-modules/src/render/ui/main.tsx b/packages-user/client-modules/src/render/ui/main.tsx
index f46e26a..4d6e392 100644
--- a/packages-user/client-modules/src/render/ui/main.tsx
+++ b/packages-user/client-modules/src/render/ui/main.tsx
@@ -96,7 +96,7 @@ const MainScene = defineComponent(() => {
     //#region 状态更新
     const updateStatus = () => {
         if (!core.status || !core.status.hero || !core.status.floorId) return;
-        const flags = client.data.flags;
+        const flags = client.flags;
         hideStatus.value = flags.getFieldValueDefaults('hideStatusBar', false);
 
         const hero = core.status.hero;
@@ -243,6 +243,7 @@ const MainScene = defineComponent(() => {
             >
                 <map-render
                     renderer={mainMapRenderer}
+                    // @ts-expect-error 需要重构
                     layerState={state.maps}
                     extension={mainMapExtension}
                     loc={[0, 0, MAP_WIDTH, MAP_HEIGHT]}
diff --git a/packages-user/client-modules/src/render/ui/statistics.tsx b/packages-user/client-modules/src/render/ui/statistics.tsx
index 2c601f4..e236455 100644
--- a/packages-user/client-modules/src/render/ui/statistics.tsx
+++ b/packages-user/client-modules/src/render/ui/statistics.tsx
@@ -7,6 +7,7 @@ import {
 import { defineComponent } from 'vue';
 import { waitbox, ListPage, TextContent } from '../components';
 import { DefaultProps } from '@motajs/render-vue';
+// @ts-expect-error 需要重构
 import { ItemState } from '@user/data-state';
 
 // 未完工
diff --git a/packages-user/data-state/src/index.ts b/packages-user/data-state/src/index.ts
index eb2c5f6..5fcda61 100644
--- a/packages-user/data-state/src/index.ts
+++ b/packages-user/data-state/src/index.ts
@@ -1,6 +1,7 @@
 export * from './enemy';
 export * from './event';
 export * from './hero';
+export * from './legacy';
 export * from './replay';
 
 export * from './core';
diff --git a/packages-user/data-state/src/legacy/index.ts b/packages-user/data-state/src/legacy/index.ts
index 9dd9b6e..548eb20 100644
--- a/packages-user/data-state/src/legacy/index.ts
+++ b/packages-user/data-state/src/legacy/index.ts
@@ -1,5 +1,3 @@
-export function create() {}
-
 export * from './hero';
 export * from './interface';
 export * from './item';