From cc73d742eb3c34e41b655362454f7bd8127e3552 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Thu, 18 Jan 2024 10:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A3=85=E5=A4=87=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go                     |  2 +-
 modules/equipment/modelEquipment.go |  6 ++++--
 modules/equipment/module.go         | 21 +++++++++++++--------
 modules/gm/module.go                | 12 ++++++++++--
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/comm/imodule.go b/comm/imodule.go
index 8375fcc99..3a5ba0001 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -260,7 +260,7 @@ type (
 		//创建最高名字装备
 		NewMaxQualityEquipment(session IUserSession, cid []string) (eruips []*pb.DB_Equipment, errdata *pb.ErrorData)
 		//自定义装备
-		GMGetCustomizeEquip(session IUserSession, id string, lv int32, attribute int32) (errdata *pb.ErrorData)
+		GMGetCustomizeEquip(session IUserSession, id string, lv int32, attribute int32, num int32) (errdata *pb.ErrorData)
 	}
 
 	//任务
diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go
index 8861b12a4..62bc33adf 100644
--- a/modules/equipment/modelEquipment.go
+++ b/modules/equipment/modelEquipment.go
@@ -671,8 +671,10 @@ func (this *modelEquipmentComp) newCustomizeEquipment(uid string, eid string, lv
 			this.module.Errorln(err)
 			return
 		}
-		if err = this.upgradeEquipment(equipment, conf, intensify); err != nil {
-			return
+		if len(intensify.Need) > 0 {
+			if err = this.upgradeEquipment(equipment, conf, intensify); err != nil {
+				return
+			}
 		}
 	}
 	return
diff --git a/modules/equipment/module.go b/modules/equipment/module.go
index 75f1fcee0..da2d2244f 100644
--- a/modules/equipment/module.go
+++ b/modules/equipment/module.go
@@ -735,20 +735,25 @@ func (this *Equipment) GMGetAllEquip(session comm.IUserSession, ismaxlv bool) (e
 GM 命令接口
 获取全部装备
 */
-func (this *Equipment) GMGetCustomizeEquip(session comm.IUserSession, id string, lv int32, attribute int32) (errdata *pb.ErrorData) {
+func (this *Equipment) GMGetCustomizeEquip(session comm.IUserSession, id string, lv int32, attribute int32, num int32) (errdata *pb.ErrorData) {
 	var (
 		err       error
 		equipment *pb.DB_Equipment
+		equips    []*pb.DB_Equipment
 	)
-	if equipment, err = this.modelEquipment.newCustomizeEquipment(session.GetUserId(), id, lv, attribute); err != nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_ConfigNoFound,
-			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
-			Message: err.Error(),
+	for i := int32(0); i < num; i++ {
+		if equipment, err = this.modelEquipment.newCustomizeEquipment(session.GetUserId(), id, lv, attribute); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ConfigNoFound,
+				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+				Message: err.Error(),
+			}
+			return
 		}
-		return
+		equips = append(equips, equipment)
 	}
-	errdata = this.AddEquipment(session, equipment)
+
+	errdata = this.AddEquipment(session, equips...)
 	return
 }
 
diff --git a/modules/gm/module.go b/modules/gm/module.go
index f79431f49..0059aa94c 100644
--- a/modules/gm/module.go
+++ b/modules/gm/module.go
@@ -417,7 +417,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
 					log.Field{Key: "uid", Value: session.GetUserId()},
 					log.Field{Key: "0", Value: datas[0]},
 				)
-			} else if len(datas) == 4 && (datas[0] == "cusequip") { // 自定义战备
+			} else if len(datas) == 5 && (datas[0] == "cusequip") { // 自定义战备
 				module1, err := this.service.GetModule(comm.ModuleEquipment)
 				if err != nil {
 					return
@@ -439,7 +439,15 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
 					}
 					return
 				}
-				if errdata = module1.(comm.IEquipment).GMGetCustomizeEquip(session, id, int32(lv), int32(attribute)); errdata != nil {
+				num, err := strconv.Atoi(datas[4])
+				if err != nil {
+					errdata = &pb.ErrorData{
+						Code:  pb.ErrorCode_ReqParameterError,
+						Title: pb.ErrorCode_ReqParameterError.ToString(),
+					}
+					return
+				}
+				if errdata = module1.(comm.IEquipment).GMGetCustomizeEquip(session, id, int32(lv), int32(attribute), int32(num)); errdata != nil {
 					return
 				}