From 97ba3aafa268fd73277e03b3679c40027359d52c Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Mon, 11 Sep 2023 18:32:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=A5=E5=BF=97=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_drawCard.go    |  9 +++------
 modules/robot/modulerobot_gm.go | 12 ++++++------
 modules/robot/robot.go          |  4 ++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go
index 9ec8d8048..05c9f85bc 100644
--- a/modules/hero/api_drawCard.go
+++ b/modules/hero/api_drawCard.go
@@ -46,8 +46,9 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 	szCards = make([]string, 0)
 	if heroRecord, err = this.module.modelRecord.GetHeroRecord(session.GetUserId()); err != nil {
 		errdata = &pb.ErrorData{
-			Code:  pb.ErrorCode_DBError,
-			Title: pb.ErrorCode_DBError.ToString(),
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
 		}
 		return
 	}
@@ -117,10 +118,6 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 
 			rsp.Data = append(rsp.Data, &pb.AtnoData{Atno: atno})
 		} else {
-			errdata = &pb.ErrorData{
-				Code:  pb.ErrorCode_ReqParameterError,
-				Title: pb.ErrorCode_ReqParameterError.ToString(),
-			}
 			return
 		}
 
diff --git a/modules/robot/modulerobot_gm.go b/modules/robot/modulerobot_gm.go
index 066d78a29..5c8329ced 100644
--- a/modules/robot/modulerobot_gm.go
+++ b/modules/robot/modulerobot_gm.go
@@ -62,27 +62,27 @@ func (this *ModuleRobot_GM) OncePipeline(robot IRobot) (err error) {
 	}
 
 	//装备
-	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10115,10"}); errdata != nil {
+	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10115,1"}); errdata != nil {
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 		return
 	}
-	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10114,10"}); errdata != nil {
+	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10114,1"}); errdata != nil {
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 		return
 	}
-	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10113,10"}); errdata != nil {
+	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10113,1"}); errdata != nil {
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 		return
 	}
-	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10112,10"}); errdata != nil {
+	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10112,1"}); errdata != nil {
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 		return
 	}
-	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10111,10"}); errdata != nil {
+	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10111,1"}); errdata != nil {
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 		return
 	}
-	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10110,10"}); errdata != nil {
+	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:equi,10110,1"}); errdata != nil {
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 		return
 	}
diff --git a/modules/robot/robot.go b/modules/robot/robot.go
index f24f49c02..2c577bba1 100644
--- a/modules/robot/robot.go
+++ b/modules/robot/robot.go
@@ -75,7 +75,7 @@ func (this *Robot) Init(addr string, client IClient) (err error) {
 	this.modules[comm.ModuleViking] = new(ModuleRobot_Viking)
 	this.modules[comm.ModuleChat] = new(ModuleRobot_Chat)
 	this.modules[comm.ModuleShop] = new(ModuleRobot_Shop)
-	this.modules[comm.ModuleShop] = new(ModuleRobot_Caravan)
+	this.modules[comm.ModuleCaravan] = new(ModuleRobot_Caravan)
 	this.modules[comm.ModuleHoroscope] = new(ModuleRobot_Horoscope)
 	for _, v := range this.modules {
 		v.Init()
@@ -97,7 +97,7 @@ func (this *Robot) Receive(msg *pb.UserMessage) (err error) {
 	if msgpath == "gateway.heartbeat" { //心跳 屏蔽掉
 		return
 	}
-	// log.Debug("[机器人 Resp]", log.Field{Key: "Account", Value: this.account}, log.Field{Key: "message", Value: msgpath})
+	log.Debug("[机器人 Resp]", log.Field{Key: "Account", Value: this.account}, log.Field{Key: "message", Value: msgpath})
 	//序列化用户消息对象
 	if message, err = msg.Data.UnmarshalNew(); err != nil {
 		log.Errorf("[Robot Receive] UserMessage:%s Unmarshal err:%v", msgpath, err)