From eb7c3b7c60ec00889b41607a2f17a641c3964df6 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 2 Feb 2023 09:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=89=B9=E6=AE=8A=E8=8B=B1?=
 =?UTF-8?q?=E9=9B=84=E6=97=B6=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E6=9C=89?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=8B=B1=E9=9B=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_specified.go |  2 +-
 modules/hero/model_hero.go    |  9 ++++++++-
 modules/hero/module.go        |  4 ++--
 modules/user/api_gettujian.go | 18 ++++--------------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/modules/hero/api_specified.go b/modules/hero/api_specified.go
index 6680dc7a0..301ef9462 100644
--- a/modules/hero/api_specified.go
+++ b/modules/hero/api_specified.go
@@ -25,7 +25,7 @@ func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpec
 	if code != pb.ErrorCode_Success {
 		return
 	}
-	hero, err := this.module.modelHero.createOneHero(session.GetUserId(), req.HeroCoinfigID)
+	hero, err := this.module.modelHero.createSpecialHero(session.GetUserId(), req.HeroCoinfigID)
 	if err == nil {
 		code = pb.ErrorCode_HeroNoExist
 	}
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index f7b999c1c..3038e9822 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -96,7 +96,14 @@ func (this *ModelHero) initHeroSkill(hero *pb.DBHero) []*pb.SkillData {
 }
 
 //创建一个指定的英雄
-func (this *ModelHero) createOneHero(uid string, heroCfgId string) (hero *pb.DBHero, err error) {
+func (this *ModelHero) createSpecialHero(uid string, heroCfgId string) (hero *pb.DBHero, err error) {
+	list := this.getHeroList(uid)
+	for _, v := range list {
+		if v.HeroID == heroCfgId {
+			hero = v
+			return
+		}
+	}
 	hero = this.InitHero(uid, heroCfgId)
 	if hero != nil {
 		if err = this.AddList(uid, hero.Id, hero); err != nil {
diff --git a/modules/hero/module.go b/modules/hero/module.go
index 3c3d5826b..ba455018b 100644
--- a/modules/hero/module.go
+++ b/modules/hero/module.go
@@ -234,7 +234,7 @@ func (this *Hero) GetSpecifiedHero(session comm.IUserSession, heroConfId string,
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
-	hero, err := this.modelHero.createOneHero(session.GetUserId(), heroConfId)
+	hero, err := this.modelHero.createSpecialHero(session.GetUserId(), heroConfId)
 	if err != nil {
 		return pb.ErrorCode_HeroCreate
 	}
@@ -683,7 +683,7 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (code pb.ErrorCode) {
 			}
 
 			// 开始创建英雄
-			hero, err := this.modelHero.createOneHero(session.GetUserId(), v.Hid)
+			hero, err := this.modelHero.createSpecialHero(session.GetUserId(), v.Hid)
 			if err != nil {
 				return pb.ErrorCode_HeroCreate
 			}
diff --git a/modules/user/api_gettujian.go b/modules/user/api_gettujian.go
index 7a75b1a1a..81b3b193b 100644
--- a/modules/user/api_gettujian.go
+++ b/modules/user/api_gettujian.go
@@ -2,7 +2,6 @@ package user
 
 import (
 	"go_dreamfactory/comm"
-	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 
 	"google.golang.org/protobuf/proto"
@@ -17,21 +16,12 @@ func (this *apiComp) GetTujian(session comm.IUserSession, req *pb.UserGetTujianR
 		return
 	}
 
-	uid := session.GetUserId()
 	rsp := &pb.UserGetTujianResp{}
-	if result, err := this.module.modelExpand.GetUserExpand(uid); err != nil {
-		this.module.Error("玩家扩展数据",
-			log.Field{Key: "uid", Value: uid},
-			log.Field{Key: "err", Value: err.Error()},
-		)
-		return
-	} else {
-		for k, v := range result.Tujian {
-			if v == 0 {
-				rsp.Heroids = append(rsp.Heroids, k)
-			}
-		}
+	list := this.module.ModuleHero.GetHeroList(session.GetUserId())
+	for _, v := range list {
+		rsp.Heroids = append(rsp.Heroids, v.HeroID)
 	}
+
 	err := session.SendMsg(string(this.module.GetType()), UserGetTujianResp, rsp)
 	if err != nil {
 		code = pb.ErrorCode_SystemError