From c04264a88f8590533963403096bcf7596c25aebc Mon Sep 17 00:00:00 2001
From: ciniao <4041990@qq.com>
Date: Wed, 10 Jan 2024 11:33:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E9=A5=B0=E7=89=A9=E5=92=8C?=
 =?UTF-8?q?=E5=A4=A9=E8=B5=8B=E6=8A=80=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shared/fightControl/fightCntrol.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

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);