From a1ceea9b91ed172205fd57185ccd0cac1077d887 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 8 Sep 2023 17:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BD=91=E5=85=B3=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/gateway/agent.go           |  4 ++--
 modules/robot/modulerobot_arena.go |  4 ++++
 modules/robot/modulerobot_wtask.go | 17 +++++++++--------
 modules/robot/robot.go             |  3 +++
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/modules/gateway/agent.go b/modules/gateway/agent.go
index b8a902c03..19cb5b2b2 100644
--- a/modules/gateway/agent.go
+++ b/modules/gateway/agent.go
@@ -140,7 +140,7 @@ locp:
 						ReqSubType:  msg.SubType,
 						Arg:         msg.Data,
 						Code:        pb.ErrorCode_GatewayException,
-						Err:         &pb.ErrorData{Title: "用户消息处理失败!", Datastring: err.Error()},
+						Err:         &pb.ErrorData{Code: pb.ErrorCode_GatewayException, Title: pb.ErrorCode_GatewayException.String(), Message: err.Error()},
 					})
 					err = this.WriteMsg(&pb.UserMessage{
 						MsgId:    msg.MsgId,
@@ -368,7 +368,7 @@ func (this *Agent) HandleMessage(msg *pb.UserMessage) (err error) {
 			ReqSubType:  msg.SubType,
 			Arg:         msg.Data,
 			Code:        pb.ErrorCode_GatewayException,
-			Err:         &pb.ErrorData{Title: "用户消息处理失败!", Datastring: err.Error()},
+			Err:         &pb.ErrorData{Code: pb.ErrorCode_GatewayException, Title: pb.ErrorCode_GatewayException.String(), Message: err.Error()},
 		})
 		err = this.WriteMsg(&pb.UserMessage{
 			MsgId:    msg.MsgId,
diff --git a/modules/robot/modulerobot_arena.go b/modules/robot/modulerobot_arena.go
index d19fa4fb4..9dd6f8c9a 100644
--- a/modules/robot/modulerobot_arena.go
+++ b/modules/robot/modulerobot_arena.go
@@ -63,10 +63,14 @@ func (this *ModuleRobot_Arena) DoPipeline(robot IRobot) (err error) {
 	}
 	heromodule = robot.GetModule(comm.ModuleHero).(*ModuleRobot_Hero)
 	heros = heromodule.getbattlehero()
+
 	for _, v := range this.players {
 		player = v
 		break
 	}
+	if player == nil {
+		return
+	}
 	if resp, errdata = robot.SendMessage("arena", "challenge", &pb.ArenaChallengeReq{
 		Playerid:  player.Uid,
 		Isai:      player.Isai,
diff --git a/modules/robot/modulerobot_wtask.go b/modules/robot/modulerobot_wtask.go
index 1b60fa681..eefa7d1b2 100644
--- a/modules/robot/modulerobot_wtask.go
+++ b/modules/robot/modulerobot_wtask.go
@@ -85,11 +85,6 @@ func (this *ModuleRobot_WTask) Receive(robot IRobot, stype string, message proto
 	return
 }
 func (this *ModuleRobot_WTask) OncePipeline(robot IRobot) (err error) {
-	return
-}
-
-//机器人执行流
-func (this *ModuleRobot_WTask) DoPipeline(robot IRobot) (err error) {
 	var (
 		errdata *pb.ErrorData
 	)
@@ -98,10 +93,16 @@ func (this *ModuleRobot_WTask) DoPipeline(robot IRobot) (err error) {
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 		return
 	}
+	return
+}
+
+//机器人执行流
+func (this *ModuleRobot_WTask) DoPipeline(robot IRobot) (err error) {
 	var (
-		tconf  *cfg.GameWorldTaskData
-		cconf  *cfg.GameBuriedCondiData
-		module core.M_Modules
+		errdata *pb.ErrorData
+		tconf   *cfg.GameWorldTaskData
+		cconf   *cfg.GameBuriedCondiData
+		module  core.M_Modules
 	)
 locp:
 	for {
diff --git a/modules/robot/robot.go b/modules/robot/robot.go
index 2f4682db9..b849169c6 100644
--- a/modules/robot/robot.go
+++ b/modules/robot/robot.go
@@ -8,6 +8,7 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
+	"math/rand"
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
@@ -254,6 +255,7 @@ func (this *Robot) run() {
 			log.Error("[机器人 初始执行错误]", log.Field{Key: "Account", Value: this.account}, log.Field{Key: "module", Value: v}, log.Field{Key: "err", Value: err.Error()})
 			break
 		}
+		time.Sleep(time.Millisecond * time.Duration(2000+rand.Int31n(3000)))
 	}
 
 	for this.cycle {
@@ -275,6 +277,7 @@ func (this *Robot) run() {
 					this.cycle = true
 				}
 			}
+			time.Sleep(time.Millisecond * time.Duration(2000+rand.Int31n(3000)))
 		}
 	}
 	this.Close()