From 3caf880fdf5efc8d98fd762838bd669b29caa345 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 19 Jan 2024 11:13:21 +0800
Subject: [PATCH] =?UTF-8?q?GM=20=E6=BB=A1=E8=8B=B1=E9=9B=84,=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A7=E8=8B=B1=E9=9B=84=20=E5=B9=B6=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E8=A7=89=E9=86=92=E6=8A=80=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/module.go | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/hero/module.go b/modules/hero/module.go
index 25ccfe8b0..3c37c52fe 100644
--- a/modules/hero/module.go
+++ b/modules/hero/module.go
@@ -419,6 +419,8 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession, bTalent bool) (errdat
 	if bTalent {
 		this.modelTalent.CleanAllHeroTalent(session.GetUserId())
 	}
+	// 清除所有英雄
+	this.modelHero.RemoveUserHeroInfo(session.GetUserId())
 	data := this.modelHero.module.configure.GetHeroConfigData()
 	var (
 		changeHero []*pb.DBHero
@@ -461,6 +463,22 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession, bTalent bool) (errdat
 					Message: err.Error(),
 				}
 			}
+			// 觉醒技能带入
+			for i := 1; i <= maxJux; i++ {
+				if awakenData, err := this.configure.GetHeroAwakenConfig(cid, int32(i)); err == nil {
+					if awakenData.Skill != 0 {
+						skillMaxLv := this.configure.GetHeroSkillMaxLvConfig(uint32(awakenData.Skill))
+						hero.Awakenskill = append(hero.Awakenskill, &pb.SkillData{
+							SkillID: awakenData.Skill,
+							SkillLv: skillMaxLv,
+						})
+
+					}
+				} else {
+					break
+				}
+			}
+			//this.modelHero.resetJuexingProperty(hero)
 			// 获取满级技能
 			for _, skill := range hero.NormalSkill {
 				skillMaxLv := this.configure.GetHeroSkillMaxLvConfig(uint32(skill.SkillID))
@@ -482,6 +500,7 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession, bTalent bool) (errdat
 				"property":          hero.Property,
 				"horoscopeProperty": hero.HoroscopeProperty,
 				"juexProperty":      hero.JuexProperty,
+				"awakenskill":       hero.Awakenskill,
 			}
 
 			if bTalent { // 满天赋