From e4dc28e09ef52854a5947d3bdc372e0c04922716 Mon Sep 17 00:00:00 2001 From: unanmed <1319491857@qq.com> Date: Tue, 3 Nov 2026 15:20:05 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=20@motajs/types?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages-user/data-base/package.json | 1 - packages-user/data-state/package.json | 2 +- packages/types/package.json | 3 - packages/types/src/enemy.ts | 191 -------------------------- packages/types/src/index.ts | 2 - packages/types/src/utils.ts | 4 - 6 files changed, 1 insertion(+), 202 deletions(-) delete mode 100644 packages/types/package.json delete mode 100644 packages/types/src/enemy.ts delete mode 100644 packages/types/src/index.ts delete mode 100644 packages/types/src/utils.ts diff --git a/packages-user/data-base/package.json b/packages-user/data-base/package.json index 77412d8..84f601e 100644 --- a/packages-user/data-base/package.json +++ b/packages-user/data-base/package.json @@ -3,7 +3,6 @@ "dependencies": { "@user/data-common": "workspace:*", "@motajs/common": "workspace:*", - "@motajs/types": "workspace:*", "@motajs/loader": "workspace:*" } } diff --git a/packages-user/data-state/package.json b/packages-user/data-state/package.json index 41ebc1c..f0d6528 100644 --- a/packages-user/data-state/package.json +++ b/packages-user/data-state/package.json @@ -1,8 +1,8 @@ { "name": "@user/data-state", "dependencies": { - "@motajs/types": "workspace:*", "@motajs/common": "workspace:*", + "@motajs/loader": "workspace:*", "@motajs/anon-tokyo": "workspace:*", "@user/data-common": "workspace:*", "@user/data-base": "workspace:*", diff --git a/packages/types/package.json b/packages/types/package.json deleted file mode 100644 index 3368a89..0000000 --- a/packages/types/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "@motajs/types" -} \ No newline at end of file diff --git a/packages/types/src/enemy.ts b/packages/types/src/enemy.ts deleted file mode 100644 index 0e9fac6..0000000 --- a/packages/types/src/enemy.ts +++ /dev/null @@ -1,191 +0,0 @@ -import EventEmitter from 'eventemitter3'; - -export interface EnemyInfo extends Partial> { - atk: number; - def: number; - hp: number; - special: Set; - atkBuff_: number; - defBuff_: number; - hpBuff_: number; - enemy: Enemy; - guard: EnemyInfo[]; - x?: number; - y?: number; - floorId?: FloorIds; -} - -export interface MapDamage { - damage: number; - type: Set; - repulse?: LocArr[]; - ambush?: LocArr[]; -} - -export interface DamageDelta { - /** 跟最小伤害值的减伤 */ - delta: number; - damage: number; - info: DamageInfo; -} - -export interface CriticalDamageDelta extends Omit { - /** 勇士的攻击增量 */ - atkDelta: number; -} - -export interface DamageInfo { - damage: number; -} - -export interface HaloType { - square: { - x: number; - y: number; - d: number; - }; - manhattan: { - x: number; - y: number; - d: number; - }; -} - -export interface HaloData { - type: T; - data: HaloType[T]; - special: number; - from?: IDamageEnemy; -} - -export type HaloFn = (info: EnemyInfo, enemy: EnemyInfo) => void; - -export interface IDamageEnemy { - /** 怪物 id */ - readonly id: EnemyIds; - /** 怪物横坐标，不在地图上的话就是 undefined */ - readonly x?: number; - /** 怪物纵坐标，不在地图上的话就是 undefined */ - readonly y?: number; - /** 怪物所在地图，不在地图上的话就是 undefined */ - readonly floorId?: FloorIds; - /** 怪物原始属性 */ - readonly enemy: Enemy; - /** 怪物属性计算进度 */ - readonly progress: number; - /** 该怪物伤害信息所属的怪物集 */ - readonly col?: IEnemyCollection; - - /** - * 怪物属性。 - * 属性计算流程：预平衡光环(即计算加光环的光环怪的光环) -> 计算怪物在没有光环下的属性 - * -> provide inject 光环 -> 计算怪物的光环加成 -> 计算完毕 - */ - info: EnemyInfo; - - /** - * 重置怪物属性至初始状态 - */ - reset(): void; - - /** - * 获取怪物的真实属性信息 - */ - getRealInfo(): EnemyInfo; - - /** - * 计算怪物伤害 - */ - calDamage(hero?: Partial): DamageInfo; - - /** - * 计算地图伤害 - * @param damage 存入的对象 - */ - calMapDamage( - damage?: Record, - hero?: Partial - ): Record; - - /** - * 计算怪物临界 - * @param num 要计算多少个临界 - * @param hero 勇士属性，最终结果将会与由此属性计算出的伤害相减计算减伤 - */ - calCritical( - num?: number, - hero?: Partial - ): CriticalDamageDelta[]; - - /** - * 计算n防减伤 - * @param num 要加多少防御 - * @param hero 勇士属性，最终结果将会与由此属性计算出的伤害相减计算减伤 - */ - calDefDamage(num?: number, hero?: Partial): DamageDelta; - - /** - * 获取怪物秒杀时所需的攻击 - */ - getSeckillAtk(): number; -} - -export interface IEnemyCollectionEvent { - calculated: []; - extract: []; -} - -export interface IEnemyCollection extends EventEmitter { - /** 这个怪物集的地图 id */ - readonly floorId: FloorIds; - /** 地图宽度 */ - readonly width: number; - /** 地图高度 */ - readonly height: number; - /** 每个点的怪物，键是 (x + y * width)，值是怪物伤害实例 */ - readonly list: Map; - /** 地图伤害 */ - readonly mapDamage: Record; - - /** - * 获取一点的怪物伤害信息 - * @param x 怪物横坐标 - * @param y 怪物纵坐标 - */ - get(x: number, y: number): IDamageEnemy | null; - - /** - * 解析当前地图的所有怪物信息 - */ - extract(): void; - - /** - * 计算所有怪物在其位置时对应的真实属性 - */ - calRealAttribute(): void; - - /** - * 计算地图伤害 - */ - calMapDamage(): void; - - /** - * 向怪物施加光环 - * @param type 光环的范围类型 - * @param data 光环范围信息 - * @param halo 光环效果函数 - * @param recursion 是否递归施加，只有在光环预平衡阶段会使用到 - */ - applyHalo( - type: K, - data: HaloType[K], - enemy: IDamageEnemy, - halo: HaloFn | HaloFn[], - recursion?: boolean - ): void; - - /** - * 预平衡光环 - */ - preBalanceHalo(): void; -} diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts deleted file mode 100644 index ec6f224..0000000 --- a/packages/types/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './enemy'; -export * from './utils'; diff --git a/packages/types/src/utils.ts b/packages/types/src/utils.ts deleted file mode 100644 index a37f97b..0000000 --- a/packages/types/src/utils.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface IPosition { - x: number; - y: number; -}