Merge bf6702be54 into 1a569804d8

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

@@ -6,14 +6,14 @@ import {
     ILayerStateSave,
     IMapLayer,
     IMapLayerSave,
-    IMapState,
+    IMapStore,
     IMapStoreSave,
     MapArea
 } from './types';
 import { LayerState } from './layerState';
 import { uniq } from 'lodash-es';
 
-export class MapState implements IMapState {
+export class MapStore implements IMapStore {
     /** 楼层 id 到状态对象的映射 */
     private readonly mapData: Map<string, LayerState> = new Map();
 

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

@@ -425,7 +425,7 @@ export interface IMapAreaInterval {
 
 export type MapArea = IMapAreaInterval[];
 
-export interface IMapState
+export interface IMapStore
     extends ISaveableContent<IMapStoreSave>, IDataCommonExtended {
     /** 所有楼层的 id 有序数组 */
     readonly maps: ReadonlyArray<string>;

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

@@ -1,7 +1,7 @@
 import { IHeroFollower, IHeroState } from './hero';
 import { IEnemyManager } from './enemy';
 import { IFlagSystem } from './flag';
-import { IMapState } from './map';
+import { IMapStore } from './map';
 import {
     IDataCommon,
     IEnemyAttr,
@@ -16,7 +16,7 @@ export interface IStateSaveData {
 
 export interface IStateBase extends IDataCommon {
     /** 地图状态 */
-    readonly maps: IMapState;
+    readonly maps: IMapStore;
     /** 勇士状态 */
     readonly hero: IHeroState<IHeroAttr>;
 

packages-user/data-common/src/store/mapStore.ts

@@ -1,14 +0,0 @@
-import { IMapRawData, IMapStore } from './types';
-
-export class MapStore implements IMapStore {
-    /** 地图存储映射 */
-    private readonly maps: Map<string, IMapRawData> = new Map();
-
-    getMap(floorId: string): IMapRawData | null {
-        return this.maps.get(floorId) ?? null;
-    }
-
-    addMap(map: IMapRawData): void {
-        this.maps.set(map.floorId, map);
-    }
-}

packages-user/data-common/src/store/types.ts

@@ -68,7 +68,7 @@ export interface ITileLegacyConverter<TLegacy> {
     fromLegacy(num: number, legacy: TLegacy): ITileRawData;
 }
 
-export interface ITileStore<TLegacy = unknown> {
+export interface ITileStore<TLegacy> {
     /**
      * 获取指定图块数字对应的完整原始定义
      * @param num 图块数字
@@ -250,32 +250,3 @@ export interface IItemStore<THero, TLegacy> {
 }
 
 //#endregion
-
-//#region map
-
-export interface IMapRawData {
-    /** 楼层 id */
-    readonly floorId: string;
-    /** 地图宽度 */
-    readonly width: number;
-    /** 地图数组 */
-    readonly map: Record<number, number[]>;
-    /** 每个地图图层的字符串别名 */
-    readonly layerAlias: Record<number, string>;
-}
-
-export interface IMapStore {
-    /**
-     * 根据地图 id 获取指定地图的原始数据
-     * @param floorId 楼层 id
-     */
-    getMap(floorId: string): IMapRawData | null;
-
-    /**
-     * 添加地图的原始数据定义
-     * @param map 地图原始数据
-     */
-    addMap(map: IMapRawData): void;
-}
-
-//#endregion

packages-user/data-common/src/types.ts

@@ -1,6 +1,6 @@
 import { ITileLocator } from '@motajs/common';
 import { IFaceManager, IRoleFaceBinder } from './common';
-import { IItemStore, IMapStore, ITileStore } from './store';
+import { IItemStore, ITileStore } from './store';
 import { ISaveSystem } from './save';
 
 export interface IEnemyAttr {
@@ -48,8 +48,6 @@ export interface IDataCommon {
     readonly tileStore: ITileStore<MapDataOf<keyof NumberToId>>;
     /** 道具定义存储 */
     readonly itemStore: IItemStore<IHeroAttr, Item<AllIdsOf<'items'>>>;
-    /** 地图定义存储 */
-    readonly mapStore: IMapStore;
     /** 朝向绑定 */
     readonly roleFace: IRoleFaceBinder;
     /** 朝向管理 */

packages-user/data-state/src/core.ts

@@ -17,8 +17,7 @@ import {
     ISaveSystem,
     SaveSystem,
     IItemStore,
-    ItemStore,
-    IMapStore
+    ItemStore
 } from '@user/data-common';
 import {
     EnemyManager,
@@ -32,8 +31,8 @@ import {
     MotaDataLoader,
     loading,
     IReadonlyEnemy,
-    IMapState,
-    MapState
+    IMapStore,
+    MapStore
 } from '@user/data-base';
 import {
     DamageSystem,
@@ -76,7 +75,6 @@ import { ILoadProgressTotal, LoadProgressTotal } from '@motajs/loader';
 import { isNil } from 'lodash-es';
 import { logger } from '@motajs/common';
 import { DefaultHeroMoveTopImpl } from './hero';
-import { MapStore } from '../../data-common/src/store/mapStore';
 
 export class CoreState implements ICoreState {
     // Layer 0 公共层，最底层的接口，不会依赖任何其他内容，一般是工具性接口及不需要存档的数据
@@ -85,10 +83,9 @@ export class CoreState implements ICoreState {
     readonly faceManager: IFaceManager;
     readonly tileStore: ITileStore<LegacyTileData>;
     readonly itemStore: IItemStore<IHeroAttr, LegacyItemData>;
-    readonly mapStore: IMapStore;
 
     // Layer 1 数据层，所有可存档内容都在这，一般用于数据存储
-    readonly maps: IMapState;
+    readonly maps: IMapStore;
     readonly hero: IHeroState<IHeroAttr>;
     readonly enemyManager: IEnemyManager<IEnemyAttr>;
     readonly flags: IFlagSystem;
@@ -141,12 +138,9 @@ export class CoreState implements ICoreState {
         tileStore.attachLegacyConverter(new TileLegacyBridge());
         this.tileStore = tileStore;
         // 道具
-        const itemStore = new ItemStore<IHeroAttr, LegacyItemData>();
+        const itemStore = new ItemStore<LegacyItemData>();
         itemStore.attachLegacyConverter(new ItemLegacyBridge(this));
         this.itemStore = itemStore;
-        // 地图
-        const mapStore = new MapStore();
-        this.mapStore = mapStore;
 
         //#endregion
 
@@ -156,7 +150,7 @@ export class CoreState implements ICoreState {
         this.flags = new FlagSystem();
 
         // 地图
-        this.maps = new MapState(tileStore, this);
+        this.maps = new MapStore(tileStore, this);
 
         // 勇士
         const heroAttribute = new HeroAttribute(HERO_DEFAULT_ATTRIBUTE);

packages-user/data-state/src/hero/moverImpl.ts

@@ -1,7 +1,7 @@
 import {
     IHeroMoveTopHandler,
     IHeroMoveTopImpl,
-    IMapState
+    IMapStore
 } from '@user/data-base';
 import { FaceDirection, PassBit } from '@user/data-common';
 import {
@@ -13,7 +13,7 @@ import { isNil } from 'lodash-es';
 
 export class DefaultHeroMoveTopImpl implements IHeroMoveTopImpl {
     /** 地图存储对象 */
-    private readonly maps: IMapState;
+    private readonly maps: IMapStore;
     /** 触发器收集器对象 */
     private readonly collector: ITriggerCollector;
 

src/content/enemy.jsonc

@@ -1 +0,0 @@
-{}

src/content/item.jsonc

@@ -1,3 +0,0 @@
-// Type: packages-user/data-common/src/store/types IItemRawData
-// ItemEffect: ./item.ts
-{}

src/content/maps/MT0.jsonc

@@ -1,2 +0,0 @@
-// Type: packages-user/data-base/src/map/types.ts
-{}

src/content/tile.jsonc

@@ -1,2 +0,0 @@
-// Type: packages-user/data-common/src/store/types ITileRawData
-{}