From 447af63a0a2ea921fe59e01bb887f689d9260d89 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 19 Dec 2023 11:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=8A=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_drawCard.go   | 2 +-
 modules/hero/api_selectcard.go | 2 +-
 modules/hero/model_hero.go     | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go
index c6e6dc700..4ecd669a3 100644
--- a/modules/hero/api_drawCard.go
+++ b/modules/hero/api_drawCard.go
@@ -281,7 +281,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 		add    []*pb.DBHero
 		allres []*cfg.Gameatn
 	)
-	if res, add, err = this.module.modelHero.ImitateHeros(session, szCards); err == nil {
+	if res, add, err = this.module.modelHero.ImitateHeros(session, szCards, req.DrawType); err == nil {
 		for _, v := range res {
 			var atno []*pb.UserAtno
 			for _, v1 := range v {
diff --git a/modules/hero/api_selectcard.go b/modules/hero/api_selectcard.go
index a09fc5f1f..2fc1a1239 100644
--- a/modules/hero/api_selectcard.go
+++ b/modules/hero/api_selectcard.go
@@ -60,7 +60,7 @@ func (this *apiComp) SelectCard(session comm.IUserSession, req *pb.HeroSelectCar
 		add    []*pb.DBHero
 		allres []*cfg.Gameatn
 	)
-	if res, add, err = this.module.modelHero.ImitateHeros(session, curSzCard); err == nil {
+	if res, add, err = this.module.modelHero.ImitateHeros(session, curSzCard, 2); err == nil {
 		for _, v := range res {
 			var atno []*pb.UserAtno
 			for _, v1 := range v {
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 842d7f5a0..e7c253765 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -1117,7 +1117,7 @@ func (this *ModelHero) drawcardcreateHero(session comm.IUserSession, ids []strin
 }
 
 // 模拟获得英雄
-func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string) (addres [][]*cfg.Gameatn, add []*pb.DBHero, err error) {
+func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, itype int32) (addres [][]*cfg.Gameatn, add []*pb.DBHero, err error) {
 
 	heros := make([]*pb.DBHero, 0)
 	uid := session.GetUserId()
@@ -1165,7 +1165,12 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string) (a
 		}
 
 		if bFirst { // 没有当前英雄
-			hero, err = this.initHeroOverlying(uid, heroCfgId, 1)
+			if itype == 1 {
+				hero = this.InitHero(uid, heroCfgId)
+			} else {
+				hero, err = this.initHeroOverlying(uid, heroCfgId, 1)
+			}
+
 			if err != nil {
 				return
 			}