From dc2ba181959a36a2c370c457bf62fd76773419c3 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 22 Jul 2022 21:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E8=A7=92=E8=8E=B7=E5=8F=96=E8=8B=B1?=
 =?UTF-8?q?=E9=9B=84=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/modulebase.go      | 7 ++++---
 modules/user/api_create.go | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/modulebase.go b/modules/modulebase.go
index 357de0361..a85f178b0 100644
--- a/modules/modulebase.go
+++ b/modules/modulebase.go
@@ -258,6 +258,7 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Game_at
 func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Game_atn, bPush bool) (code pb.ErrorCode) {
 	var (
 		resID int
+		hero  []*pb.DBHero
 	)
 	source := &comm.ModuleCallSource{
 		Module:   string(this.module.GetType()),
@@ -275,18 +276,18 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Game_a
 			code = this.ModuleItems.AddItem(source, session, int32(resID), v.N, bPush)
 		} else if v.A == comm.HeroType { //卡片资源
 			resID, _ = strconv.Atoi(v.T)
-			hero, err := this.ModuleHero.CreateRepeatHero(session.GetUserId(), int32(resID), v.N)
+			_hero, err := this.ModuleHero.CreateRepeatHero(session.GetUserId(), int32(resID), v.N)
 			if err != nil {
 				code = pb.ErrorCode_HeroMaxCount
 				return
 			}
-
-			session.SendMsg("hero", "change", &pb.HeroChangePush{List: []*pb.DBHero{hero}})
+			hero = append(hero, _hero)
 		} else if v.A == comm.EquipmentType {
 			resID, _ = strconv.Atoi(v.T)
 			code = this.ModuleEquipment.AddNewEquipments(source, session, map[int32]uint32{int32(resID): uint32(v.N)}, bPush)
 		}
 	}
+	session.SendMsg("hero", "change", &pb.HeroChangePush{List: hero})
 	return
 }
 
diff --git a/modules/user/api_create.go b/modules/user/api_create.go
index ce63016bf..4420c3b65 100644
--- a/modules/user/api_create.go
+++ b/modules/user/api_create.go
@@ -71,7 +71,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (c
 	if val, err := this.module.configure.GetGlobalInitConf(); err == nil {
 		for _, v := range val.GetDataList() {
 
-			code = this.module.DispenseRes(session, v.Var, false)
+			code = this.module.DispenseRes(session, v.Var, true)
 			if code != pb.ErrorCode_Success {
 				this.module.Errorf("资源发放失败,%v", code)
 			}