From ad3b7b61a29c43dfb4e9ff503cd0e864590afeb5 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Mon, 28 Aug 2023 15:08:02 +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_equipment.go | 15 +++++++++++----
 modules/robot/modulerobot_sys.go       |  4 ++++
 modules/robot/robotmgrcomp.go          |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/robot/modulerobot_equipment.go b/modules/robot/modulerobot_equipment.go
index cd522e481..41ee69588 100644
--- a/modules/robot/modulerobot_equipment.go
+++ b/modules/robot/modulerobot_equipment.go
@@ -144,11 +144,16 @@ func (this *ModuleRobot_Equipment) DoTask(robot IRobot, taskconf *cfg.GameWorldT
 			return
 		}
 		break
+
 	case comm.Rtype43, comm.Rtype92, comm.Rtype96: //强化
 		var (
 			equipment *pb.DB_Equipment
+			lv        int32 = 15
 		)
-		if equipment, err = this.findcanupgrade(); err != nil {
+		if comm.TaskType(condconf.Type) == comm.Rtype43 {
+			lv = condconf.Filter[0]
+		}
+		if equipment, err = this.findcanupgrade(lv); err != nil {
 			return
 		}
 		if _, errdata = robot.SendTaskMessage(taskconf.Key, condconf.Id, "equipment", "upgrade", &pb.EquipmentUpgradeReq{
@@ -276,7 +281,7 @@ func (this *ModuleRobot_Equipment) findcanEquipEquipment(hero *pb.DBHero, minsta
 }
 
 //查询能强化的装备
-func (this *ModuleRobot_Equipment) findcanupgrade() (equipment *pb.DB_Equipment, err error) {
+func (this *ModuleRobot_Equipment) findcanupgrade(lv int32) (equipment *pb.DB_Equipment, err error) {
 	var (
 		equipments []*pb.DB_Equipment = make([]*pb.DB_Equipment, 0, len(this.equipments))
 		conf       *cfg.GameEquipData
@@ -284,7 +289,9 @@ func (this *ModuleRobot_Equipment) findcanupgrade() (equipment *pb.DB_Equipment,
 	)
 	var ()
 	for _, v := range this.equipments {
-		equipments = append(equipments, v)
+		if v.Lv < lv {
+			equipments = append(equipments, v)
+		}
 	}
 	sort.Slice(equipments, func(i, j int) bool {
 		return equipments[i].Lv > equipments[j].Lv
@@ -293,7 +300,7 @@ func (this *ModuleRobot_Equipment) findcanupgrade() (equipment *pb.DB_Equipment,
 		if conf, err = this.getGameEquipData(equipment.CId); err != nil {
 			return
 		}
-		if upconf, err = this.getEquipmentMaxIntensifyConfigure(conf.EquipId, conf.Color); err == nil && upconf.Level > equipment.Lv {
+		if upconf, err = this.getEquipmentMaxIntensifyConfigure(conf.EquipId, conf.Color); err == nil && upconf.Level >= equipment.Lv {
 			return
 		}
 	}
diff --git a/modules/robot/modulerobot_sys.go b/modules/robot/modulerobot_sys.go
index c9cb8fdbd..9fb6ac75d 100644
--- a/modules/robot/modulerobot_sys.go
+++ b/modules/robot/modulerobot_sys.go
@@ -27,6 +27,10 @@ func (this *ModuleRobot_Sys) Receive(robot IRobot, stype string, message proto.M
 		resp := message.(*pb.SysFuncGetListResp)
 		this.cmd = resp.Cond
 		break
+	case "funcactivate":
+		resp := message.(*pb.SysFuncActivateResp)
+		this.cmd[resp.Cid] = 2
+		break
 	}
 	return
 }
diff --git a/modules/robot/robotmgrcomp.go b/modules/robot/robotmgrcomp.go
index 5ffedf7ef..c9402dfdb 100644
--- a/modules/robot/robotmgrcomp.go
+++ b/modules/robot/robotmgrcomp.go
@@ -58,7 +58,7 @@ func (this *robotmgrComp) createRobot(index int32) {
 	)
 	robot = &Robot{
 		index:    index,
-		account:  fmt.Sprintf("ft_%d", index),
+		account:  fmt.Sprintf("it_%d", index),
 		serverId: this.module.options.ServerID,
 		pipeline: this.module.options.Pipeline,
 	}