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) } }