From a1d04d68d6e0e9e5dcfd4f88b5688b91c7441483 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 4 Jul 2022 10:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=98=E5=8C=96=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_awaken.go         | 24 ++++++++++++++++++++++++
 modules/hero/api_resonanceReset.go | 12 +++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index cfada16cd..c4d5af127 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -103,6 +103,30 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 			}
 		}
 	}
+	if len(awakenData.Phasebonus) < 2 {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+	// 加属性 awakenData
+	_value, ok := strconv.Atoi(awakenData.Phasebonus[0])
+	if ok == nil { // 升级技能
+		for pos, v := range _hero.NormalSkill {
+			value, err := strconv.Atoi(awakenData.Phasebonus[1])
+			if err == nil {
+				if pos == value {
+					v.SkillID = int32(_value)
+				}
+			}
+
+		}
+	} else { // 加属性
+		property := make(map[string]int32, 0)
+		value, err := strconv.Atoi(awakenData.Phasebonus[1])
+		if err == nil {
+			property[awakenData.Phasebonus[0]] += int32(value)
+		}
+		this.module.modelHero.mergeMainProperty(session.GetUserId(), _hero.Id, property)
+	}
 
 	err1 = this.module.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
 	if err1 != nil {
diff --git a/modules/hero/api_resonanceReset.go b/modules/hero/api_resonanceReset.go
index 75d9f60ab..3ab7f82fe 100644
--- a/modules/hero/api_resonanceReset.go
+++ b/modules/hero/api_resonanceReset.go
@@ -66,7 +66,11 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson
 			code = this.module.ModuleUser.AddAttributeValue(session.GetUserId(), v.T, -v.N) // 扣资源
 		}
 	}
-
+	property := make(map[string]int32, 0)
+	property[comm.HpPro] -= _hero.AddProperty[comm.HpPro]
+	property[comm.AtkPro] -= _hero.AddProperty[comm.AtkPro]
+	property[comm.DefPro] -= _hero.AddProperty[comm.DefPro]
+	this.module.modelHero.mergeMainProperty(session.GetUserId(), _hero.Id, property)
 	for k := range _hero.Energy { // 清除玩家选择的共鸣属性
 		delete(_hero.Energy, k)
 	}
@@ -84,11 +88,5 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson
 		log.Errorf("PushHeroProperty err!")
 	}
 
-	property := make(map[string]int32, 0)
-	property[comm.HpPro] -= _hero.AddProperty[comm.HpPro]
-	property[comm.AtkPro] -= _hero.AddProperty[comm.AtkPro]
-	property[comm.DefPro] -= _hero.AddProperty[comm.DefPro]
-	this.module.modelHero.mergeMainProperty(session.GetUserId(), _hero.Id, property)
-
 	return
 }