From 773a5db73b73b75eca8c0de087acf9ab8961c5cc Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 24 Jun 2022 17:28:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A6=E5=99=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E9=80=BB=E8=BE=91=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/equipment/api_upgrade.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 754fb61b3..2cb1b278f 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -76,8 +76,8 @@ func (this *Api_Comp) Upgrade(session comm.IUserSession, agrs map[string]interfa } } if issucc { - //没有佩戴的装备 - if equipment.IsInitialState && equipment.OverlayNum > 1 { // 叠加装备 拆分处理 + //叠加装备 拆分处理 + if equipment.IsInitialState && equipment.OverlayNum > 1 { equipment.OverlayNum-- if err = this.module.model_equipment_comp.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ "overlayNum": equipment.OverlayNum, @@ -92,7 +92,6 @@ func (this *Api_Comp) Upgrade(session comm.IUserSession, agrs map[string]interfa equipment.IsInitialState = false equipment.OverlayNum = 1 equipment.Lv++ - if err = this.module.model_equipment_comp.AddList(session.GetUserId(), equipment.Id, equipment); err != nil { log.Errorf("Upgrade err:%v", err) code = pb.ErrorCode_SystemError @@ -101,14 +100,18 @@ func (this *Api_Comp) Upgrade(session comm.IUserSession, agrs map[string]interfa } else { equipment.IsInitialState = false equipment.Lv++ - if err = this.module.model_equipment_comp.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{"lv": equipment.Lv}); err != nil { + if err = this.module.model_equipment_comp.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ + "lv": equipment.Lv, + "isInitialState": false, + }); err != nil { log.Errorf("Upgrade err:%v", err) code = pb.ErrorCode_SystemError return } } - if equipment.HeroId != "" { //已装备 重新计算属性 + //已装备 重新计算属性 + if equipment.HeroId != "" { if hero, code = this.module.hero.GetHero(equipment.HeroId); code != pb.ErrorCode_Success { log.Errorf("Upgrade code:%d", code) return @@ -127,12 +130,6 @@ func (this *Api_Comp) Upgrade(session comm.IUserSession, agrs map[string]interfa } } } - equipment.Lv++ - if err = this.module.model_equipment_comp.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{"lv": equipment.Lv}); err != nil { - log.Errorf("Upgrade err:%v", err) - code = pb.ErrorCode_SystemError - return - } code = this.module.hero.UpdateEquipment(hero, equipments) } }