refactor: 将 Layer 0 单独放到一个包

packages-user/data-base/src/map/dynamicLayer.ts

@@ -11,13 +11,15 @@ import {
     IDynamicTile,
     IMapLayer
 } from './types';
-import { FaceDirection, degradeFace } from '../common';
+import { FaceDirection, IDataCommon, degradeFace } from '@user/data-common';
 import { DynamicTile } from './dynamicTile';
 
 export class DynamicLayer
     extends Hookable<IDynamicLayerHooks>
     implements IDynamicLayer
 {
+    readonly state: IDataCommon;
+
     /** 坐标到动态图块集合的映射，外层 key = y，内层 key = x，不使用 index 是为了支持地图外图块 */
     private readonly tilePosMap: Map<number, Map<number, Set<IDynamicTile>>> =
         new Map();
@@ -26,6 +28,7 @@ export class DynamicLayer
 
     constructor(public readonly layer: IMapLayer) {
         super();
+        this.state = layer.state;
     }
 
     protected createController(

packages-user/data-base/src/map/dynamicTile.ts

@@ -1,14 +1,16 @@
 import { isNil } from 'lodash-es';
 import {
     FaceDirection,
+    IDataCommon,
     IMoverController,
     IObjectMover,
     IRoleFaceBinder
-} from '../common';
+} from '@user/data-common';
 import { IDynamicLayer, IDynamicTile } from './types';
 import { DynamicTileMover } from './mover';
 
 export class DynamicTile implements IDynamicTile {
+    readonly state: IDataCommon;
     readonly mover: IObjectMover<IDynamicTile>;
     triggerType: number;
 
@@ -21,6 +23,7 @@ export class DynamicTile implements IDynamicTile {
         public y: number,
         public readonly layer: IDynamicLayer
     ) {
+        this.state = layer.state;
         this.mover = new DynamicTileMover(this);
         this.triggerType = -1;
     }

packages-user/data-base/src/map/layerState.ts

@@ -11,7 +11,7 @@ import {
     IMapLayerHookController,
     IMapLayerHooks
 } from './types';
-import { ITileStore } from '../store';
+import { IDataCommon, ITileStore } from '@user/data-common';
 import { MapLayer } from './mapLayer';
 
 export class LayerState
@@ -39,6 +39,7 @@ export class LayerState
     private dirty: boolean = false;
 
     constructor(
+        public readonly state: IDataCommon,
         public readonly tileStore: ITileStore,
         public width: number,
         public height: number
@@ -52,6 +53,7 @@ export class LayerState
             array,
             this.width,
             this.height,
+            this,
             this.tileStore
         );
         this.layerList.add(layer);

packages-user/data-base/src/map/mapLayer.ts

@@ -1,6 +1,7 @@
 import { isNil } from 'lodash-es';
 import {
     IDynamicLayer,
+    ILayerState,
     IMapLayer,
     IMapLayerData,
     IMapLayerHookController,
@@ -8,7 +9,7 @@ import {
 } from './types';
 import { Hookable, HookController, logger } from '@motajs/common';
 import { DynamicLayer } from './dynamicLayer';
-import { ITileStore } from '../store';
+import { IDataCommon, ITileStore } from '@user/data-common';
 
 // todo: 提供 core.setBlock 等方法的替代方法，同时添加 setBlockList，以及前景背景的接口
 
@@ -16,6 +17,8 @@ export class MapLayer
     extends Hookable<IMapLayerHooks, IMapLayerHookController>
     implements IMapLayer
 {
+    readonly state: IDataCommon;
+
     width: number;
     height: number;
     empty: boolean = true;
@@ -34,9 +37,11 @@ export class MapLayer
         array: Uint32Array,
         width: number,
         height: number,
+        public readonly layerState: ILayerState,
         private readonly tileStore: ITileStore
     ) {
         super();
+        this.state = layerState.state;
         this.width = width;
         this.height = height;
         const area = width * height;

packages-user/data-base/src/map/mapStore.ts

@@ -1,6 +1,6 @@
 import { logger } from '@motajs/common';
-import { SaveCompression } from '../common';
-import { ITileStore } from '../store';
+import { IDataCommon, SaveCompression } from '@user/data-common';
+import { ITileStore } from '@user/data-common';
 import {
     ILayerState,
     ILayerStateSave,
@@ -32,7 +32,10 @@ export class MapStore implements IMapStore {
     /** 自动分区激活器开关 */
     private autoActivitorEnabled: boolean = false;
 
-    constructor(private readonly tileStore: ITileStore) {}
+    constructor(
+        private readonly tileStore: ITileStore,
+        public readonly state: IDataCommon
+    ) {}
 
     //#region 楼层管理
 
@@ -42,7 +45,7 @@ export class MapStore implements IMapStore {
         } else {
             this.maps.push(id);
         }
-        const state = new LayerState(this.tileStore, width, height);
+        const state = new LayerState(this.state, this.tileStore, width, height);
         // 若 refData 已存在，新楼层直接视为全脏
         if (this.refData !== null) {
             state.setDirty(true);

packages-user/data-base/src/map/mover.ts

@@ -4,8 +4,9 @@ import {
     ObjectMover,
     ObjectMoveStep,
     ObjectMoveStepType
-} from '../common';
+} from '@user/data-common';
 import { IDynamicTile } from './types';
+import { DYNAMIC_MOVER_FACE } from '../shared';
 
 //#region 动态图块
 
@@ -16,7 +17,8 @@ const enum DynamicMoveCode {
 
 export class DynamicTileMover extends ObjectMover<IDynamicTile> {
     constructor(public readonly tile: IDynamicTile) {
-        super();
+        const face = tile.state.faceManager;
+        super(face.get(DYNAMIC_MOVER_FACE)!);
     }
 
     protected onMoveStart(): Promise<void> {

packages-user/data-base/src/map/types.ts

@@ -1,13 +1,14 @@
 import { IHookable, IHookBase, IHookController } from '@motajs/common';
 import {
     FaceDirection,
+    IDataCommonExtended,
     IMoverController,
     IObjectMovable,
     IObjectMover,
     IRoleFaceBinder,
     ISaveableContent
-} from '../common';
-import { ITileStore } from '../store';
+} from '@user/data-common';
+import { ITileStore } from '@user/data-common';
 
 //#region 静态图层
 
@@ -69,10 +70,10 @@ export interface IMapLayerHookController extends IHookController<IMapLayerHooks>
     getMapData(): Readonly<IMapLayerData>;
 }
 
-export interface IMapLayer extends IHookable<
-    IMapLayerHooks,
-    IMapLayerHookController
-> {
+export interface IMapLayer
+    extends
+        IHookable<IMapLayerHooks, IMapLayerHookController>,
+        IDataCommonExtended {
     /** 地图宽度 */
     readonly width: number;
     /** 地图高度 */
@@ -85,6 +86,8 @@ export interface IMapLayer extends IHookable<
     /** 图层纵深 */
     readonly zIndex: number;
 
+    /** 当前图层所属的地图状态对象 */
+    readonly layerState: ILayerState;
     /** 此图层对应的动态图块图层，z 层级与静态图块一致 */
     readonly dynamicLayer: IDynamicLayer;
 
@@ -261,7 +264,8 @@ export interface ILayerStateHooks extends IHookBase {
     onResizeLayer(layer: IMapLayer, width: number, height: number): void;
 }
 
-export interface ILayerState extends IHookable<ILayerStateHooks> {
+export interface ILayerState
+    extends IHookable<ILayerStateHooks>, IDataCommonExtended {
     /** 地图列表 */
     readonly layerList: Set<IMapLayer>;
     /** 当前楼层共享的图块定义 store */
@@ -395,7 +399,8 @@ export interface IMapAreaInterval {
 
 export type MapArea = IMapAreaInterval[];
 
-export interface IMapStore extends ISaveableContent<IMapStoreSave> {
+export interface IMapStore
+    extends ISaveableContent<IMapStoreSave>, IDataCommonExtended {
     /** 所有楼层的 id 有序数组 */
     readonly maps: ReadonlyArray<string>;
 
@@ -524,7 +529,8 @@ export interface IDynamicLayerHooks extends IHookBase {
     onUpdateTilePosition(tile: IDynamicTile, layer: IDynamicLayer): void;
 }
 
-export interface IDynamicLayer extends IHookable<IDynamicLayerHooks> {
+export interface IDynamicLayer
+    extends IHookable<IDynamicLayerHooks>, IDataCommonExtended {
     /** 当前动态图层所属的静态图层 */
     readonly layer: IMapLayer;
 
@@ -598,7 +604,7 @@ export interface IDynamicLayer extends IHookable<IDynamicLayerHooks> {
     updateDynamicTile(tile: IDynamicTile): void;
 }
 
-export interface IDynamicTile extends IObjectMovable {
+export interface IDynamicTile extends IObjectMovable, IDataCommonExtended {
     /** 当前图块数字 */
     readonly num: number;
     /** 当前动态图块携带的触发器类型，-1 表示无触发器 */