refactor: 游戏地图接口重构

packages-user/data-system/src/combat/combat.ts

@@ -8,7 +8,7 @@ import {
 import {
     ICombatFlow,
     ICombatFlowHandler,
-    ICombatFlowHook,
+    ICombatFlowHooks,
     ICombatScript,
     IDamageContext,
     IEnemyContext,
@@ -25,7 +25,7 @@ import {
 } from '@user/data-base';
 
 export class CombatFlow<TEnemy, THero>
-    extends Hookable<ICombatFlowHook<TEnemy, THero>>
+    extends Hookable<ICombatFlowHooks<TEnemy, THero>>
     implements ICombatFlow<TEnemy, THero>
 {
     hero: IHeroAttribute<THero> | null = null;
@@ -42,8 +42,8 @@ export class CombatFlow<TEnemy, THero>
     //#region 对象控制
 
     protected createController(
-        hook: Partial<ICombatFlowHook<TEnemy, THero>>
-    ): IHookController<ICombatFlowHook<TEnemy, THero>> {
+        hook: Partial<ICombatFlowHooks<TEnemy, THero>>
+    ): IHookController<ICombatFlowHooks<TEnemy, THero>> {
         return new HookController(this, hook);
     }
 

packages-user/data-system/src/combat/types.ts

@@ -750,7 +750,7 @@ export interface ICombatFlowHandler<TEnemy, THero> extends IDataBaseExtended {
     readonly locator: ITileLocator;
 }
 
-export interface ICombatFlowHook<TEnemy, THero> extends IHookBase {
+export interface ICombatFlowHooks<TEnemy, THero> extends IHookBase {
     /**
      * 战前脚本
      * @param info 战斗伤害信息
@@ -799,7 +799,7 @@ export interface ICombatResult<TEnemy, THero> {
 }
 
 export interface ICombatFlow<TEnemy, THero>
-    extends IHookable<ICombatFlowHook<TEnemy, THero>>, IDataBaseExtended {
+    extends IHookable<ICombatFlowHooks<TEnemy, THero>>, IDataBaseExtended {
     /** 勇士属性对象 */
     readonly hero: IReadonlyHeroAttribute<THero> | null;
     /** 怪物上下文对象 */

packages-user/data-system/src/trigger/types.ts

@@ -1,6 +1,6 @@
 import { ITileLocator } from '@motajs/common';
 import {
-    ILayerState,
+    IGameMap,
     IMapLayer,
     IStateBase,
     IDataBaseExtended
@@ -21,7 +21,7 @@ export interface ITriggerHandler {
     /** 当前全局状态对象 */
     readonly state: IStateBase;
     /** 当前楼层状态对象 */
-    readonly layer?: ILayerState;
+    readonly layer?: IGameMap;
     /** 当前参与触发的图层对象 */
     readonly mapLayer?: IMapLayer;
     /** 当前触发点定位符 */