From 36e0fd52ecaad62c5d13839d2f731176c25278ae Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 2 Nov 2022 18:37:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=8D=87=E7=BA=A7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/equipment/api_upgrade.go | 2 +- modules/equipment/configure.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 859cf0bcc..21ac45c7c 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -52,7 +52,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade return } //找到下一个等级的相关配置 - if intensify, err = this.module.configure.GetEquipmentIntensifyConfigureById(conf.Star, equipment.Lv); err != nil || intensify.Need == nil || len(intensify.Need) == 0 { + if intensify, err = this.module.configure.GetEquipmentIntensifyConfigureById(conf.EquipId, conf.Star, equipment.Lv); err != nil || intensify.Need == nil || len(intensify.Need) == 0 { this.module.Errorf("Equip_Check err:%v", err) code = pb.ErrorCode_EquipmentLvlimitReached return diff --git a/modules/equipment/configure.go b/modules/equipment/configure.go index b33472671..5395d3b91 100644 --- a/modules/equipment/configure.go +++ b/modules/equipment/configure.go @@ -176,7 +176,7 @@ func (this *configureComp) GetEquipmentIntensifyConfigure() (configure *cfg.Game } //获取武器等级消耗表 -func (this *configureComp) GetEquipmentIntensifyConfigureById(star, lv int32) (configure *cfg.GameEquipIntensifyData, err error) { +func (this *configureComp) GetEquipmentIntensifyConfigureById(etype, star, lv int32) (configure *cfg.GameEquipIntensifyData, err error) { var ( v interface{} ) @@ -185,8 +185,7 @@ func (this *configureComp) GetEquipmentIntensifyConfigureById(star, lv int32) (c return } else { for _, v1 := range v.(*cfg.GameEquipIntensify).GetDataList() { - - if v1.Star == star && v1.Level == lv { + if v1.TypeId == etype && v1.Star == star && v1.Level == lv { configure = v1 } }