diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 3fa7fb5a6..bb936facc 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -31,6 +31,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) suits []*pb.DB_EquipmentSuit suit *pb.DB_EquipmentSuit equipNum int32 + minstar, minlv int32 = int32(99999), int32(99999) hero *pb.DBHero tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) ) @@ -78,6 +79,12 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) return } + if minstar < confs[i].Color { + minstar = confs[i].Color + } + if minlv < equipments[i].Lv { + minlv = equipments[i].Lv + } if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, @@ -85,8 +92,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) Message: err.Error(), } } - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype41, 1, confs[i].InitLv)) - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype42, 1, equipments[i].Lv)) + suit = nil for _, suit = range suits { if suit.Suitid == confs[i].Suittype && !suit.Effect { //找到一个未生效的套装 @@ -98,7 +104,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) suit = &pb.DB_EquipmentSuit{ Suitid: confs[i].Suittype, Eids: []string{v}, - Str: confs[i].InitLv, + Str: confs[i].Color, Lv: equipments[i].Lv, Effect: false, } @@ -112,8 +118,8 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) suits = append(suits, suit) } else { suit.Eids = append(suit.Eids, v) - if suit.Str < confs[i].InitLv { - suit.Str = confs[i].InitLv + if suit.Str < confs[i].Color { + suit.Str = confs[i].Color } if suit.Lv < equipments[i].Lv { suit.Lv = equipments[i].Lv @@ -202,6 +208,9 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) } return } + + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype41, equipNum, minstar)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype42, equipNum, minstar)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype5, equipNum, utils.ToInt32(hero.HeroID))) if len(tasks) > 0 { diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 3caef6ba1..d98f5e50e 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -64,7 +64,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade return } //找到下一个等级的相关配置 - if intensify, err = this.module.configure.GetEquipmentIntensifyConfigureById(conf.EquipId, conf.InitLv, equipment.Lv); err != nil || intensify.Need == nil || len(intensify.Need) == 0 { + if intensify, err = this.module.configure.GetEquipmentIntensifyConfigureById(conf.EquipId, conf.Color, equipment.Lv); err != nil || intensify.Need == nil || len(intensify.Need) == 0 { errdata = &pb.ErrorData{ Code: pb.ErrorCode_EquipmentLvlimitReached, Title: pb.ErrorCode_EquipmentLvlimitReached.ToString(), @@ -238,7 +238,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade suit = &pb.DB_EquipmentSuit{ Suitid: confs[i].Suittype, Eids: []string{v}, - Str: confs[i].InitLv, + Str: confs[i].Color, Lv: equipments[i].Lv, Effect: false, } @@ -249,8 +249,8 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade suits = append(suits, suit) } else { suit.Eids = append(suit.Eids, v) - if suit.Str < confs[i].InitLv { - suit.Str = confs[i].InitLv + if suit.Str < confs[i].Color { + suit.Str = confs[i].Color } if suit.Lv < equipments[i].Lv { suit.Lv = equipments[i].Lv @@ -259,7 +259,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade suit.Effect = true tasks = append(tasks, comm.GetBuriedParam(comm.Rtype93, 1, suit.Suitid, suit.Lv)) tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype43, equipment.Id, equipment.Lv)) - tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype45, equipment.Id, conf.InitLv, suit.Suitid, suit.Lv)) + tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype45, equipment.Id, conf.Color, suit.Suitid, suit.Lv)) } } } diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go index fff877086..984f64609 100644 --- a/modules/equipment/api_wash.go +++ b/modules/equipment/api_wash.go @@ -49,7 +49,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) ( } return } - gole := this.module.ModuleTools.GetGlobalConf().EquipmentConsumption[conf.InitLv-1] + gole := this.module.ModuleTools.GetGlobalConf().EquipmentConsumption[conf.Color-1] if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{{A: comm.AttrType, T: comm.ResGold, N: gole}}, true); errdata != nil { return } diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go index 9d6ebb16e..ea082b0b5 100644 --- a/modules/equipment/modelEquipment.go +++ b/modules/equipment/modelEquipment.go @@ -111,8 +111,8 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma return nil, err } else { //随机任务 - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype50, 1, c.InitLv)) - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype97, 1, c.Suittype, c.InitLv)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype50, 1, c.Color)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype97, 1, c.Suittype, c.Color)) unm := int32(1) if equipment.AdverbEntry != nil { unm += int32(len(equipment.AdverbEntry)) @@ -120,11 +120,11 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma if equipment.Adverbskill != nil { unm += int32(len(equipment.Adverbskill)) } - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype99, 1, unm, c.InitLv)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype99, 1, unm, c.Color)) if c.Pos == 7 { - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype103, 1, c.InitLv)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype103, 1, c.Color)) } else if c.Pos == 6 { - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype101, 1, c.InitLv)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype101, 1, c.Color)) } add[equipment.Id] = equipment change = append(change, equipment) diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 02be154b1..d32331b33 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -245,8 +245,8 @@ func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equi } tasks := make([]*pb.BuriedParam, 0) //随机任务 - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype50, 1, configure.InitLv)) - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype97, 1, configure.Suittype, configure.InitLv)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype50, 1, configure.Color)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype97, 1, configure.Suittype, configure.Color)) unm := int32(1) if equip.AdverbEntry != nil { unm += int32(len(equip.AdverbEntry)) @@ -254,11 +254,11 @@ func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equi if equip.Adverbskill != nil { unm += int32(len(equip.Adverbskill)) } - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype99, 1, unm, configure.InitLv)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype99, 1, unm, configure.Color)) if configure.Pos == 7 { - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype103, 1, configure.InitLv)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype103, 1, configure.Color)) } else if configure.Pos == 6 { - tasks = append(tasks, comm.GetBuriedParam(comm.Rtype101, 1, configure.InitLv)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype101, 1, configure.Color)) } go this.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...) this.equipmentsChangePush(session, []*pb.DB_Equipment{equip}) @@ -474,7 +474,7 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p } if pos != -1 { for _, v := range configures { - if v.Pos == pos && v.InitLv == lv { + if v.Pos == pos && v.Color == lv { if eruip, err = this.modelEquipment.newEquipment(session.GetUserId(), v, dyweight, isepic); err == nil { errdata = this.AddEquipment(session, eruip) // this.equipmentsChangePush(session, []*pb.DB_Equipment{eruip}) @@ -498,7 +498,7 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p } else { lvs = make([]*cfg.GameEquipData, 0) for _, v := range configures { - if v.InitLv == lv { + if v.Color == lv { lvs = append(lvs, v) } } diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index 00071e5fe..296ff5dbe 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -120,7 +120,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha if v.A == "equp" { for _, star := range req.Star { cfg := this.configure.GetEquipmentConfigureById(v.T) - if cfg != nil && star == cfg.InitLv { // 自动出售 转换成其他道具 + if cfg != nil && star == cfg.Color { // 自动出售 转换成其他道具 if len(cfg.Sale) != 0 { bFound = true del = append(del, cfg.Id) diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go index ed3a8731a..67486b3a2 100644 --- a/modules/smithy/model_atlas.go +++ b/modules/smithy/model_atlas.go @@ -71,7 +71,7 @@ func (this *modelAtlas) CheckActivateEquipAtlas(uid string, Equip []*pb.DB_Equip err error ) id := v.CId - lv := equipConf.InitLv + lv := equipConf.Color quality := int32(len(v.AdverbEntry)) // 装备id 转图鉴id if conf := this.module.configure.GetEquipmentConfigureById(id); conf != nil { diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 50f1cc963..b5bd8fa01 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -115,7 +115,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal if v.A == "equp" { for _, star := range req.Star { cfg := this.configure.GetEquipmentConfigureById(v.T) - if cfg != nil && star == cfg.InitLv { // 自动出售 转换成其他道具 + if cfg != nil && star == cfg.Color { // 自动出售 转换成其他道具 if len(cfg.Sale) != 0 { bFound = true del = append(del, cfg.Id)