hrbattle 1.0.7 → 1.0.8

package/dist/battle/battleCore.d.ts

@@ -1,8 +1,8 @@
-import { BattleEventBus } from "./eventBus";
-import { EffectSystem } from "./effectSystem";
-import { BattleLogger } from "./logger";
-import { ConfigSkillEngine, ScriptSkillEngine } from "./skillEngine";
-import type { BattleConfig, BattleInitUnit, ISkillScript, SkillDefinition, TriggerContext, UnitId, UnitModel } from "./types";
+import { BattleEventBus } from "./eventBus.js";
+import { EffectSystem } from "./effectSystem.js";
+import { BattleLogger } from "./logger.js";
+import { ConfigSkillEngine, ScriptSkillEngine } from "./skillEngine.js";
+import type { BattleConfig, BattleInitUnit, ISkillScript, SkillDefinition, TriggerContext, UnitId, UnitModel } from "./types.js";
 export interface BattleResult {
     winner: 1 | 2 | 0;
     totalTurns: number;

package/dist/battle/battleCore.js

@@ -1,10 +1,10 @@
-import { BattleEventBus } from "./eventBus";
-import { EffectSystem } from "./effectSystem";
-import { BattleLogger } from "./logger";
-import { SeedRng } from "./random";
-import { repression } from "./formula";
-import { ConfigSkillEngine, ScriptSkillEngine, SkillExecutor } from "./skillEngine";
-import { TurnBarSystem } from "./turnbar";
+import { BattleEventBus } from "./eventBus.js";
+import { EffectSystem } from "./effectSystem.js";
+import { BattleLogger } from "./logger.js";
+import { SeedRng } from "./random.js";
+import { repression } from "./formula.js";
+import { ConfigSkillEngine, ScriptSkillEngine, SkillExecutor } from "./skillEngine.js";
+import { TurnBarSystem } from "./turnbar.js";
 export class BattleCore {
     initUnits;
     config;

package/dist/battle/config/jsonConfigLoader.d.ts

@@ -1,4 +1,4 @@
-import type { BattleInitUnit, BuffConfig, SkillDefinition, SkillTemplate, UnitStats } from "../types";
+import type { BattleInitUnit, BuffConfig, SkillDefinition, SkillTemplate, UnitStats } from "../types.js";
 type JsonHeroSkillBook = {
     heroId: string;
     heroName: string;

package/dist/battle/config/sampleData.d.ts

@@ -1,3 +1,3 @@
-import type { BuffConfig, SkillTemplate } from "../types";
+import type { BuffConfig, SkillTemplate } from "../types.js";
 export declare const sampleBuffs: BuffConfig[];
 export declare const sampleTemplates: SkillTemplate[];

package/dist/battle/effectSystem.d.ts

@@ -1,5 +1,5 @@
-import type { BuffConfig, BuffInstance, UnitId, UnitModel, UnitStats } from "./types";
-import { BattleEventBus } from "./eventBus";
+import type { BuffConfig, BuffInstance, UnitId, UnitModel, UnitStats } from "./types.js";
+import { BattleEventBus } from "./eventBus.js";
 export declare class EffectSystem {
     private readonly eventBus;
     private buffs;

package/dist/battle/eventBus.d.ts

@@ -1,4 +1,4 @@
-import type { BattleEvent, BattleEventName } from "./types";
+import type { BattleEvent, BattleEventName } from "./types.js";
 type EventHandler<T> = (payload: T) => void;
 export declare class BattleEventBus {
     private handlers;

package/dist/battle/formula.d.ts

@@ -1,5 +1,5 @@
-import type { ElementType, SkillType, UnitModel } from "./types";
-import { SeedRng } from "./random";
+import type { ElementType, SkillType, UnitModel } from "./types.js";
+import { SeedRng } from "./random.js";
 export interface DamageResult {
     finalDam: number;
     baseDam: number;

package/dist/battle/logger.d.ts

@@ -1,4 +1,4 @@
-import type { BattleActionLog, BattleSnapshot, ElementType, UnitId, UnitModel, UnitStats } from "./types";
+import type { BattleActionLog, BattleSnapshot, ElementType, UnitId, UnitModel, UnitStats } from "./types.js";
 export declare class BattleLogger {
     readonly actionLogs: BattleActionLog[];
     readonly snapshots: BattleSnapshot[];

package/dist/battle/script/designedScripts.d.ts

@@ -1,2 +1,2 @@
-import type { ISkillScript } from "../types";
+import type { ISkillScript } from "../types.js";
 export declare const designedScripts: Record<string, ISkillScript>;

package/dist/battle/script/designedScripts.js

@@ -1,7 +1,7 @@
-import { monsterScripts16xx } from "./monsterScripts";
-import { monsterScripts18xx } from "./monsterScripts18xx";
-import { monsterScripts19xxPart1 } from "./monsterScripts19xx";
-import { monsterScripts19xxPart2 } from "./monsterScripts19xxPart2";
+import { monsterScripts16xx } from "./monsterScripts.js";
+import { monsterScripts18xx } from "./monsterScripts18xx.js";
+import { monsterScripts19xxPart1 } from "./monsterScripts19xx.js";
+import { monsterScripts19xxPart2 } from "./monsterScripts19xxPart2.js";
 const ailishaOriginalPositions = new Map();
 function buildEmptyResult(ctx, targets = ctx.targets) {
     return {

package/dist/battle/script/monsterScripts.d.ts

@@ -1,2 +1,2 @@
-import type { ISkillScript } from "../types";
+import type { ISkillScript } from "../types.js";
 export declare const monsterScripts16xx: Record<string, ISkillScript>;

package/dist/battle/script/monsterScripts18xx.d.ts

@@ -1,2 +1,2 @@
-import type { ISkillScript } from "../types";
+import type { ISkillScript } from "../types.js";
 export declare const monsterScripts18xx: Record<string, ISkillScript>;

package/dist/battle/script/monsterScripts19xx.d.ts

@@ -1,2 +1,2 @@
-import type { ISkillScript } from "../types";
+import type { ISkillScript } from "../types.js";
 export declare const monsterScripts19xxPart1: Record<string, ISkillScript>;

package/dist/battle/script/monsterScripts19xxPart2.d.ts

@@ -1,2 +1,2 @@
-import type { ISkillScript } from "../types";
+import type { ISkillScript } from "../types.js";
 export declare const monsterScripts19xxPart2: Record<string, ISkillScript>;

package/dist/battle/script/sampleScripts.d.ts

@@ -1,4 +1,4 @@
-import type { ISkillScript } from "../types";
+import type { ISkillScript } from "../types.js";
 /**
  * 导出所有示例脚本
  */

package/dist/battle/skillEngine.d.ts

@@ -1,5 +1,5 @@
-import type { BattleScriptApi, ElementType, ISkillScript, ScriptRuntimeContext, SkillDefinition, SkillResult, SkillTemplate, TriggerContext, UnitModel } from "./types";
-import { SeedRng } from "./random";
+import type { BattleScriptApi, ElementType, ISkillScript, ScriptRuntimeContext, SkillDefinition, SkillResult, SkillTemplate, TriggerContext, UnitModel } from "./types.js";
+import { SeedRng } from "./random.js";
 interface ApplyDamageResult {
     damage: number;
     imbalanceDelta: number;

package/dist/battle/skillEngine.js

@@ -1,5 +1,5 @@
-import { calcDamage, calcEffectProbability, calcHealOrShield } from "./formula";
-import { selectTargets } from "./targeting";
+import { calcDamage, calcEffectProbability, calcHealOrShield } from "./formula.js";
+import { selectTargets } from "./targeting.js";
 export class ScriptSkillEngine {
     scripts = new Map(); // 存储已注册的技能脚本
     registerScript(scriptId, script) {

package/dist/battle/targeting.d.ts

@@ -1,3 +1,3 @@
-import { SeedRng } from "./random";
-import type { TargetRule, UnitModel } from "./types";
+import { SeedRng } from "./random.js";
+import type { TargetRule, UnitModel } from "./types.js";
 export declare function selectTargets(rule: TargetRule, caster: UnitModel, allUnits: UnitModel[], rng: SeedRng): UnitModel[];

package/dist/battle/turnbar.d.ts

@@ -1,4 +1,4 @@
-import type { UnitModel, UnitId } from "./types";
+import type { UnitModel, UnitId } from "./types.js";
 export declare class TurnBarSystem {
     private extraTurnQueue;
     grantExtraTurn(unitId: UnitId): void;

package/dist/cocos-adapter/BattleFacade.d.ts

@@ -1,5 +1,5 @@
-import { BattleCore, type BattleResult } from "../battle/battleCore";
-import type { BattleConfig, BattleInitUnit } from "../battle/types";
+import { BattleCore, type BattleResult } from "../battle/battleCore.js";
+import type { BattleConfig, BattleInitUnit } from "../battle/types.js";
 export declare class BattleFacade {
     private core;
     start(units: BattleInitUnit[], config: BattleConfig, initialize?: (core: BattleCore) => void): BattleResult;

package/dist/cocos-adapter/BattleFacade.js

@@ -1,4 +1,4 @@
-import { BattleCore } from "../battle/battleCore";
+import { BattleCore } from "../battle/battleCore.js";
 export class BattleFacade {
     core;
     start(units, config, initialize) {

package/dist/cocos-adapter/ReusableBattleFacade.d.ts

@@ -1,6 +1,6 @@
-import type { BattleResult } from "../battle/battleCore";
-import { type BattleJsonConfigBundle, type HeroInput } from "../battle/config/jsonConfigLoader";
-import type { BattleConfig, BattleInitUnit, ISkillScript } from "../battle/types";
+import type { BattleResult } from "../battle/battleCore.js";
+import { type BattleJsonConfigBundle, type HeroInput } from "../battle/config/jsonConfigLoader.js";
+import type { BattleConfig, BattleInitUnit, ISkillScript } from "../battle/types.js";
 export interface ReusableBattleFacadeOptions {
     bundle?: BattleJsonConfigBundle;
     scripts?: Record<string, ISkillScript>;

package/dist/cocos-adapter/ReusableBattleFacade.js

@@ -1,6 +1,6 @@
-import { buildBattleUnitsFromJsonBundle, loadBattleJsonConfigBundle, validateBattleJsonConfigBundle } from "../battle/config/jsonConfigLoader";
-import { designedScripts } from "../battle/script/designedScripts";
-import { BattleFacade } from "./BattleFacade";
+import { buildBattleUnitsFromJsonBundle, loadBattleJsonConfigBundle, validateBattleJsonConfigBundle } from "../battle/config/jsonConfigLoader.js";
+import { designedScripts } from "../battle/script/designedScripts.js";
+import { BattleFacade } from "./BattleFacade.js";
 export class ReusableBattleFacade {
     facade = new BattleFacade();
     bundle;

package/dist/cocos-adapter/clientBattleResult.d.ts

@@ -1,5 +1,5 @@
-import type { BattleResult } from "../battle/battleCore";
-import type { BuffConfig } from "../battle/types";
+import type { BattleResult } from "../battle/battleCore.js";
+import type { BuffConfig } from "../battle/types.js";
 export interface ClientPositionChange {
     unitId: string;
     from: number;

package/dist/cocos-adapter/clientBattleResult.js

@@ -166,7 +166,11 @@ function diffRuntimeStates(prevSnapshot, nextSnapshot, hits, dotDamages, imbalan
     const dotDamageMap = new Map();
     for (const dot of dotDamages ?? []) {
         const buffMap = dotDamageMap.get(dot.targetId) ?? new Map();
-        buffMap.set(dot.buffId, { value: dot.value, element: dot.element });
+        const prev = buffMap.get(dot.buffId);
+        buffMap.set(dot.buffId, {
+            value: (prev?.value ?? 0) + dot.value,
+            element: dot.element ?? prev?.element
+        });
         dotDamageMap.set(dot.targetId, buffMap);
     }
     const imbalanceChangeMap = new Map();
@@ -197,18 +201,50 @@ function diffRuntimeStates(prevSnapshot, nextSnapshot, hits, dotDamages, imbalan
             let sourceActorId = null;
             let sourceSkillId = null;
             let source = "other_runtime_change";
-            if (!impactedByHit && unitDotMap && relatedBuffIds.length > 0 && stat === "Hp" && delta < 0) {
-                for (const buffId of relatedBuffIds) {
-                    if (unitDotMap.has(buffId)) {
-                        const dotInfo = unitDotMap.get(buffId);
-                        if (dotInfo.value === -delta) {
-                            sourceBuffId = buffId;
-                            element = dotInfo.element ?? null;
-                            source = "buff_settlement";
-                            break;
-                        }
+            // HP 在同一快照内可能同时包含 DOT 结算与技能命中，需拆分避免净值混淆。
+            if (stat === "Hp" && delta < 0 && unitDotMap && unitDotMap.size > 0) {
+                let remainingLoss = -delta;
+                const orderedBuffIds = [
+                    ...relatedBuffIds.filter((buffId) => unitDotMap.has(buffId)),
+                    ...[...unitDotMap.keys()].filter((buffId) => !relatedBuffIds.includes(buffId))
+                ];
+                for (const buffId of orderedBuffIds) {
+                    if (remainingLoss <= 0) {
+                        break;
+                    }
+                    const dotInfo = unitDotMap.get(buffId);
+                    if (!dotInfo) {
+                        continue;
+                    }
+                    const consumed = Math.min(remainingLoss, Math.max(0, dotInfo.value));
+                    if (consumed <= 0) {
+                        continue;
                     }
+                    deltas.push({
+                        unitId: nextUnit.id,
+                        stat: "Hp",
+                        delta: -consumed,
+                        source: "buff_settlement",
+                        sourceBuffId: buffId,
+                        element: dotInfo.element ?? null,
+                        sourceActorId: null,
+                        sourceSkillId: null
+                    });
+                    remainingLoss -= consumed;
                 }
+                if (remainingLoss > 0) {
+                    deltas.push({
+                        unitId: nextUnit.id,
+                        stat: "Hp",
+                        delta: -remainingLoss,
+                        source: impactedByHit ? "other_runtime_change" : "other_runtime_change",
+                        sourceBuffId: null,
+                        element: null,
+                        sourceActorId: null,
+                        sourceSkillId: null
+                    });
+                }
+                continue;
             }
             if (stat === "Imbalance") {
                 const exactMatchedChange = (imbalanceChangeMap.get(nextUnit.id) ?? []).find((change) => change.delta === delta);

package/dist/index.d.ts

@@ -1,13 +1,13 @@
-export { BattleCore } from "./battle/battleCore";
-export { BattleFacade } from "./cocos-adapter/BattleFacade";
-export { ReusableBattleFacade } from "./cocos-adapter/ReusableBattleFacade";
-export { buildClientBattleResult } from "./cocos-adapter/clientBattleResult";
-export type { BuildClientBattleResultInput, ClientAction, ClientActionStateRef, ClientBattleResult, ClientImbalanceChange, ClientPanelBuffDelta, ClientPositionChange, ClientStateSettlementDelta, ClientStatChange, ClientTurnSettlement } from "./cocos-adapter/clientBattleResult";
-export { BattleEventBus } from "./battle/eventBus";
-export { EffectSystem } from "./battle/effectSystem";
-export { calcDamage, calcEffectProbability, calcHealOrShield } from "./battle/formula";
-export { ConfigSkillEngine, ScriptSkillEngine, SkillExecutor } from "./battle/skillEngine";
-export { designedScripts } from "./battle/script/designedScripts";
-export { loadBattleJsonConfigBundle, validateBattleJsonConfigBundle, buildBattleUnitsFromJsonBundle } from "./battle/config/jsonConfigLoader";
-export type { BattleJsonConfigBundle, HeroInput } from "./battle/config/jsonConfigLoader";
-export type { BattleScriptApi, BattleConfig, BattleInitUnit, BuffConfig, ElementType, ISkillScript, SkillDefinition, SkillExecMode, SkillTemplate, SkillType, TargetRule, UnitModel, UnitStats } from "./battle/types";
+export { BattleCore } from "./battle/battleCore.js";
+export { BattleFacade } from "./cocos-adapter/BattleFacade.js";
+export { ReusableBattleFacade } from "./cocos-adapter/ReusableBattleFacade.js";
+export { buildClientBattleResult } from "./cocos-adapter/clientBattleResult.js";
+export type { BuildClientBattleResultInput, ClientAction, ClientActionStateRef, ClientBattleResult, ClientImbalanceChange, ClientPanelBuffDelta, ClientPositionChange, ClientStateSettlementDelta, ClientStatChange, ClientTurnSettlement } from "./cocos-adapter/clientBattleResult.js";
+export { BattleEventBus } from "./battle/eventBus.js";
+export { EffectSystem } from "./battle/effectSystem.js";
+export { calcDamage, calcEffectProbability, calcHealOrShield } from "./battle/formula.js";
+export { ConfigSkillEngine, ScriptSkillEngine, SkillExecutor } from "./battle/skillEngine.js";
+export { designedScripts } from "./battle/script/designedScripts.js";
+export { loadBattleJsonConfigBundle, validateBattleJsonConfigBundle, buildBattleUnitsFromJsonBundle } from "./battle/config/jsonConfigLoader.js";
+export type { BattleJsonConfigBundle, HeroInput } from "./battle/config/jsonConfigLoader.js";
+export type { BattleScriptApi, BattleConfig, BattleInitUnit, BuffConfig, ElementType, ISkillScript, SkillDefinition, SkillExecMode, SkillTemplate, SkillType, TargetRule, UnitModel, UnitStats } from "./battle/types.js";

package/dist/index.js

@@ -1,10 +1,10 @@
-export { BattleCore } from "./battle/battleCore";
-export { BattleFacade } from "./cocos-adapter/BattleFacade";
-export { ReusableBattleFacade } from "./cocos-adapter/ReusableBattleFacade";
-export { buildClientBattleResult } from "./cocos-adapter/clientBattleResult";
-export { BattleEventBus } from "./battle/eventBus";
-export { EffectSystem } from "./battle/effectSystem";
-export { calcDamage, calcEffectProbability, calcHealOrShield } from "./battle/formula";
-export { ConfigSkillEngine, ScriptSkillEngine, SkillExecutor } from "./battle/skillEngine";
-export { designedScripts } from "./battle/script/designedScripts";
-export { loadBattleJsonConfigBundle, validateBattleJsonConfigBundle, buildBattleUnitsFromJsonBundle } from "./battle/config/jsonConfigLoader";
+export { BattleCore } from "./battle/battleCore.js";
+export { BattleFacade } from "./cocos-adapter/BattleFacade.js";
+export { ReusableBattleFacade } from "./cocos-adapter/ReusableBattleFacade.js";
+export { buildClientBattleResult } from "./cocos-adapter/clientBattleResult.js";
+export { BattleEventBus } from "./battle/eventBus.js";
+export { EffectSystem } from "./battle/effectSystem.js";
+export { calcDamage, calcEffectProbability, calcHealOrShield } from "./battle/formula.js";
+export { ConfigSkillEngine, ScriptSkillEngine, SkillExecutor } from "./battle/skillEngine.js";
+export { designedScripts } from "./battle/script/designedScripts.js";
+export { loadBattleJsonConfigBundle, validateBattleJsonConfigBundle, buildBattleUnitsFromJsonBundle } from "./battle/config/jsonConfigLoader.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hrbattle",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "一个基于回合制战斗引擎，支持技能脚本、buff系统和效果解析。",
   "type": "module",
   "main": "dist/index.js",

package/src/battle/battleCore.ts

@@ -1,11 +1,11 @@
-import { BattleEventBus } from "./eventBus";
-import { EffectSystem } from "./effectSystem";
-import { BattleLogger } from "./logger";
-import { SeedRng } from "./random";
-import { repression } from "./formula";
-import { ConfigSkillEngine, ScriptSkillEngine, SkillExecutor } from "./skillEngine";
-import { TurnBarSystem } from "./turnbar";
-import type { BattleConfig, BattleInitUnit, ElementType, ISkillScript, SkillDefinition, SkillResult, TriggerContext, UnitId, UnitModel } from "./types";
+import { BattleEventBus } from "./eventBus.js";
+import { EffectSystem } from "./effectSystem.js";
+import { BattleLogger } from "./logger.js";
+import { SeedRng } from "./random.js";
+import { repression } from "./formula.js";
+import { ConfigSkillEngine, ScriptSkillEngine, SkillExecutor } from "./skillEngine.js";
+import { TurnBarSystem } from "./turnbar.js";
+import type { BattleConfig, BattleInitUnit, ElementType, ISkillScript, SkillDefinition, SkillResult, TriggerContext, UnitId, UnitModel } from "./types.js";
 
 interface SkillRuntimeSlot {
   definition: SkillDefinition;
@@ -780,8 +780,8 @@ export class BattleCore {
     } else if (rep === -1) {
       stagger = Math.floor(stagger * 7000 / 10000);
     }
-    const takenRate = 10000 + this.effectSystem.getImbalanceTakenRate(target.id);
-    stagger = Math.max(0, Math.floor(stagger * takenRate / 10000));
+    const takenRate = 10000 + this.effectSystem.getImbalanceTakenRate(target.id);
+    stagger = Math.max(0, Math.floor(stagger * takenRate / 10000));
     const max = this.computeImbalanceMax(target);
     const from = target.runtime.Imbalance;
     target.runtime.Imbalance = Math.min(max, from + stagger);

package/src/battle/config/jsonConfigLoader.ts

@@ -1,4 +1,4 @@
-import type { BattleInitUnit, BuffConfig, SkillDefinition, SkillTemplate, UnitStats } from "../types";
+import type { BattleInitUnit, BuffConfig, SkillDefinition, SkillTemplate, UnitStats } from "../types.js";
 
 import designedBuffs from "./json/designed-buffs.json";
 import designedHeroSkillBooks from "./json/designed-hero-skill-books.json";

package/src/battle/config/sampleData.ts

@@ -1,4 +1,4 @@
-import type { BuffConfig, SkillTemplate } from "../types";
+import type { BuffConfig, SkillTemplate } from "../types.js";
 
 export const sampleBuffs: BuffConfig[] = [
   {

package/src/battle/effectSystem.ts

@@ -1,5 +1,5 @@
-import type { BuffConfig, BuffInstance, UnitId, UnitModel, UnitStats } from "./types";
-import { BattleEventBus } from "./eventBus";
+import type { BuffConfig, BuffInstance, UnitId, UnitModel, UnitStats } from "./types.js";
+import { BattleEventBus } from "./eventBus.js";
 
 const FOREVER = 999999999;
 const SKIP_ROUND_END = new Set([-999, -99999999]);

package/src/battle/eventBus.ts

@@ -1,4 +1,4 @@
-import type { BattleEvent, BattleEventName } from "./types";
+import type { BattleEvent, BattleEventName } from "./types.js";
 
 type EventHandler<T> = (payload: T) => void;
 

package/src/battle/formula.ts

@@ -1,5 +1,5 @@
-import type { ElementType, SkillType, UnitModel } from "./types";
-import { SeedRng } from "./random";
+import type { ElementType, SkillType, UnitModel } from "./types.js";
+import { SeedRng } from "./random.js";
 
 const DEF_PARTICLE = 300;
 

package/src/battle/logger.ts

@@ -1,4 +1,4 @@
-import type { BattleActionLog, BattleSnapshot, ElementType, UnitId, UnitModel, UnitStats } from "./types";
+import type { BattleActionLog, BattleSnapshot, ElementType, UnitId, UnitModel, UnitStats } from "./types.js";
 
 export class BattleLogger {
   readonly actionLogs: BattleActionLog[] = [];

package/src/battle/script/designedScripts.ts

@@ -1,8 +1,8 @@
-import type { ISkillScript, ScriptRuntimeContext, SkillHitDetail, SkillResult } from "../types";
-import { monsterScripts16xx } from "./monsterScripts";
-import { monsterScripts18xx } from "./monsterScripts18xx";
-import { monsterScripts19xxPart1 } from "./monsterScripts19xx";
-import { monsterScripts19xxPart2 } from "./monsterScripts19xxPart2";
+import type { ISkillScript, ScriptRuntimeContext, SkillHitDetail, SkillResult } from "../types.js";
+import { monsterScripts16xx } from "./monsterScripts.js";
+import { monsterScripts18xx } from "./monsterScripts18xx.js";
+import { monsterScripts19xxPart1 } from "./monsterScripts19xx.js";
+import { monsterScripts19xxPart2 } from "./monsterScripts19xxPart2.js";
 
 const ailishaOriginalPositions = new Map<string, number>();
 

package/src/battle/script/monsterScripts.ts

@@ -1,4 +1,4 @@
-import type { BattleInitUnit, ISkillScript, ScriptRuntimeContext, SkillHitDetail, SkillResult } from "../types";
+import type { BattleInitUnit, ISkillScript, ScriptRuntimeContext, SkillHitDetail, SkillResult } from "../types.js";
 
 function buildEmptyResult(ctx: ScriptRuntimeContext, targets = ctx.targets): SkillResult {
   return {
@@ -17,7 +17,7 @@ function buildDamageHit(ctx: ScriptRuntimeContext, targetId: string, finalValue:
     targetId,
     effectType: "damage",
     element: ctx.api.getUnit(ctx.caster)?.element ?? "fire",
-    skillType: ctx.skillType,
+    skillType: ctx.skillType,
     isCritical: false,
     baseValue: finalValue,
     criticalValue: finalValue,
@@ -34,7 +34,7 @@ function buildBuffHit(ctx: ScriptRuntimeContext, targetId: string, buffId: strin
     targetId,
     effectType: "buff",
     element: ctx.api.getUnit(ctx.caster)?.element ?? "fire",
-    skillType: ctx.skillType,
+    skillType: ctx.skillType,
     isCritical: false,
     baseValue: 0,
     criticalValue: 0,
@@ -50,7 +50,7 @@ function buildHealHit(ctx: ScriptRuntimeContext, targetId: string, finalValue: n
     targetId,
     effectType: "heal",
     element: ctx.api.getUnit(ctx.caster)?.element ?? "fire",
-    skillType: ctx.skillType,
+    skillType: ctx.skillType,
     isCritical: false,
     baseValue: finalValue,
     criticalValue: finalValue,
@@ -64,7 +64,7 @@ function buildShieldHit(ctx: ScriptRuntimeContext, targetId: string, finalValue:
     targetId,
     effectType: "shield",
     element: ctx.api.getUnit(ctx.caster)?.element ?? "fire",
-    skillType: ctx.skillType,
+    skillType: ctx.skillType,
     isCritical: false,
     baseValue: finalValue,
     criticalValue: finalValue,

package/src/battle/script/monsterScripts18xx.ts

@@ -1,16 +1,16 @@
-import type { ISkillScript, ScriptRuntimeContext, SkillHitDetail, SkillResult } from "../types";
+import type { ISkillScript, ScriptRuntimeContext, SkillHitDetail, SkillResult } from "../types.js";
 
 function buildEmptyResult(ctx: ScriptRuntimeContext, targets = ctx.targets): SkillResult {
   return { skillId: ctx.skillId, casterId: ctx.caster, targets, totalDamage: 0, totalHeal: 0, totalShield: 0, triggeredBy: ctx.trigger };
 }
 function buildDamageHit(ctx: ScriptRuntimeContext, targetId: string, v: number, imbalanceDelta?: number, triggeredImbalanceBreak?: boolean): SkillHitDetail {
-  return { targetId, effectType: "damage", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0, imbalanceDelta, triggeredImbalanceBreak, damageBreakdown: { preMitigation: v, postMitigation: v, shieldAbsorbed: 0, hpDamage: v } };
+  return { targetId, effectType: "damage", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0, imbalanceDelta, triggeredImbalanceBreak, damageBreakdown: { preMitigation: v, postMitigation: v, shieldAbsorbed: 0, hpDamage: v } };
 }
 function buildBuffHit(ctx: ScriptRuntimeContext, targetId: string, buffId: string, resisted = false): SkillHitDetail {
-  return { targetId, effectType: "buff", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: 0, criticalValue: 0, finalValue: 0, isRepression: 0, appliedBuffId: resisted ? undefined : buffId, resisted };
+  return { targetId, effectType: "buff", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: 0, criticalValue: 0, finalValue: 0, isRepression: 0, appliedBuffId: resisted ? undefined : buffId, resisted };
 }
 function buildHealHit(ctx: ScriptRuntimeContext, targetId: string, v: number): SkillHitDetail {
-  return { targetId, effectType: "heal", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0 };
+  return { targetId, effectType: "heal", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0 };
 }
 
 // ============================================================

package/src/battle/script/monsterScripts19xx.ts

@@ -1,19 +1,19 @@
-import type { BattleInitUnit, ISkillScript, ScriptRuntimeContext, SkillHitDetail, SkillResult } from "../types";
+import type { BattleInitUnit, ISkillScript, ScriptRuntimeContext, SkillHitDetail, SkillResult } from "../types.js";
 
 function empty(ctx: ScriptRuntimeContext, targets = ctx.targets): SkillResult {
   return { skillId: ctx.skillId, casterId: ctx.caster, targets, totalDamage: 0, totalHeal: 0, totalShield: 0, triggeredBy: ctx.trigger };
 }
 function dmgHit(ctx: ScriptRuntimeContext, tid: string, v: number, ib?: number, tib?: boolean): SkillHitDetail {
-  return { targetId: tid, effectType: "damage", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0, imbalanceDelta: ib, triggeredImbalanceBreak: tib, damageBreakdown: { preMitigation: v, postMitigation: v, shieldAbsorbed: 0, hpDamage: v } };
+  return { targetId: tid, effectType: "damage", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0, imbalanceDelta: ib, triggeredImbalanceBreak: tib, damageBreakdown: { preMitigation: v, postMitigation: v, shieldAbsorbed: 0, hpDamage: v } };
 }
 function buffHit(ctx: ScriptRuntimeContext, tid: string, bid: string, r = false): SkillHitDetail {
-  return { targetId: tid, effectType: "buff", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: 0, criticalValue: 0, finalValue: 0, isRepression: 0, appliedBuffId: r ? undefined : bid, resisted: r };
+  return { targetId: tid, effectType: "buff", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: 0, criticalValue: 0, finalValue: 0, isRepression: 0, appliedBuffId: r ? undefined : bid, resisted: r };
 }
 function healHit(ctx: ScriptRuntimeContext, tid: string, v: number): SkillHitDetail {
-  return { targetId: tid, effectType: "heal", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0 };
+  return { targetId: tid, effectType: "heal", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0 };
 }
 function shieldHit(ctx: ScriptRuntimeContext, tid: string, v: number): SkillHitDetail {
-  return { targetId: tid, effectType: "shield", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0 };
+  return { targetId: tid, effectType: "shield", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0 };
 }
 
 // 19011 骨墩墩 普攻：80%火属性伤害+赋予自身【反击】(反击触发的普攻不赋予反击)

package/src/battle/script/monsterScripts19xxPart2.ts

@@ -1,19 +1,19 @@
-import type { BattleInitUnit, ISkillScript, ScriptRuntimeContext, SkillHitDetail, SkillResult } from "../types";
+import type { BattleInitUnit, ISkillScript, ScriptRuntimeContext, SkillHitDetail, SkillResult } from "../types.js";
 
 function empty(ctx: ScriptRuntimeContext, targets = ctx.targets): SkillResult {
   return { skillId: ctx.skillId, casterId: ctx.caster, targets, totalDamage: 0, totalHeal: 0, totalShield: 0, triggeredBy: ctx.trigger };
 }
 function dmgHit(ctx: ScriptRuntimeContext, tid: string, v: number, ib?: number, tib?: boolean): SkillHitDetail {
-  return { targetId: tid, effectType: "damage", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0, imbalanceDelta: ib, triggeredImbalanceBreak: tib, damageBreakdown: { preMitigation: v, postMitigation: v, shieldAbsorbed: 0, hpDamage: v } };
+  return { targetId: tid, effectType: "damage", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0, imbalanceDelta: ib, triggeredImbalanceBreak: tib, damageBreakdown: { preMitigation: v, postMitigation: v, shieldAbsorbed: 0, hpDamage: v } };
 }
 function buffHit(ctx: ScriptRuntimeContext, tid: string, bid: string, r = false): SkillHitDetail {
-  return { targetId: tid, effectType: "buff", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: 0, criticalValue: 0, finalValue: 0, isRepression: 0, appliedBuffId: r ? undefined : bid, resisted: r };
+  return { targetId: tid, effectType: "buff", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: 0, criticalValue: 0, finalValue: 0, isRepression: 0, appliedBuffId: r ? undefined : bid, resisted: r };
 }
 function healHit(ctx: ScriptRuntimeContext, tid: string, v: number): SkillHitDetail {
-  return { targetId: tid, effectType: "heal", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0 };
+  return { targetId: tid, effectType: "heal", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0 };
 }
 function shieldHit(ctx: ScriptRuntimeContext, tid: string, v: number): SkillHitDetail {
-  return { targetId: tid, effectType: "shield", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0 };
+  return { targetId: tid, effectType: "shield", element: ctx.api.getUnit(ctx.caster)?.element ?? "fire", skillType: ctx.skillType, isCritical: false, baseValue: v, criticalValue: v, finalValue: v, isRepression: 0 };
 }
 
 // 19042 大风 技能1：对全体敌人造成50%风属性伤害，并消除敌人20%行动值持续2回合
@@ -82,12 +82,12 @@ const m19052Script: ISkillScript = {
       // 驱散1个负面效果(简化：移除第一个debuff)
       const debuffs = ctx.api.getBuffs(ally.id).filter(b => {
         const c = b.config;
-        return (c.defDelta && c.defDelta < 0) || (c.defenseRateDelta && c.defenseRateDelta < 0) ||
-          (c.speedRateDelta && c.speedRateDelta < 0) ||
+        return (c.defDelta && c.defDelta < 0) || (c.defenseRateDelta && c.defenseRateDelta < 0) ||
+          (c.speedRateDelta && c.speedRateDelta < 0) ||
           (c.vulnerabilityDelta && c.vulnerabilityDelta > 0) || c.stun || c.dotRatio ||
-          (c.effectResDelta && c.effectResDelta < 0) ||
-          (c.allElementResistDelta && c.allElementResistDelta < 0) ||
-          (c.imbalanceTakenRateDelta && c.imbalanceTakenRateDelta > 0);
+          (c.effectResDelta && c.effectResDelta < 0) ||
+          (c.allElementResistDelta && c.allElementResistDelta < 0) ||
+          (c.imbalanceTakenRateDelta && c.imbalanceTakenRateDelta > 0);
       });
       if (debuffs.length > 0) {
         ctx.api.removeBuff(ally.id, debuffs[0].id);
@@ -325,12 +325,12 @@ const m19074Script: ISkillScript = {
       const newBuff = buffs.find(b => b.id === data.buffId);
       if (newBuff) {
         const c = newBuff.config;
-        const isDebuff = (c.defDelta && c.defDelta < 0) || (c.defenseRateDelta && c.defenseRateDelta < 0) ||
-          (c.speedRateDelta && c.speedRateDelta < 0) ||
+        const isDebuff = (c.defDelta && c.defDelta < 0) || (c.defenseRateDelta && c.defenseRateDelta < 0) ||
+          (c.speedRateDelta && c.speedRateDelta < 0) ||
           (c.vulnerabilityDelta && c.vulnerabilityDelta > 0) || c.stun || c.dotRatio ||
-          (c.effectResDelta && c.effectResDelta < 0) ||
-          (c.allElementResistDelta && c.allElementResistDelta < 0) ||
-          (c.imbalanceTakenRateDelta && c.imbalanceTakenRateDelta > 0);
+          (c.effectResDelta && c.effectResDelta < 0) ||
+          (c.allElementResistDelta && c.allElementResistDelta < 0) ||
+          (c.imbalanceTakenRateDelta && c.imbalanceTakenRateDelta > 0);
         if (isDebuff) {
           ctx.api.removeBuff(ctx.caster, data.buffId);
         }
@@ -361,8 +361,8 @@ const m19075Script: ISkillScript = {
             (c.defenseRateDelta && c.defenseRateDelta > 0) ||
             (c.speedRateDelta && c.speedRateDelta > 0) ||
             (c.damageRateDelta && c.damageRateDelta > 0) ||
-            (c.critRateDelta && c.critRateDelta > 0) ||
-            (c.assistRateDelta && c.assistRateDelta > 0);
+            (c.critRateDelta && c.critRateDelta > 0) ||
+            (c.assistRateDelta && c.assistRateDelta > 0);
           if (isBeneficial) {
             ctx.api.removeBuff(ctx.caster, b.id);
           }

package/src/battle/script/sampleScripts.ts

@@ -1,4 +1,4 @@
-import type { ISkillScript, ScriptRuntimeContext, SkillResult } from "../types";
+import type { ISkillScript, ScriptRuntimeContext, SkillResult } from "../types.js";
 
 /**
  * 示例：支持技能升级的手写技能脚本

package/src/battle/skillEngine.ts

@@ -1,5 +1,5 @@
-import { calcDamage, calcEffectProbability, calcHealOrShield } from "./formula";
-import { selectTargets } from "./targeting";
+import { calcDamage, calcEffectProbability, calcHealOrShield } from "./formula.js";
+import { selectTargets } from "./targeting.js";
 import type {
   BattleScriptApi,
   ElementType,
@@ -12,8 +12,8 @@ import type {
   SkillTemplate,
   TriggerContext,
   UnitModel
-} from "./types";
-import { SeedRng } from "./random";
+} from "./types.js";
+import { SeedRng } from "./random.js";
 
 interface ApplyDamageResult {
   damage: number;

package/src/battle/targeting.ts

@@ -1,5 +1,5 @@
-import { SeedRng } from "./random";
-import type { TargetRule, UnitModel } from "./types";
+import { SeedRng } from "./random.js";
+import type { TargetRule, UnitModel } from "./types.js";
 
 function living(units: UnitModel[]): UnitModel[] {
   return units.filter((u) => u.runtime.alive);

package/src/battle/turnbar.ts

@@ -1,4 +1,4 @@
-import type { UnitModel, UnitId } from "./types";
+import type { UnitModel, UnitId } from "./types.js";
 
 const ACTION_THRESHOLD = 1000000;
 

package/src/cocos-adapter/BattleFacade.ts

@@ -1,5 +1,5 @@
-import { BattleCore, type BattleResult } from "../battle/battleCore";
-import type { BattleConfig, BattleInitUnit } from "../battle/types";
+import { BattleCore, type BattleResult } from "../battle/battleCore.js";
+import type { BattleConfig, BattleInitUnit } from "../battle/types.js";
 
 export class BattleFacade {
   private core: BattleCore | undefined;

package/src/cocos-adapter/ReusableBattleFacade.ts

@@ -1,14 +1,14 @@
-import type { BattleResult } from "../battle/battleCore";
+import type { BattleResult } from "../battle/battleCore.js";
 import {
   buildBattleUnitsFromJsonBundle,
   loadBattleJsonConfigBundle,
   validateBattleJsonConfigBundle,
   type BattleJsonConfigBundle,
   type HeroInput
-} from "../battle/config/jsonConfigLoader";
-import { designedScripts } from "../battle/script/designedScripts";
-import type { BattleConfig, BattleInitUnit, ISkillScript } from "../battle/types";
-import { BattleFacade } from "./BattleFacade";
+} from "../battle/config/jsonConfigLoader.js";
+import { designedScripts } from "../battle/script/designedScripts.js";
+import type { BattleConfig, BattleInitUnit, ISkillScript } from "../battle/types.js";
+import { BattleFacade } from "./BattleFacade.js";
 
 export interface ReusableBattleFacadeOptions {
   bundle?: BattleJsonConfigBundle;

package/src/cocos-adapter/clientBattleResult.ts

@@ -1,5 +1,5 @@
-import type { BattleResult } from "../battle/battleCore";
-import type { BuffConfig } from "../battle/types";
+import type { BattleResult } from "../battle/battleCore.js";
+import type { BuffConfig } from "../battle/types.js";
 
 export interface ClientPositionChange {
   unitId: string;
@@ -328,7 +328,11 @@ function diffRuntimeStates(
   const dotDamageMap = new Map<string, Map<string, { value: number; element?: string }>>();
   for (const dot of dotDamages ?? []) {
     const buffMap = dotDamageMap.get(dot.targetId) ?? new Map<string, { value: number; element?: string }>();
-    buffMap.set(dot.buffId, { value: dot.value, element: dot.element });
+    const prev = buffMap.get(dot.buffId);
+    buffMap.set(dot.buffId, {
+      value: (prev?.value ?? 0) + dot.value,
+      element: dot.element ?? prev?.element
+    });
     dotDamageMap.set(dot.targetId, buffMap);
   }
   const imbalanceChangeMap = new Map<string, Array<NonNullable<typeof imbalanceChanges>[number]>>();
@@ -359,18 +363,50 @@ function diffRuntimeStates(
       let sourceActorId: string | null = null;
       let sourceSkillId: string | null = null;
       let source: ClientStateSettlementDelta["source"] = "other_runtime_change";
-      if (!impactedByHit && unitDotMap && relatedBuffIds.length > 0 && stat === "Hp" && delta < 0) {
-        for (const buffId of relatedBuffIds) {
-          if (unitDotMap.has(buffId)) {
-            const dotInfo = unitDotMap.get(buffId)!;
-            if (dotInfo.value === -delta) {
-              sourceBuffId = buffId;
-              element = dotInfo.element ?? null;
-              source = "buff_settlement";
-              break;
-            }
+      // HP 在同一快照内可能同时包含 DOT 结算与技能命中，需拆分避免净值混淆。
+      if (stat === "Hp" && delta < 0 && unitDotMap && unitDotMap.size > 0) {
+        let remainingLoss = -delta;
+        const orderedBuffIds = [
+          ...relatedBuffIds.filter((buffId) => unitDotMap.has(buffId)),
+          ...[...unitDotMap.keys()].filter((buffId) => !relatedBuffIds.includes(buffId))
+        ];
+        for (const buffId of orderedBuffIds) {
+          if (remainingLoss <= 0) {
+            break;
+          }
+          const dotInfo = unitDotMap.get(buffId);
+          if (!dotInfo) {
+            continue;
+          }
+          const consumed = Math.min(remainingLoss, Math.max(0, dotInfo.value));
+          if (consumed <= 0) {
+            continue;
           }
+          deltas.push({
+            unitId: nextUnit.id,
+            stat: "Hp",
+            delta: -consumed,
+            source: "buff_settlement",
+            sourceBuffId: buffId,
+            element: dotInfo.element ?? null,
+            sourceActorId: null,
+            sourceSkillId: null
+          });
+          remainingLoss -= consumed;
         }
+        if (remainingLoss > 0) {
+          deltas.push({
+            unitId: nextUnit.id,
+            stat: "Hp",
+            delta: -remainingLoss,
+            source: impactedByHit ? "other_runtime_change" : "other_runtime_change",
+            sourceBuffId: null,
+            element: null,
+            sourceActorId: null,
+            sourceSkillId: null
+          });
+        }
+        continue;
       }
       if (stat === "Imbalance") {
         const exactMatchedChange = (imbalanceChangeMap.get(nextUnit.id) ?? []).find((change) => change.delta === delta);

package/src/index.ts

@@ -1,7 +1,7 @@
-export { BattleCore } from "./battle/battleCore";
-export { BattleFacade } from "./cocos-adapter/BattleFacade";
-export { ReusableBattleFacade } from "./cocos-adapter/ReusableBattleFacade";
-export { buildClientBattleResult } from "./cocos-adapter/clientBattleResult";
+export { BattleCore } from "./battle/battleCore.js";
+export { BattleFacade } from "./cocos-adapter/BattleFacade.js";
+export { ReusableBattleFacade } from "./cocos-adapter/ReusableBattleFacade.js";
+export { buildClientBattleResult } from "./cocos-adapter/clientBattleResult.js";
 export type {
   BuildClientBattleResultInput,
   ClientAction,
@@ -13,21 +13,21 @@ export type {
   ClientStateSettlementDelta,
   ClientStatChange,
   ClientTurnSettlement
-} from "./cocos-adapter/clientBattleResult";
-export { BattleEventBus } from "./battle/eventBus";
-export { EffectSystem } from "./battle/effectSystem";
-export { calcDamage, calcEffectProbability, calcHealOrShield } from "./battle/formula";
-export { ConfigSkillEngine, ScriptSkillEngine, SkillExecutor } from "./battle/skillEngine";
-export { designedScripts } from "./battle/script/designedScripts";
+} from "./cocos-adapter/clientBattleResult.js";
+export { BattleEventBus } from "./battle/eventBus.js";
+export { EffectSystem } from "./battle/effectSystem.js";
+export { calcDamage, calcEffectProbability, calcHealOrShield } from "./battle/formula.js";
+export { ConfigSkillEngine, ScriptSkillEngine, SkillExecutor } from "./battle/skillEngine.js";
+export { designedScripts } from "./battle/script/designedScripts.js";
 export {
   loadBattleJsonConfigBundle,
   validateBattleJsonConfigBundle,
   buildBattleUnitsFromJsonBundle
-} from "./battle/config/jsonConfigLoader";
+} from "./battle/config/jsonConfigLoader.js";
 export type {
   BattleJsonConfigBundle,
   HeroInput
-} from "./battle/config/jsonConfigLoader";
+} from "./battle/config/jsonConfigLoader.js";
 export type {
   BattleScriptApi,
   BattleConfig,
@@ -42,4 +42,4 @@ export type {
   TargetRule,
   UnitModel,
   UnitStats
-} from "./battle/types";
+} from "./battle/types.js";