From 252bd04039717094a94c65a6fecec2092e559510 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 1 Feb 2024 17:51:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=97=A0=E5=A5=97=E8=A3=85?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E8=A3=85=E5=A4=87=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/equipment/api_equip.go | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 4637be57f..4d1ce11df 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -85,12 +85,24 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) if equipments[i].Lv < minlv { minlv = equipments[i].Lv } - if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Message: fmt.Sprintf("%s-err:%s", confs[i].Id, err.Error()), + + lvnum[equipments[i].Lv]++ + for k, _ := range lvnum { + if k > equipments[i].Lv { + lvnum[k]++ } - return + } + + if confs[i].Suittype > 0 { + if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: fmt.Sprintf("%s-err:%s", confs[i].Id, err.Error()), + } + return + } + } else { + continue } suit = nil @@ -101,13 +113,6 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) } } - lvnum[equipments[i].Lv]++ - for k, _ := range lvnum { - if k > equipments[i].Lv { - lvnum[k]++ - } - } - if suit == nil { suit = &pb.DB_EquipmentSuit{ Suitid: confs[i].Suittype,