diff --git a/src/shared/fightControl/fightCntrol.ts b/src/shared/fightControl/fightCntrol.ts index 4db74c9..94d5b22 100644 --- a/src/shared/fightControl/fightCntrol.ts +++ b/src/shared/fightControl/fightCntrol.ts @@ -151,25 +151,25 @@ export class FightControl { beforeSkill() { this.eachLiveRoles((role) => { let heroId = role.roleData.heroId; - // let shiwu = role.roleData?.shiwu || {}; - // let talent = role.roleData?.talent || {}; + let shiwu = role.roleData?.shiwu || {}; + let talent = role.roleData?.talent || {}; let skills = G.gc.heroskill[heroId][role.roleData.jieji || 0].bdskill || []; skills = skills.concat(role.roleData.attr.skillArr); - // for (let key in shiwu) { - // let zhushuan = shiwu[key]?.zhuanshu; - // if (!zhushuan) continue; - // if (zhushuan.skill) skills.push(zhushuan.skill); - // }; - // const hero_tf = G.gc.hero_tf; - // for (let key in talent) { - // let cdata = hero_tf[key][talent[key]]; - // if (cdata && cdata.skill_effect) skills.push(cdata.skill_effect); - // } + for (let key in shiwu) { + let zhushuan = shiwu[key]?.zhuanshu; + if (!zhushuan) continue; + if (zhushuan.skill) skills.push(zhushuan.skill); + }; + const hero_tf = G.gc.hero_tf; + for (let key in talent) { + let cdata = hero_tf[key][talent[key]]; + if (cdata && cdata.skill_effect) skills.push(cdata.skill_effect); + } // skills.push('tx06309'); - // if (!skills) return; + if (!skills) return; skills.forEach(_skill => { let askillconf = getSkillConf(_skill); if (!askillconf) return console.log('没有技能配置-->', _skill);