diff --git a/assets/script/game/common/config/GameSet.ts b/assets/script/game/common/config/GameSet.ts index d6d6b40d..6e076716 100644 --- a/assets/script/game/common/config/GameSet.ts +++ b/assets/script/game/common/config/GameSet.ts @@ -104,6 +104,7 @@ export enum FightSet { CHOU_GOLD=100,//抽卡需要的金币 BACK_RANG=30,//后退范围 FiIGHT_TIME=60*10,//战斗时间 + BACK_CHANCE=40,//击退概率 } export enum IndexSet { diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index a68508fd..1a46f4d5 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -119,7 +119,8 @@ export interface heroInfo { path: string; // 资源路径（对应美术资源名） fac: FacSet; // 阵营（FacSet.HERO 或 FacSet.MON） kind: number; // 未使用 - as: number; // 攻击速度系数（越小越快） + as: number; // 攻击间隔（越小越快） + ss:number; // 技能间隔 type: HType; // 职业定位（战士/远程/法师/辅助/刺客） lv: number; // 初始等级 hp: number; // 生命值上限 @@ -148,37 +149,37 @@ export const CanSelectHeros: Record = { export const HeroInfo: Record = { // ========== 英雄角色 ========== - 5001:{uuid:5001,name:"盾战士",icon:"1001",path:"hk1", fac:FacSet.HERO, kind:1,as:1, + 5001:{uuid:5001,name:"盾战士",icon:"1001",path:"hk1", fac:FacSet.HERO, kind:1,as:1,ss:5, type:HType.warrior,lv:1,hp:300,mp:200,def:5,ap:25,speed:120,skills:[6001,6004], rangeType: SkillRange.Melee, buff:[],info:"盾战士"}, - 5002:{uuid:5002,name:"奥术法师",icon:"1001",path:"hm2", fac:FacSet.HERO, kind:2,as:1, + 5002:{uuid:5002,name:"奥术法师",icon:"1001",path:"hm2", fac:FacSet.HERO, kind:2,as:1,ss:5, type:HType.mage,lv:1,hp:150,mp:135,def:0,ap:40,speed:95,skills:[6003,6101], rangeType: SkillRange.Long, buff:[],info:"奥术法师"}, - 5003:{uuid:5003,name:"射手",icon:"1001",path:"ha1", fac:FacSet.HERO, kind:2,as:1, + 5003:{uuid:5003,name:"射手",icon:"1001",path:"ha1", fac:FacSet.HERO, kind:2,as:1,ss:5, type:HType.remote,lv:1,hp:180,mp:80,def:0,ap:30,speed:140,skills:[6002,6100], rangeType: SkillRange.Long, buff:[],info:"射手"}, - 5005:{uuid:5005,name:"牧师",icon:"1001",path:"hh1", fac:FacSet.HERO, kind:2,as:1, + 5005:{uuid:5005,name:"牧师",icon:"1001",path:"hh1", fac:FacSet.HERO, kind:2,as:1,ss:5, type:HType.mage,lv:1,hp:160,mp:135,def:0,ap:25,speed:100,skills:[6003,6100], rangeType: SkillRange.Mid, buff:[],info:"牧师"}, - 5004:{uuid:5004,name:"火焰法师",icon:"1001",path:"hm1", fac:FacSet.HERO, kind:2,as:1, + 5004:{uuid:5004,name:"火焰法师",icon:"1001",path:"hm1", fac:FacSet.HERO, kind:2,as:1,ss:5, type:HType.mage,lv:1,hp:150,mp:140,def:0,ap:45,speed:90,skills:[6003,6101], rangeType: SkillRange.Mid, buff:[],info:"火焰法师"}, - 5006:{uuid:5006,name:"召唤法师",icon:"1001",path:"hz1", fac:FacSet.HERO, kind:2,as:1, + 5006:{uuid:5006,name:"召唤法师",icon:"1001",path:"hz1", fac:FacSet.HERO, kind:2,as:1,ss:5, type:HType.support,lv:1,hp:200,mp:145,def:0,ap:20,speed:105,skills:[6003,6101], rangeType: SkillRange.Mid, buff:[],info:"召唤法师"}, - 5007:{uuid:5007,name:"刺客",icon:"1001",path:"hc1", fac:FacSet.HERO, kind:1,as:1, + 5007:{uuid:5007,name:"刺客",icon:"1001",path:"hc1", fac:FacSet.HERO, kind:1,as:1,ss:5, type:HType.assassin,lv:1,hp:140,mp:60,def:0,ap:50,speed:180,skills:[6001,6004], rangeType: SkillRange.Melee, buff:[],info:"刺客"}, @@ -187,50 +188,50 @@ export const HeroInfo: Record = { // 1. 基础近战型 - 5201:{uuid:5201,name:"兽人战士",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + 5201:{uuid:5201,name:"兽人战士",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0,ss:10, type:HType.warrior,lv:1,hp:60,mp:100,def:0,ap:8,speed:180,skills:[6003], rangeType: SkillRange.Long, buff:[],info:"标准炮灰：确保英雄能完成3次普攻积累天赋计数"}, // 2. 快速突击型 - 5301:{uuid:5301,name:"兽人斥候",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:1.2, + 5301:{uuid:5301,name:"兽人斥候",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:1.2,ss:10, type:HType.assassin,lv:1,hp:40,mp:100,def:0,ap:12,speed:400,skills:[6003], rangeType: SkillRange.Long, buff:[],info:"快速突击：极高移速贴脸，检测护盾(7102)刷新率"}, // 3. 重型坦克型 - 5401:{uuid:5401,name:"兽人卫士",icon:"1001",path:"mo3", fac:FacSet.MON, kind:1,as:5.0, + 5401:{uuid:5401,name:"兽人卫士",icon:"1001",path:"mo3", fac:FacSet.MON, kind:1,as:5.0,ss:10, type:HType.warrior,lv:1,hp:200,mp:100,def:5,ap:15,speed:60,skills:[6003], rangeType: SkillRange.Long, buff:[],info:"重型坦克：数值墙，检测玩家破甲(7008)与持续输出"}, // 4. 远程骚扰型 - 5501:{uuid:5501,name:"兽人射手",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + 5501:{uuid:5501,name:"兽人射手",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0,ss:10, type:HType.remote,lv:1,hp:50,mp:100,def:0,ap:10,speed:90,skills:[6203], rangeType: SkillRange.Long, buff:[],info:"远程骚扰：跨屏打击，迫使阵地分散或移动英雄"}, // 5. 特殊机制型 - 5601:{uuid:5601,name:"兽人自爆兵",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + 5601:{uuid:5601,name:"兽人自爆兵",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0,ss:10, type:HType.assassin,lv:1,hp:80,mp:100,def:0,ap:200,speed:220,skills:[6003], rangeType: SkillRange.Long, buff:[],info:"特殊机制：极端伤害，漏怪即秒杀，检测减伤(7103)"}, // 召唤师：持续召唤小怪（后续可在技能系统中实现 SType.zhaohuan） - 5602:{uuid:5602,name:"兽人召唤师",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + 5602:{uuid:5602,name:"兽人召唤师",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0,ss:10, type:HType.mage,lv:1,hp:150,mp:300,def:5,ap:10,speed:100,skills:[6003], rangeType: SkillRange.Long, buff:[],info:"战术目标：持续召唤小怪，检测英雄大招清场频率"}, // 治疗者：为周围怪物回血（此处以提升治疗效果和生命回复为基础被动） - 5603:{uuid:5603,name:"兽人祭司",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + 5603:{uuid:5603,name:"兽人祭司",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0,ss:10, type:HType.support,lv:1,hp:150,mp:300,def:5,ap:10,speed:105,skills:[6003], rangeType: SkillRange.Long, buff:[],info:"战术目标：为怪群回血，检测玩家沉默(7006)覆盖率"}, // 光环怪：为周围怪物提供增益（此处以Buff效果提升与移动速度提升为基础被动） // Attrs.BUFF_UP=60 (RATIO=1)，Attrs.SPEED=63 (RATIO=1) - 5604:{uuid:5604,name:"兽人图腾师",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + 5604:{uuid:5604,name:"兽人图腾师",icon:"1001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0,ss:10, type:HType.support,lv:1,hp:150,mp:250,def:5,ap:10,speed:110,skills:[6003], rangeType: SkillRange.Long, buff:[],info:"战术目标：提供加速光环，改变怪群推进节奏"}, // 6. 精英/BOSS型 - 5701:{uuid:5701,name:"兽人首领(BOSS)",icon:"1001",path:"mo4", fac:FacSet.MON, kind:1,as:2.5, + 5701:{uuid:5701,name:"兽人首领(BOSS)",icon:"1001",path:"mo4", fac:FacSet.MON, kind:1,as:2.5,ss:10, type:HType.warrior,lv:3,hp:2000,mp:500,def:10,ap:60,speed:120,skills:[6003], rangeType: SkillRange.Long, buff:[],info:"终极考验：极高HP，检测大招重置与辐射协同输出"}, diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index 8af7113e..629b0a74 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -4,11 +4,10 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec import { smc } from "../common/SingletonModuleComp"; import { HeroAttrsComp } from "./HeroAttrsComp"; import { HeroViewComp } from "./HeroViewComp"; -import { BoxSet, FacSet, IndexSet } from "../common/config/GameSet"; +import { BoxSet, FacSet, FightSet, IndexSet } from "../common/config/GameSet"; import { HeroInfo, HeroPos, HType } from "../common/config/heroSet"; import { GameEvent } from "../common/config/GameEvent"; -import { getNeAttrs, getAttrs ,Attrs, defaultAttrs} from "../common/config/HeroAttrs"; -import { HeroSkillsComp } from "./HeroSkills"; +import { Attrs} from "../common/config/HeroAttrs"; import { HeroMoveComp } from "./HeroMove"; import { mLogger } from "../common/Logger"; import { HeroMasterComp } from "./HeroMasterComp"; @@ -17,7 +16,6 @@ import { HeroMasterComp } from "./HeroMasterComp"; export class Hero extends ecs.Entity { HeroModel!: HeroAttrsComp; - HeroSkills!: HeroSkillsComp; View!: HeroViewComp; HeroMove!: HeroMoveComp; debugMode: boolean = false; // 是否启用调试模式 @@ -25,7 +23,6 @@ export class Hero extends ecs.Entity { this.addComponents( HeroMoveComp, HeroAttrsComp, - HeroSkillsComp, ); } @@ -38,7 +35,6 @@ export class Hero extends ecs.Entity { this.remove(HeroViewComp); this.remove(HeroAttrsComp); - this.remove(HeroSkillsComp); this.remove(HeroMasterComp) super.destroy(); } @@ -65,7 +61,6 @@ export class Hero extends ecs.Entity { var hv = node.getComponent(HeroViewComp)!; const model = this.get(HeroAttrsComp); - const skillsComp = this.get(HeroSkillsComp); let hero = HeroInfo[uuid]; // 共用英雄数据 // 设置 View 层属性（表现相关） @@ -84,29 +79,22 @@ export class Hero extends ecs.Entity { // 只有主角才挂载天赋组件 // ✅ 初始化技能数据（迁移到 HeroSkillsComp） - skillsComp.initSkills(hero.skills, uuid); // 设置基础属性 - model.base_ap = hero.ap; - model.base_def = hero.def; - model.base_hp = hero.hp; - model.base_mp = hero.mp; - model.base_speed = hero.speed; - - // 初始化属性数组 - model.Attrs = getAttrs(); // 属性 - model.NeAttrs = getNeAttrs(); //负面属性 - model.hp = model.Attrs[Attrs.HP_MAX] = model.base_hp; - model.mp = model.Attrs[Attrs.MP_MAX] = model.base_mp; - model.Attrs[Attrs.DEF] = model.base_def; - model.Attrs[Attrs.AP] = model.base_ap; - model.Attrs[Attrs.SPEED] = hero.speed; - + model.ap = hero.ap; + model.hp= model.hp_max = hero.hp; + model.speed = hero.speed; + model.a_cd_max=hero.as + model.s_cd_max=hero.ss + // 初始化技能信息数组 + if(hero.skills[0]) model.atk_id=hero.skills[0] + if(hero.skills[1]) { + model.skill_id=hero.skills[1] + } + // 初始化 buff/debuff 系统 model.initAttrs(); - model.Attrs[Attrs.REVIVE_COUNT]=1 // 复活次数 - model.Attrs[Attrs.BACK_CHANCE]=defaultAttrs[Attrs.BACK_CHANCE] - model.Attrs[Attrs.CON_RES]=defaultAttrs[Attrs.CON_RES] // 控制抗性 + model.back_chance=FightSet.BACK_CHANCE this.add(hv); oops.message.dispatchEvent(GameEvent.MasterCalled,{uuid:uuid}) const move = this.get(HeroMoveComp); diff --git a/assets/script/game/hero/HeroAtkSystem.ts b/assets/script/game/hero/HeroAtkSystem.ts index 9a9207e0..cef08822 100644 --- a/assets/script/game/hero/HeroAtkSystem.ts +++ b/assets/script/game/hero/HeroAtkSystem.ts @@ -96,25 +96,6 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd /** * 执行攻击计算 - 核心伤害计算逻辑 * - * 属性使用规范（重要！）： - * - * ✅ 正确使用施法者属性（damageEvent.Attrs - 快照）： - * - CRITICAL: 暴击率判定 - * - CRITICAL_DMG: 暴击伤害加成 - * - BACK_CHANCE: 击退概率 - * - HIT: 命中率（用于闪避计算） - * - AP 攻击力（基础伤害计算） - * - * ✅ 正确使用被攻击者属性（TAttrsComp - 实时）： - * - DODGE: 闪避率（用于闪避计算） - * - SHIELD_MAX: 护盾最大值（护盾吸收） - * - hp: 当前生命值（伤害应用） - * - 各种抗性属性（预留扩展） - * - * ❌ 错误使用案例（已修复）： - * - 不要混用施法者和被攻击者的属性进行同一计算 - * - 暴击伤害应该基于施法者的暴击伤害属性 - * * @param target 目标实体（被攻击者） * @param damageEvent 伤害事件数据（包含施法者信息和属性快照） * @returns 最终伤害数据（包含伤害值、暴击标记、闪避标记） @@ -142,7 +123,7 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd // 暴击判定 // 使用施法者的暴击率属性（damageEvent.Attrs 快照），- 被攻击者的暴击抗性属 - const isCrit = this.checkChance(damageEvent.Attrs[Attrs.CRITICAL]); + const isCrit = this.checkChance(damageEvent.Attrs[Attrs.critical]); // 计算基础伤害 let damage = this.dmgCount(damageEvent,TAttrsComp); @@ -151,7 +132,7 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd // 暴击伤害计算 // 使用施法者的暴击伤害加成属性（damageEvent.Attrs 快照） // 公式：最终伤害 = 基础伤害 * (1 + 系统暴击倍率 + 施法者暴击伤害加成) - const casterCritDmg = damageEvent.Attrs[Attrs.CRITICAL_DMG] || 0; + const casterCritDmg = damageEvent.Attrs[Attrs.critical_dmg] || 0; damage = Math.floor(damage * (1 + (FightSet.CRIT_DAMAGE + casterCritDmg) / 100)); reDate.isCrit=true; @@ -178,12 +159,10 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd const casterName = CAttrsComp?.hero_name || "未知"; mLogger.log(this.debugMode, 'HeroAtkSystem', ` 英雄${TAttrsComp.hero_name} (uuid: ${TAttrsComp.hero_uuid}) 受到 ${casterName}(eid: ${casterEid}）的 伤害 ${damage},${isCrit?"暴击":"普通"}攻击,技能ID ${damageEvent.s_uuid}`); - //反伤判定 并应用到施法者 - this.check_thorns(TAttrsComp, caster, damage); // 击退判定 // 使用施法者的击退概率属性（damageEvent.Attrs 快照） - 被攻击者的控制抗性 // 击退成功后需要清理施法者的相关天赋buff - const isBack = this.checkChance((damageEvent.Attrs[Attrs.BACK_CHANCE] || 0)); + const isBack = this.checkChance((damageEvent.Attrs[Attrs.back_chance] || 0)); // ✅ 触发视图层表现（伤害数字、受击动画、后退） @@ -234,56 +213,7 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd reDate.damage=damage; return reDate; } - check_thorns(TAttrsComp:HeroAttrsComp, caster: ecs.Entity, damage:number) { - // 检查目标是否有反伤属性,这里受伤的时时施法者 - // 修复：如果施法者已销毁(caster为空)，则不执行反伤逻辑 - if (!caster || damage<=0) return; - let thornsDamage=0; - thornsDamage=TAttrsComp.Attrs[Attrs.THORNS]||0+TAttrsComp.useCountValTal(Attrs.THORNS); - let CAttrs=caster.get(HeroAttrsComp); - // 计算反伤伤害 - let thornsDmg=Math.floor(thornsDamage*damage/100); - // 应用反伤伤害到数据层 - // CAttrs.hp -= thornsDmg; - CAttrs.add_hp(-thornsDmg, true); - CAttrs.atked_count++; - let CView=caster.get(HeroViewComp); - // ✅ 触发视图层表现（伤害数字、受击动画、后退） - if (CView) CView.do_atked(thornsDmg, false, SkillSet[5000].uuid, false); - // 检查死亡 - if (CAttrs.hp <= 0) { - // 复活机制 - if (CAttrs.is_master && CAttrs.revive_count >= 1) { - CAttrs.revive_count--; - CAttrs.is_reviving = true; - - smc.mission.stop_mon_action = true; - - if (CView) { - CView.do_dead(); - CView.scheduleRevive(1.0); - } - - mLogger.log(this.debugMode, 'HeroAtkSystem', ` Hero waiting to revive from Thorns! Lives left: ${CAttrs.revive_count}`); - return; - } - - // 玩家英雄死亡后,怪物停止刷新和移动 - if (CAttrs.is_master&&CAttrs.revive_count <= 0) { - smc.mission.stop_mon_action = true; - oops.message.dispatchEvent(GameEvent.HeroDead, { hero_uuid: CAttrs.hero_uuid}); - mLogger.log(this.debugMode, 'HeroAtkSystem', " Hero died from thorns, stopping monster action (spawn/move)"); - } - - this.doDead(caster); - // 增加击杀计数 - if (caster) TAttrsComp.killed_count++; - // ✅ 触发死亡视图表现 - if (CView) { - CView.do_dead(); - } - } - } + /** * 详细伤害计算核心方法 * @@ -311,67 +241,18 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd mLogger.log(this.debugMode, 'HeroAtkSystem', ` 伤害处理对象`,CAttrs,TAttrs); // 2. 计算原始物理伤害和魔法伤害 // 物理伤害基础值 = 技能物理倍率 * (施法者物理攻击力 + 额外伤害) / 100 * 额外伤害比例 - let apBase = (sConf.ap||0)*(CAttrs[Attrs.AP]+damageEvent.ext_dmg)/100*damageEvent.dmg_ratio; - mLogger.log(this.debugMode, 'HeroAtkSystem', ` 物理伤害基础值: ${apBase}, 技能ap=${sConf.ap},施法者物理攻击力: ${CAttrs[Attrs.AP]},} + let apBase = (sConf.ap||0)*(CAttrs[Attrs.ap]+damageEvent.ext_dmg)/100*damageEvent.dmg_ratio; + mLogger.log(this.debugMode, 'HeroAtkSystem', ` 物理伤害基础值: ${apBase}, 技能ap=${sConf.ap},施法者物理攻击力: ${CAttrs[Attrs.ap]},} 额外伤害:${damageEvent.ext_dmg}, 额外伤害比例:${damageEvent.dmg_ratio}`); - // 易伤 - let DMG_INVUL = TAttrs[Attrs.DMG_INVUL]||0 - // 免伤 属性免伤+天赋免伤 - let DMG_RED = TAttrsComp.useCountValTal(Attrs.DEF); + // 4. 确保伤害值非负 let total = Math.max(0, apBase); - // 5. 应用防御减免 (百分比型) - // 计算公式：基础伤害 * (1 + (易伤% - 免伤%) / 100) - // 易伤增加伤害，免伤减少伤害 - let damageRatio = 1 + (DMG_INVUL - DMG_RED) / 100; - damageRatio = Math.max(0, damageRatio); // 确保伤害系数不为负（即最多减免至0伤害） - - total = Math.max(1,Math.floor(total * damageRatio-TAttrs[Attrs.DEF])); - - if (this.debugMode) mLogger.log(this.debugMode, 'HeroAtkSystem', ` 最终伤害: ${total} (Base: ${apBase}, Def: ${DMG_RED}%, Invul: ${DMG_INVUL}%, Ratio: ${damageRatio})`); + if (this.debugMode) mLogger.log(this.debugMode, 'HeroAtkSystem', ` 最终伤害: ${total} (Base: ${apBase}`); return total; } -/** - * 应用攻击力加成和抗性减免的通用计算方法 - * - * 这是一个核心的伤害修正计算方法，用于处理各种类型的攻击力加成和抗性减免。 - * 该方法采用乘法叠加的方式，分别应用攻击者的加成属性和目标的抗性属性。 - * - * 计算公式： - * 最终值 = 基础值 × (1 + 攻击力加成% / 100) × (1 - 抗性% / 100) - * - * 适用场景： - * - 物理攻击力加成和物理抗性减免 - * - 魔法攻击力加成和魔法抗性减免 - * - 元素攻击力加成和元素抗性减免 - * - 其他需要同时考虑加成和减免的属性修正 - * - * 计算逻辑说明： - * 1. 首先将百分比转换为小数形式（除以100） - * 2. 应用攻击者的加成：基础值 × (1 + 加成系数) - * 3. 应用目标的抗性：上一步结果 × (1 - 抗性系数) - * 4. 向下取整，确保结果为整数 - * - * @param base 基础值（通常是经过防御减免后的伤害值） - * @param power 攻击者的攻击力加成值（百分比形式，如50表示50%） - * @param res 目标的抗性值（百分比形式，如30表示30%） - * @returns 经过攻击力加成和抗性减免后的最终值（向下取整） - * - * @important 注意事项： - * - 当抗性值大于100时，可能导致最终值为负数或零 - * - 所有计算结果会向下取整，确保游戏中的数值为整数 - * - 此方法可以被多次调用，以叠加不同类型的加成和减免 - */ - private applyPR(base: number, power: number, res: number): number { - // 计算公式：基础值 × (1 + 攻击力加成%) × (1 - 抗性%) - // 1. 将百分比转换为小数：power/100 和 res/100 - // 2. 应用攻击力加成：1 + (power/100) - // 3. 应用抗性减免：1 - (res/100) - // 4. 最终计算并向下取整 - return Math.floor(base * (1 + (power/100)) * (1 - (res/100))); - } + /** * 处理角色死亡 * @@ -425,6 +306,7 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd */ private checkChance(rate: number): boolean { if (rate <= 0) return false; + if (rate >= 70) rate = 70 const r = Math.random() * 100; return r < rate; } @@ -453,7 +335,7 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd TAttrsComp.shield -= damage; if (TAttrsComp.shield <= 0) { TAttrsComp.shield = 0; - TAttrsComp.Attrs[Attrs.SHIELD_MAX] = 0; + TAttrsComp.shield_max = 0; } TAttrsComp.dirty_shield = true; mLogger.log(this.debugMode, 'HeroAtkSystem', ` 护盾值完全吸收伤害 ${damage}`); @@ -462,7 +344,7 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd const absorbedDamage = TAttrsComp.shield; const remainingDamage = damage - TAttrsComp.shield; TAttrsComp.shield = 0; - TAttrsComp.Attrs[Attrs.SHIELD_MAX] = 0; + TAttrsComp.shield_max = 0; TAttrsComp.dirty_shield = true; mLogger.log(this.debugMode, 'HeroAtkSystem', ` 护盾值部分吸收伤害 ${absorbedDamage}`); return {remainingDamage, absorbedDamage}; diff --git a/assets/script/game/hero/HeroAttrsComp.ts b/assets/script/game/hero/HeroAttrsComp.ts index 15c73a33..874a4fe2 100644 --- a/assets/script/game/hero/HeroAttrsComp.ts +++ b/assets/script/game/hero/HeroAttrsComp.ts @@ -96,7 +96,8 @@ export class HeroAttrsComp extends ecs.Comp { killed_count:number=0; atk_id:number=0; //普通攻击技能id skill_id:number=0; //技能攻击技能id - + can_atk=false + can_skill=false start(){ } // ==================== BUFF 系统初始化 ==================== @@ -260,7 +261,17 @@ export class HeroAttrsComp extends ecs.Comp { if (attr === Attrs.hp) this.dirty_hp = true; if (attr === Attrs.shield) this.dirty_shield = true; } - + //======更新cd========// + updateCD(dt: number){ + if(this.atk_id !=0&&!this.can_atk){ + this.a_cd+=dt + if(this.a_cd >= this.a_cd_max) this.can_atk = true + } + if(this.skill_id !=0&&this.can_skill){ + this.s_cd+=dt + if(this.s_cd >= this.s_cd_max) this.can_skill = true + } + } // ==================== 临时 BUFF/DEBUFF 更新 ==================== /** * 更新临时 buff/debuff 的剩余时间 @@ -419,7 +430,8 @@ export class HeroAttrsComp extends ecs.Comp { this.killed_count =0; this.atk_id = 0; this.skill_id = 0; - + this.can_atk=false + this.can_skill=false // 重置脏标签 this.dirty_hp = false; this.dirty_shield = false; diff --git a/assets/script/game/hero/HeroMasterComp.ts b/assets/script/game/hero/HeroMasterComp.ts index 6cffec7a..3bc2964c 100644 --- a/assets/script/game/hero/HeroMasterComp.ts +++ b/assets/script/game/hero/HeroMasterComp.ts @@ -1,12 +1,5 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; -import { GameEvent } from "../common/config/GameEvent"; -import { Attrs, AttrsType, BType, NeAttrs } from "../common/config/HeroAttrs"; -import { BuffConf, SkillRange } from "../common/config/SkillSet"; -import { HeroInfo, AttrSet } from "../common/config/heroSet"; -import { HeroSkillsComp } from "./HeroSkills"; -import { smc } from "../common/SingletonModuleComp"; -import { AttrCards, PotionCards } from "../common/config/AttrSet"; import { mLogger } from "../common/Logger"; import { _decorator } from "cc"; diff --git a/assets/script/game/hero/Mon.ts b/assets/script/game/hero/Mon.ts index 1181de76..9997547f 100644 --- a/assets/script/game/hero/Mon.ts +++ b/assets/script/game/hero/Mon.ts @@ -2,21 +2,18 @@ import { instantiate, Node, Prefab, Vec3 ,v3,resources,SpriteFrame,Sprite,Sprite import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { smc } from "../common/SingletonModuleComp"; -import { BoxSet, FacSet, IndexSet } from "../common/config/GameSet"; +import { BoxSet, FacSet, FightSet, IndexSet } from "../common/config/GameSet"; import { HeroInfo } from "../common/config/heroSet"; import { HeroAttrsComp } from "./HeroAttrsComp"; import { BuffConf, SkillSet } from "../common/config/SkillSet"; -import { getNeAttrs, getAttrs ,Attrs, defaultAttrs} from "../common/config/HeroAttrs"; import { getMonAttr, MonType } from "../map/RogueConfig"; import { HeroViewComp } from "./HeroViewComp"; -import { HeroSkillsComp } from "./HeroSkills"; import { MonMoveComp } from "./MonMove"; import { mLogger } from "../common/Logger"; /** 角色实体 */ @ecs.register(`Monster`) export class Monster extends ecs.Entity { HeroModel!: HeroAttrsComp; - HeroSkills!: HeroSkillsComp; HeroView!: HeroViewComp; MonMove!: MonMoveComp; private debugMode: boolean = false; // 是否启用调试模式 @@ -45,7 +42,6 @@ export class Monster extends ecs.Entity { this.addComponents( MonMoveComp, HeroAttrsComp, - HeroSkillsComp, ); } @@ -60,7 +56,6 @@ export class Monster extends ecs.Entity { this.remove(HeroViewComp); this.remove(HeroAttrsComp); - this.remove(HeroSkillsComp); super.destroy(); } @@ -102,7 +97,6 @@ export class Monster extends ecs.Entity { node.setScale(size*node.scale.x,size*node.scale.y); node.setPosition(pos) const model = this.get(HeroAttrsComp); - const skillsComp = this.get(HeroSkillsComp); let hero = HeroInfo[uuid]; // 共用英雄数据 // 设置 View 层属性（表现相关） view.scale = scale; @@ -120,18 +114,18 @@ export class Monster extends ecs.Entity { model.is_kalami = true; } // 根据等级和类型获取怪物属性（使用新的动态成长系统） - const {hp, mp, ap, def, speed} = getMonAttr(lv, uuid, monType, gameTime); + const {hp,ap, speed} = getMonAttr(lv, uuid, monType, gameTime); // 初始化属性数组 - model.Attrs = getAttrs(); - model.hp = model.Attrs[Attrs.HP_MAX] = hp; - model.mp = model.Attrs[Attrs.MP_MAX] = mp; - model.Attrs[Attrs.DEF] = def; - model.Attrs[Attrs.AP] = ap; - model.Attrs[Attrs.SPEED] = speed; // 使用成长后的速度 - model.Attrs[Attrs.BACK_CHANCE]=defaultAttrs[Attrs.BACK_CHANCE] - model.Attrs[Attrs.CON_RES]=defaultAttrs[Attrs.CON_RES] + model.hp = model.hp_max = hp; + model.ap = ap; + model.speed = speed; // 使用成长后的速度 + model.a_cd_max=hero.as + model.s_cd_max=hero.ss + model.back_chance=FightSet.BACK_CHANCE // ✅ 初始化技能数据（迁移到 HeroSkillsComp） - skillsComp.initSkills(hero.skills, uuid); + if(hero.skills[0]) model.atk_id=hero.skills[0] + if(hero.skills[1]) model.skill_id=hero.skills[1] + this.add(view); // 重置视图状态（对象池复用时必须） diff --git a/assets/script/game/skill/Skill.ts b/assets/script/game/skill/Skill.ts index f713e884..f037d0c4 100644 --- a/assets/script/game/skill/Skill.ts +++ b/assets/script/game/skill/Skill.ts @@ -3,6 +3,7 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec import { EType, SkillSet } from "../common/config/SkillSet"; import { oops } from "db://oops-framework/core/Oops"; import { HeroAttrsComp } from "../hero/HeroAttrsComp"; +import { Attrs } from "../common/config/HeroAttrs"; import { SkillView } from "./SkillView"; import { SDataCom } from "./SDataCom"; @@ -122,7 +123,18 @@ export class Skill extends ecs.Entity { sDataCom.group=caster.box_group sDataCom.caster=caster sDataCom.casterEid=caster.ent.eid - sDataCom.Attrs={...cAttrsComp.Attrs} + sDataCom.Attrs = {}; + sDataCom.Attrs[Attrs.ap] = cAttrsComp.ap; + sDataCom.Attrs[Attrs.critical] = cAttrsComp.critical; + sDataCom.Attrs[Attrs.critical_dmg] = cAttrsComp.critical_dmg; + sDataCom.Attrs[Attrs.freeze_chance] = cAttrsComp.freeze_chance; + sDataCom.Attrs[Attrs.stun_chance] = cAttrsComp.stun_chance; + sDataCom.Attrs[Attrs.back_chance] = cAttrsComp.back_chance; + sDataCom.Attrs[Attrs.slow_chance] = cAttrsComp.slow_chance; + sDataCom.Attrs[Attrs.puncture] = cAttrsComp.puncture; + sDataCom.Attrs[Attrs.puncture_dmg] = cAttrsComp.puncture_dmg; + sDataCom.Attrs[Attrs.wfuny] = cAttrsComp.wfuny; + sDataCom.s_uuid=s_uuid sDataCom.fac=cAttrsComp.fac sDataCom.ext_dmg=ext_dmg diff --git a/assets/script/game/skill/SkillView.ts b/assets/script/game/skill/SkillView.ts index c580a769..8a3482b9 100644 --- a/assets/script/game/skill/SkillView.ts +++ b/assets/script/game/skill/SkillView.ts @@ -183,7 +183,7 @@ export class SkillView extends CCComp { this.sData.hit_count++ // 检查技能是否应该销毁 if ( - this.sData.hit_count >= (this.SConf.hit + this.sData.Attrs[Attrs.PUNCTURE]) && + this.sData.hit_count >= (this.SConf.hit + this.sData.Attrs[Attrs.puncture]) && (this.SConf.DTType != DTType.range) && (this.SConf.EType != EType.animationEnd) && (this.SConf.EType != EType.timeEnd)