feat(skill-system): 新增计时debuff机制，支持技能命中敌方附加减益效果
本次提交完整实现了技能对敌附加debuff的完整流程： 1. 新增TimedDebuffSnapshot数据结构，用于透传debuff配置 2. 在SkillConfig和SkillOverrides中新增debuff相关配置项 3. 实现HeroAtkSystem中debuff的判定与施加逻辑 4. 完善后台配置、前端编辑器的debuff配置支持 5. 调整了buff目标判定逻辑，修复了原有默认目标的语义混淆问题 6. 优化了BuffSystem的调试日志，新增了debuff分类标识 7. 批量更新了现有英雄技能的debuff配置示例
This commit is contained in:
pan
@@ -11,6 +11,7 @@
|
||||
import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS";
|
||||
import { BuffCategory, BuffList } from "../common/config/BuffSet";
|
||||
import { BuffComp, ActiveBuff } from "./BuffComp";
|
||||
import { HeroAttrsComp } from "./HeroAttrsComp";
|
||||
import { mLogger } from "../common/Logger";
|
||||
|
||||
/** applyBuff 的覆盖参数（预留按需覆写持续时间 / 修饰数值） */
|
||||
@@ -46,10 +47,12 @@ class BuffManagerImpl {
|
||||
mLogger.warn(true, "BuffManager", `applyBuff: buffId=${buffId} 配置不存在，跳过`);
|
||||
return;
|
||||
}
|
||||
mLogger.log(this.debug, "BuffManager", `[挂buff] 「${cfg.name}」(buffId:${buffId}) -> target_eid:${target.eid} duration:${overrides?.duration ?? cfg.duration} value:${overrides?.value ?? "-"} source_ap:${sourceAp}`);
|
||||
|
||||
const buffComp = this.ensureBuffComp(target);
|
||||
const duration = overrides?.duration ?? cfg.duration;
|
||||
const targetName = target.get(HeroAttrsComp)?.hero_name ?? `eid:${target.eid}`;
|
||||
// buff/debuff 类别标签，便于日志区分挂载语义
|
||||
const categoryTag = cfg.category === BuffCategory.Debuff ? "debuff" : cfg.category === BuffCategory.Control ? "control" : "buff";
|
||||
|
||||
let layers = buffComp.buffs.get(buffId);
|
||||
if (!layers) {
|
||||
@@ -59,14 +62,18 @@ class BuffManagerImpl {
|
||||
|
||||
const newLayer = new ActiveBuff(buffId, duration, sourceUuid, sourceAp, overrides?.value, overrides?.source_attrs);
|
||||
|
||||
let refreshed = false;
|
||||
if (cfg.max_stack === 0 || layers.length < cfg.max_stack) {
|
||||
layers.push(newLayer);
|
||||
} else {
|
||||
// 满层 FIFO：移除最老层后追加新层
|
||||
layers.shift();
|
||||
layers.push(newLayer);
|
||||
refreshed = true;
|
||||
}
|
||||
|
||||
buffComp.dirty_buffs = true;
|
||||
mLogger.log(this.debug, "BuffManager", `[挂${categoryTag}] 「${cfg.name}」(buffId:${buffId}) -> ${targetName} 时长:${duration}s 数值:${overrides?.value ?? "-"} 来源ap:${sourceAp} 当前层数:${layers.length}${cfg.max_stack > 0 ? `/${cfg.max_stack}` : ""}${refreshed ? "（满层刷新）" : ""}`);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -19,7 +19,7 @@ import { DamageQueueHelper } from "./DamageQueueComp";
|
||||
import { mLogger } from "../common/Logger";
|
||||
|
||||
/** Buff 模块调试日志开关 */
|
||||
const DEBUG = false;
|
||||
const DEBUG = true;
|
||||
|
||||
/** 固定步长（秒） */
|
||||
const TICK_STEP = 0.1;
|
||||
@@ -106,10 +106,13 @@ export class BuffSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate
|
||||
const baseAmount = layer.value_override !== undefined ? layer.value_override : tick.damage_or_heal;
|
||||
const scale = 1 + layer.source_ap_snapshot * tick.scale_by_ap_pct / 10000;
|
||||
const amount = Math.floor(baseAmount * scale);
|
||||
const buffName = BuffList[buffId]?.name ?? String(buffId);
|
||||
if (amount < 0) {
|
||||
// DoT 走伤害队列：dot_dmg 传正值，doAttack 内识别并走固定伤害分支
|
||||
mLogger.log(DEBUG, "BuffSystem", `[debuff伤害] 「${buffName}」(buffId:${buffId}) tick 结算 -> ${attrs.hero_name}(eid:${target.eid}) 基础:${baseAmount} ap缩放:${scale.toFixed(3)} 入队伤害:${-amount} 剩余:${layer.remaining.toFixed(1)}s`);
|
||||
DamageQueueHelper.addDamageToEntity(target, layer.source_attrs_snapshot ?? null, layer.source_uuid, buffId, 0, 1, -amount);
|
||||
} else if (amount > 0) {
|
||||
mLogger.log(DEBUG, "BuffSystem", `[buff治疗] 「${buffName}」(buffId:${buffId}) tick 结算 -> ${attrs.hero_name}(eid:${target.eid}) 基础:${baseAmount} ap缩放:${scale.toFixed(3)} 回血:${amount}`);
|
||||
attrs.add_hp(amount);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,14 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec
|
||||
import { HeroViewComp } from "./HeroViewComp";
|
||||
import { SkillOverrides } from "../common/config/SkillSet";
|
||||
|
||||
/** 命中后对敌 debuff 快照（由施法技能实体自合并后配置提取并透传，HeroAtkSystem 据此结算） */
|
||||
export interface TimedDebuffSnapshot {
|
||||
id: number;
|
||||
value?: number;
|
||||
duration?: number;
|
||||
chance?: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* ==================== 伤害事件数据 ====================
|
||||
*
|
||||
@@ -10,29 +18,31 @@ import { SkillOverrides } from "../common/config/SkillSet";
|
||||
export interface DamageEvent {
|
||||
/** 伤害属性数据 */
|
||||
Attrs: any;
|
||||
|
||||
|
||||
/** 施法者ID */
|
||||
casterEid: number;
|
||||
|
||||
|
||||
/** 技能UUID */
|
||||
s_uuid: number;
|
||||
|
||||
|
||||
/** 伤害创建时间戳（用于排序和调试） */
|
||||
timestamp: number;
|
||||
|
||||
|
||||
/** 伤害事件ID（用于去重和调试） */
|
||||
eventId: string;
|
||||
|
||||
ext_dmg:number //额外伤害
|
||||
dmg_ratio:number//伤害比例
|
||||
|
||||
ext_dmg: number //额外伤害
|
||||
dmg_ratio: number//伤害比例
|
||||
/**
|
||||
* DoT 固定伤害值（>0 时本事件为 DoT tick 结算）：
|
||||
* 跳过 dmgCount 公式直接用该值，且不走击退/受击动画，其余（暴击/冰冻/击晕/护盾/死亡链）与普攻一致
|
||||
*/
|
||||
dot_dmg?:number
|
||||
dot_dmg?: number
|
||||
/** 命中后概率触发额外技能（由施法技能实体快照自合并后配置，HeroAtkSystem 据此判定；
|
||||
* overrides 字段透传给被触发技能，用于自定义伤害/数值） */
|
||||
proc_skill?: { s_uuid: number; chance?: number; overrides?: SkillOverrides }
|
||||
/** 命中后对敌 debuff（由施法技能实体自合并后配置快照透传；缺省时 HeroAtkSystem 回退读 SkillSet 底座） */
|
||||
timed_debuff?: TimedDebuffSnapshot
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -48,16 +58,16 @@ export class DamageQueueComp extends ecs.Comp {
|
||||
/** 伤害事件队列 */
|
||||
damageEvents: DamageEvent[] = [];
|
||||
private readIndex: number = 0;
|
||||
|
||||
|
||||
/** 队列创建时间 */
|
||||
createTime: number = 0;
|
||||
|
||||
|
||||
/** 是否正在处理中 */
|
||||
isProcessing: boolean = false;
|
||||
|
||||
|
||||
/** 已处理的伤害数量 */
|
||||
processedCount: number = 0;
|
||||
|
||||
|
||||
reset() {
|
||||
this.damageEvents.length = 0;
|
||||
this.readIndex = 0;
|
||||
@@ -65,33 +75,34 @@ export class DamageQueueComp extends ecs.Comp {
|
||||
this.isProcessing = false;
|
||||
this.processedCount = 0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 添加伤害事件到队列
|
||||
*/
|
||||
addDamageEvent(attrs: any, casterEid: number, s_uuid: number,ext_dmg:number=0,dmg_ratio:number=1,dot_dmg:number=0,proc_skill?: { s_uuid: number; chance?: number; overrides?: SkillOverrides }): void {
|
||||
addDamageEvent(attrs: any, casterEid: number, s_uuid: number, ext_dmg: number = 0, dmg_ratio: number = 1, dot_dmg: number = 0, proc_skill?: { s_uuid: number; chance?: number; overrides?: SkillOverrides }, timed_debuff?: TimedDebuffSnapshot): void {
|
||||
const timestamp = Date.now();
|
||||
|
||||
|
||||
const damageEvent: DamageEvent = {
|
||||
Attrs: attrs || null,
|
||||
casterEid: casterEid,
|
||||
s_uuid: s_uuid,
|
||||
timestamp: timestamp,
|
||||
eventId: "",
|
||||
ext_dmg:ext_dmg,
|
||||
dmg_ratio:dmg_ratio,
|
||||
dot_dmg:dot_dmg,
|
||||
proc_skill:proc_skill,
|
||||
ext_dmg: ext_dmg,
|
||||
dmg_ratio: dmg_ratio,
|
||||
dot_dmg: dot_dmg,
|
||||
proc_skill: proc_skill,
|
||||
timed_debuff: timed_debuff,
|
||||
};
|
||||
|
||||
|
||||
this.damageEvents.push(damageEvent);
|
||||
|
||||
|
||||
// 如果是第一个伤害事件，记录创建时间
|
||||
if (this.getRemainingCount() === 1) {
|
||||
this.createTime = timestamp;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取下一个待处理的伤害事件
|
||||
*/
|
||||
@@ -105,21 +116,21 @@ export class DamageQueueComp extends ecs.Comp {
|
||||
}
|
||||
return event || null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取队列中剩余的伤害事件数量
|
||||
*/
|
||||
getRemainingCount(): number {
|
||||
return this.damageEvents.length - this.readIndex;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 检查队列是否为空
|
||||
*/
|
||||
isEmpty(): boolean {
|
||||
return this.readIndex >= this.damageEvents.length;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 清空队列
|
||||
*/
|
||||
@@ -129,7 +140,7 @@ export class DamageQueueComp extends ecs.Comp {
|
||||
this.processedCount = 0;
|
||||
this.isProcessing = false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 按时间戳排序伤害事件（可选功能）
|
||||
*/
|
||||
@@ -140,7 +151,7 @@ export class DamageQueueComp extends ecs.Comp {
|
||||
}
|
||||
this.damageEvents.sort((a, b) => a.timestamp - b.timestamp);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 去除重复的伤害事件（基于eventId）
|
||||
*/
|
||||
@@ -158,7 +169,7 @@ export class DamageQueueComp extends ecs.Comp {
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取队列统计信息（用于调试）
|
||||
*/
|
||||
@@ -187,18 +198,18 @@ export class DamageQueueHelper {
|
||||
* 为实体添加伤害事件
|
||||
* 如果实体没有伤害队列组件，会自动创建
|
||||
*/
|
||||
static addDamageToEntity(entity: ecs.Entity, attrs: any, casterEid: number, s_uuid: number,ext_dmg:number=0,dmg_ratio:number=1,dot_dmg:number=0,proc_skill?: { s_uuid: number; chance?: number; overrides?: SkillOverrides }): void {
|
||||
static addDamageToEntity(entity: ecs.Entity, attrs: any, casterEid: number, s_uuid: number, ext_dmg: number = 0, dmg_ratio: number = 1, dot_dmg: number = 0, proc_skill?: { s_uuid: number; chance?: number; overrides?: SkillOverrides }, timed_debuff?: TimedDebuffSnapshot): void {
|
||||
let damageQueue = entity.get(DamageQueueComp);
|
||||
|
||||
|
||||
// 如果实体没有伤害队列组件，创建一个
|
||||
if (!damageQueue) {
|
||||
damageQueue = entity.add(DamageQueueComp);
|
||||
}
|
||||
|
||||
|
||||
// 添加伤害事件到队列
|
||||
damageQueue.addDamageEvent(attrs, casterEid, s_uuid,ext_dmg,dmg_ratio,dot_dmg,proc_skill);
|
||||
damageQueue.addDamageEvent(attrs, casterEid, s_uuid, ext_dmg, dmg_ratio, dot_dmg, proc_skill, timed_debuff);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 检查实体是否有待处理的伤害
|
||||
*/
|
||||
@@ -206,7 +217,7 @@ export class DamageQueueHelper {
|
||||
const damageQueue = entity.get(DamageQueueComp);
|
||||
return damageQueue ? !damageQueue.isEmpty() : false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取实体的伤害队列统计信息
|
||||
*/
|
||||
|
||||
@@ -279,7 +279,8 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpda
|
||||
}
|
||||
}
|
||||
|
||||
// 命中附带 buff：仅普攻路径；buff_target 缺省挂被命中者，显式配置可改为挂施法者/全体友方/全体敌方
|
||||
// 命中附带 buff：仅普攻路径；buff 语义为增益，缺省挂施法者自身（如吸血/攻击后强化），
|
||||
// 显式配置 buff_target 可改为全体友方等；buff 也可挂自身 debuff 类（如自残出血）
|
||||
// 施法者 ap/完整属性快照取自伤害事件，供 BuffSystem tick 缩放与暴击/冰冻/击晕判定
|
||||
if (!isDot && skillConf.timed_buff_id) {
|
||||
const buffChance = skillConf.buff_chance ?? 100;
|
||||
@@ -298,6 +299,30 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpda
|
||||
}
|
||||
}
|
||||
|
||||
// 命中附带 debuff：仅普攻路径；debuff 语义为对敌减益，目标固定为被命中者（不可覆写）
|
||||
// 优先取伤害事件透传的合并后快照（heroSet overrides/lv_entries 注入），缺省回退 SkillSet 底座配置
|
||||
// debuff_value/debuff_duration 覆写 BuffList 默认数值与持续时间
|
||||
// 注：DoT 事件无 SkillSet 配置（skillConf 可能为 undefined），必须在 !isDot 保护内读取
|
||||
if (!isDot && skillConf) {
|
||||
const snapDebuff = damageEvent.timed_debuff;
|
||||
const debuffId = snapDebuff?.id ?? skillConf.timed_debuff_id;
|
||||
if (debuffId) {
|
||||
const debuffChance = snapDebuff?.chance ?? skillConf.debuff_chance ?? 100;
|
||||
const debuffRand = debuffChance >= 100 ? 0 : Math.random() * 100;
|
||||
if (debuffChance >= 100 || debuffRand < debuffChance) {
|
||||
const debuffOverrides: BuffApplyOverrides = { source_attrs: damageEvent.Attrs };
|
||||
const debuffValue = snapDebuff?.value ?? skillConf.debuff_value;
|
||||
const debuffDuration = snapDebuff?.duration ?? skillConf.debuff_duration;
|
||||
if (debuffValue !== undefined) debuffOverrides.value = debuffValue;
|
||||
if (debuffDuration !== undefined) debuffOverrides.duration = debuffDuration;
|
||||
mLogger.log(this.debugMode, 'HeroAtkSystem', `[概率判定] 附带debuff「${BuffList[debuffId]?.name ?? "?"}」 概率:${debuffChance.toFixed(1)}% 随机:${debuffRand.toFixed(1)} -> ✔成功（技能「${skillConf.name}」命中 ${TAttrsComp.hero_name}）`);
|
||||
buffManager.applyBuff(target, debuffId, casterEid, damageEvent.Attrs[Attrs.ap] || 0, debuffOverrides);
|
||||
} else {
|
||||
mLogger.log(this.debugMode, 'HeroAtkSystem', `[概率判定] 附带debuff「${BuffList[debuffId]?.name ?? "?"}」 概率:${debuffChance.toFixed(1)}% 随机:${debuffRand.toFixed(1)} -> ✘失败（技能「${skillConf.name}」命中 ${TAttrsComp.hero_name}）`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 命中概率触发额外技能（proc_skill）：配置由施法技能实体快照自合并后配置（含 heroSet overrides/lv_entries），
|
||||
// 触发走 SkillTriggerHelper/forceCastTriggerSkill 通道（无视 CD、无施法前摇），与 atking 同一通道。
|
||||
// 防递归：被触发的技能经 forceCastTriggerSkill 不再产生 proc_skill 伤害事件之外的新事件，且不会累加 atk_count。
|
||||
@@ -636,20 +661,21 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpda
|
||||
|
||||
/**
|
||||
* 解析 timed_buff_id 的施加目标实体列表。
|
||||
* 缺省（undefined / BuffTarget.Hit）返回被命中者；显式配置可切换到施法者自身、全体友方或全体敌方。
|
||||
* 缺省（undefined / BuffTarget.Self）返回施法者自身（buff 为增益语义，如吸血/攻击后强化）；
|
||||
* 显式配置可切换到被命中者、全体友方或全体敌方。
|
||||
* @param hitTarget 被命中实体（伤害事件的 target）
|
||||
* @param casterEid 施法者 eid
|
||||
* @param targetFac 被命中者阵营（用于推导敌我网格）
|
||||
* @param buffTarget 技能配置上的目标覆写
|
||||
*/
|
||||
private resolveBuffTargets(hitTarget: ecs.Entity, casterEid: number, targetFac: number, buffTarget?: BuffTarget): ecs.Entity[] {
|
||||
if (buffTarget === undefined || buffTarget === BuffTarget.Hit) {
|
||||
return [hitTarget];
|
||||
}
|
||||
if (buffTarget === BuffTarget.Self) {
|
||||
if (buffTarget === undefined || buffTarget === BuffTarget.Self) {
|
||||
const caster = ecs.getEntityByEid(casterEid);
|
||||
return caster ? [caster] : [];
|
||||
}
|
||||
if (buffTarget === BuffTarget.Hit) {
|
||||
return [hitTarget];
|
||||
}
|
||||
// 全体友方/敌方：以施法者阵营为基准（命中者必为敌方，施法方网格即友方）
|
||||
const casterFac = targetFac === FacSet.HERO ? FacSet.MON : FacSet.HERO;
|
||||
const grid = buffTarget === BuffTarget.Ally
|
||||
|
||||
@@ -2,7 +2,7 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec
|
||||
import { Vec3, Prefab, instantiate, tween, Node } from "cc";
|
||||
import { HeroAttrsComp } from "./HeroAttrsComp";
|
||||
import { HeroViewComp } from "./HeroViewComp";
|
||||
import { DTType, RType, SkillConfig, SkillKind, SkillSet, TGroup, SkillOverrides, mergeSkillParams, BuffTarget } from "../common/config/SkillSet";
|
||||
import { DTType, RType, SkillConfig, SkillKind, SkillSet, TGroup, SkillOverrides, mergeSkillParams } from "../common/config/SkillSet";
|
||||
import { Skill } from "../skill/Skill";
|
||||
import { SkillView } from "../skill/SkillView";
|
||||
import { smc } from "../common/SingletonModuleComp";
|
||||
@@ -556,8 +556,7 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate
|
||||
if (config.buff_type !== undefined) {
|
||||
// 计时性 buff：配置了 timed_buff_id 时走 buffManager 限时路径，
|
||||
// 同一技能不应既永久加成又限时加成，故提前 return 跳过下方永久 add_* 逻辑
|
||||
// buff_target=Enemy 时 timed_buff_id 已在 applyFriendlySkillEffects 入口分流到敌方网格，此处跳过避免误挂友方
|
||||
if (config.timed_buff_id && config.buff_target !== BuffTarget.Enemy) {
|
||||
if (config.timed_buff_id) {
|
||||
// 汇总 buff 覆写参数：value 覆写修饰数值，duration 覆写持续时间
|
||||
const buffOverrides: { value?: number; duration?: number } = {};
|
||||
if (config.buff_value !== undefined) buffOverrides.value = config.buff_value;
|
||||
|
||||
Reference in New Issue
Block a user