From d7bfd492670577039c75c7e045fcfb96d3b96d81 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 7 Dec 2022 10:29:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=87=8D=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A8=E9=80=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/gm/module.go   |  2 +-
 modules/hero/module.go | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/gm/module.go b/modules/gm/module.go
index df5e3c05c..d57a15b8d 100644
--- a/modules/gm/module.go
+++ b/modules/gm/module.go
@@ -146,7 +146,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (code pb.ErrorC
 						this.Error("bingo 世界任务", log.Fields{"params": datas, "err": err.Error()})
 					}
 				}
-			} else if len(datas) == 2 && (datas[0] == "manhero") { // 获取满星、等级、觉醒、共鸣技能
+			} else if len(datas) == 1 && (datas[0] == "manhero") { // 获取满星、等级、觉醒、共鸣技能
 				module1, err := this.service.GetModule(comm.ModuleHero)
 				if err != nil {
 					return
diff --git a/modules/hero/module.go b/modules/hero/module.go
index e3f2a6272..15ffed1cf 100644
--- a/modules/hero/module.go
+++ b/modules/hero/module.go
@@ -607,6 +607,9 @@ func (this *Hero) CheckResonaceHeroNum(uid string, resonaceLv int32) int32 {
 // 获取所有满星满级满觉醒的英雄
 func (this *Hero) GetAllMaxHero(session comm.IUserSession) (code pb.ErrorCode) {
 	data := this.modelHero.moduleHero.configure.GetHeroConfigData()
+	var (
+		changeHero []*pb.DBHero
+	)
 	for _, v := range data {
 		if v.Handbook != -1 {
 			cid := v.Hid
@@ -669,17 +672,20 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (code pb.ErrorCode) {
 				"sameCount":   1,
 				"normalSkill": hero.NormalSkill,
 			}
+			this.modelHero.PropertyCompute(hero) // 重新计算属性
 			// 保存数据
 			err = this.modelHero.ChangeList(session.GetUserId(), hero.Id, _heroMap)
 			if err != nil {
 				log.Errorf("GetSpecified failed:%v", err)
-				return
+				continue
 			}
-			this.modelHero.PropertyCompute(hero) // 重新计算属性
-			//推送
-			session.SendMsg("hero", "change", &pb.HeroChangePush{List: []*pb.DBHero{hero}})
+			changeHero = append(changeHero, hero)
 		}
 	}
+	//推送
+	if len(changeHero) > 0 {
+		session.SendMsg("hero", "change", &pb.HeroChangePush{List: changeHero})
+	}
 
 	return