diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go index 1e92f2ff5..b8631a3bd 100644 --- a/modules/equipment/api_wash.go +++ b/modules/equipment/api_wash.go @@ -53,7 +53,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) ( return } for i, v := range attrlibrarys { //移除主属性 - if v.Key == equip.MainEntry.Id { + if v.Attrkey == equip.MainEntry.AttrName { attrlibrarys = append(attrlibrarys[0:i], attrlibrarys[i+1:]...) break } diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go index eb40af57a..641eb1c5a 100644 --- a/modules/equipment/modelEquipment.go +++ b/modules/equipment/modelEquipment.go @@ -258,7 +258,7 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData } for i, v := range sattr { //移除主属性 - if v.Key == equipment.MainEntry.Id { + if v.Attrkey == equipment.MainEntry.AttrName { sattr = append(sattr[0:i], sattr[i+1:]...) break } @@ -329,11 +329,11 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ for _, v := range temp { iskeep := false for _, v1 := range equipment.AdverbEntry { - if v.Key == v1.Id { + if v.Attrkey == v1.AttrName { iskeep = true } } - if v.Key == equipment.MainEntry.Id { + if v.Attrkey == equipment.MainEntry.AttrName { iskeep = true } if !iskeep {