From e2ed9ec84c4194a946754ff6f80fd5e57d4c6034 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 25 Aug 2023 16:43:04 +0800
Subject: [PATCH] =?UTF-8?q?#32000=20=E4=BB=BB=E5=8A=A1=20=E3=80=90?=
 =?UTF-8?q?=E6=A2=A6=E5=B7=A5=E5=9C=BA=E7=B3=BB=E7=BB=9F=E3=80=91=20=20?=
 =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E8=A7=89=E9=86=92=E3=80=81?=
 =?UTF-8?q?=E5=9B=9E=E5=93=8D=E6=8A=80=E8=83=BD=E6=8F=92=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/battle/modelBattle.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go
index 4aef8b5bd..c400d4bad 100644
--- a/modules/battle/modelBattle.go
+++ b/modules/battle/modelBattle.go
@@ -803,6 +803,13 @@ func (this *modelBattleComp) createBattleRole(hero *pb.DBHero, vlv int32, tid, p
 
 	}
 
+	// 新需求 觉醒回响技能 统一放装备技能中
+	if len(hero.Talentskill) > 0 {
+		role.EquipSkill = append(role.EquipSkill, hero.Talentskill...)
+	}
+	if len(hero.Awakenskill) > 0 {
+		role.EquipSkill = append(role.EquipSkill, hero.Awakenskill...)
+	}
 	return
 }