From dfd123190c5c51c358957a3263377e9982796ac9 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Tue, 5 Sep 2023 18:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/robot/modulerobot_sys.go | 1 +
 modules/robot/options.go         | 1 +
 modules/robot/robotmgrcomp.go    | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/robot/modulerobot_sys.go b/modules/robot/modulerobot_sys.go
index 903136061..7e452694f 100644
--- a/modules/robot/modulerobot_sys.go
+++ b/modules/robot/modulerobot_sys.go
@@ -74,6 +74,7 @@ func (this *ModuleRobot_Sys) funcactivate(tid, sid int32, robot IRobot, cid stri
 
 	if _, errdata = robot.SendTaskMessage(tid, sid, "sys", "funcactivate", &pb.SysFuncActivateReq{Cid: cid}); errdata != nil {
 		if errdata.Code == pb.ErrorCode_OpenCondActivate {
+			this.cmd[cid] = 2
 			return
 		}
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
diff --git a/modules/robot/options.go b/modules/robot/options.go
index 3845d8517..7206bc190 100644
--- a/modules/robot/options.go
+++ b/modules/robot/options.go
@@ -13,6 +13,7 @@ type (
 		RobotTotalNum  int32    //机器人总数
 		RobotSingleNum int32    //单词机器人进入数量
 		Intervals      int32    //间隔时间 单位秒
+		RobotName      string   //机器人名称
 		Pipeline       []string //执行流水线
 	}
 )
diff --git a/modules/robot/robotmgrcomp.go b/modules/robot/robotmgrcomp.go
index 1cb5e26e9..f62d1dbed 100644
--- a/modules/robot/robotmgrcomp.go
+++ b/modules/robot/robotmgrcomp.go
@@ -43,7 +43,7 @@ locp:
 	for {
 		select {
 		case <-timer.C:
-			if this.currRobotNum < this.module.options.RobotSingleNum {
+			if this.currRobotNum < this.module.options.RobotTotalNum {
 				for i := 0; i < int(this.module.options.RobotSingleNum); i++ {
 					this.createRobot(this.currRobotNum)
 					this.currRobotNum++
@@ -63,7 +63,7 @@ func (this *robotmgrComp) createRobot(index int32) {
 	robot = &Robot{
 		robotmgrComp: this,
 		index:        index,
-		account:      fmt.Sprintf("it_%d", index),
+		account:      fmt.Sprintf("%s_%d", this.module.options.RobotName, index),
 		serverId:     this.module.options.ServerID,
 		pipeline:     this.module.options.Pipeline,
 	}