pan/heros
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(skill): 重构伤害计算逻辑

Browse Source 
- 删除SkillEnt.ts及其meta文件，简化技能实体管理
- 将SDataCom重命名为更清晰的DmgDataCom和SDataCom
- 重构伤害计算系统，增加命中检测和伤害类型处理
- 优化技能碰撞检测逻辑，支持范围伤害和数量限制
This commit is contained in:
walkpan
2025-10-31 13:38:32 +08:00
parent 8c597ae008
commit 65b1eebd84
12 changed files with 136 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
assets/script/game/hero/HeroAtk.ts
View File

@@ -3,6 +3,7 @@ import { FacSet } from "../common/config/BoxSet";
import { Attrs } from "../common/config/HeroAttrs";
import { FightSet } from "../common/config/Mission";
import { SkillSet } from "../common/config/SkillSet";
import { DmgDataCom } from "../skill/SDataCom";
import { HeroAttrsComp } from "./HeroAttrsComp";
import { HeroViewComp } from "./HeroViewComp";
@@ -14,8 +15,12 @@ export class HeroAtkComp extends ecs.Comp {
}
}
/** 业务层业务逻辑处理对象 */
interface FDData{
damage:number,
isCrit:boolean,
isDodge:boolean,
}
/** 业务层业务逻辑处理对象 伤害处理系统 */
@ecs.register('HeroAtkSystem')
export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate, ecs.IEntityEnterSystem {
@@ -25,7 +30,7 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd
* 过滤器：只处理拥有 HeroAttrsComp 的实体
*/
filter(): ecs.IMatcher {
return ecs.allOf(HeroAttrsComp);
return ecs.allOf(HeroAttrsComp,DmgDataCom);
}
/**
@@ -33,9 +38,11 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd
*/
entityEnter(e: ecs.Entity): void {
const model = e.get(HeroAttrsComp);
if (!model) return;
console.log(`[HeroBattleSystem] 英雄进入战斗系统: ${model.hero_name} (uuid: ${model.hero_uuid})`);
const dmgData=e.get(DmgDataCom)
if (!model || !dmgData) return;
let FDData = this.doAttack(e,dmgData)
e.remove(DmgDataCom)
console.log(`[HeroAtkSystem] 英雄${model.hero_name} (uuid: ${model.hero_uuid}) 受到伤害 ${FDData.damage}，技能ID ${dmgData.s_uuid}`);
}
/**
@@ -46,13 +53,19 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd
* @param skillId 技能ID
* @returns 实际造成的伤害
*/
public doAttack(target: ecs.Entity, remainingDamage: number, attackerAttrs: any, skillId: number): number {
public doAttack(target: ecs.Entity,dmgData:DmgDataCom): FDData {
const targetModel = target.get(HeroAttrsComp);
const targetView = target.get(HeroViewComp);
if (!targetModel || targetModel.is_dead) return 0;
let reDate:FDData={
damage:0,
isCrit:false,
isDodge:false,
}
if (!targetModel || targetModel.is_dead) return reDate;
// 获取技能配置
const skillConf = SkillSet[skillId];
const skillConf = SkillSet[dmgData.s_uuid];
if (!skillConf) return reDate;
// 触发被攻击事件
this.onAttacked(target);
@@ -60,15 +73,17 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd
// 闪避判定
if (this.checkDodge(targetModel)) {
// TODO: 触发闪避视图表现
return 0;
reDate.isDodge=true;
return reDate;
}
// 暴击判定
const isCrit = this.checkCrit(attackerAttrs[Attrs.CRITICAL]);
let damage = remainingDamage;
const isCrit = this.checkCrit(targetModel.Attrs[Attrs.CRITICAL]);
let damage = this.dmgCount(dmgData.Attrs,dmgData.s_uuid);
if (isCrit) {
damage = Math.floor(damage * (1 + (FightSet.CRIT_DAMAGE + attackerAttrs[Attrs.CRITICAL_DMG]) / 100));
damage = Math.floor(damage * (1 + (FightSet.CRIT_DAMAGE + targetModel.Attrs[Attrs.CRITICAL_DMG]) / 100));
reDate.isCrit=true;
}
// 伤害计算（考虑易伤等debuff）
@@ -77,7 +92,7 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd
// 护盾吸收
damage = this.absorbShield(targetModel, damage);
if (damage <= 0) return 0;
if (damage <= 0) return reDate;
// 应用伤害到数据层
targetModel.hp -= damage;
@@ -85,7 +100,7 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd
// ✅ 触发视图层表现（伤害数字、受击动画、后退）
if (targetView) {
targetView.do_atked(damage, isCrit, skillId);
targetView.do_atked(damage, isCrit, dmgData.s_uuid);
}
// 检查死亡
@@ -101,9 +116,16 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd
console.log(`[HeroAtkSystem] ${targetModel.hero_name} 受到 ${damage} 点伤害 (暴击: ${isCrit})`);
}
return damage;
reDate.damage=damage;
return reDate;
}
//伤害计算,暂时简单计算
private dmgCount(Attrs:any,s_uuid){
let sConf = SkillSet[s_uuid];
if (!sConf) return 0;
let AP = sConf.ap*Attrs[Attrs.AP];
return AP;
}
/**
* 处理角色死亡
*/

3
assets/script/game/hero/HeroAttrsComp.ts
View File

@@ -2,6 +2,7 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec
import { Attrs, AttrsType, BType, NeAttrs } from "../common/config/HeroAttrs";
import { BuffConf, SkillSet } from "../common/config/SkillSet";
import { HeroInfo, AttrSet, HeroUpSet } from "../common/config/heroSet";
import { DmgDataCom } from "../skill/SDataCom";
import { EBusComp } from "./EBusComp";
@@ -345,6 +346,8 @@ export class HeroAttrsComp extends ecs.Comp {
return this.NeAttrs[NeAttrs.IN_FROST]?.time > 0;
}
reset() {
// 重置为初始状态
this.hero_uuid = 1001;

9
assets/script/game/hero/SAutocastSystem.ts.meta
View File

@@ -1,9 +0,0 @@
{
"ver": "4.0.24",
"importer": "typescript",
"imported": true,
"uuid": "a38a89b8-24eb-429f-92d4-7d3f4d87ba88",
"files": [],
"subMetas": {},
"userData": {}
}

1
assets/script/game/hero/SCastSystem.ts
View File

@@ -3,7 +3,6 @@ import { Vec3, v3 } from "cc";
import { HeroAttrsComp } from "./HeroAttrsComp";
import { HeroViewComp } from "./HeroViewComp";
import { SkillSet, SType } from "../common/config/SkillSet";
import { SkillEnt } from "../skill/SkillEnt";
import { HeroSkillsComp } from "./HeroSkills";
import { Skill } from "../skill/Skill";
import { CSRequestComp } from "../skill/STagComps";

9
assets/script/game/hero/SDataComp.ts.meta
View File

@@ -1,9 +0,0 @@
{
"ver": "4.0.24",
"importer": "typescript",
"imported": true,
"uuid": "5ef9c9a8-c661-44fd-93f4-fc133f734867",
"files": [],
"subMetas": {},
"userData": {}
}