diff --git a/comm/imodule.go b/comm/imodule.go index 3a5ba0001..8899e6c09 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -261,6 +261,8 @@ type ( NewMaxQualityEquipment(session IUserSession, cid []string) (eruips []*pb.DB_Equipment, errdata *pb.ErrorData) //自定义装备 GMGetCustomizeEquip(session IUserSession, id string, lv int32, attribute int32, num int32) (errdata *pb.ErrorData) + //自定义装备 + GMGetSuitAllEquip(session IUserSession, suit int32, star int32, lv, num int32) (errdata *pb.ErrorData) } //任务 diff --git a/modules/equipment/module.go b/modules/equipment/module.go index da2d2244f..0a90069b2 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -757,6 +757,57 @@ func (this *Equipment) GMGetCustomizeEquip(session comm.IUserSession, id string, return } +/* +GM 命令接口 +获取全部装备 +*/ +func (this *Equipment) GMGetSuitAllEquip(session comm.IUserSession, suit int32, star int32, lv, num int32) (errdata *pb.ErrorData) { + var ( + err error + conf []*cfg.GameEquipData + intensify *cfg.GameEquipIntensifyData + equipment *pb.DB_Equipment + equips []*pb.DB_Equipment + ) + conf, err = this.configure.GetSuitEquipmentConfigure(suit) + for _, v := range conf { + if v.Color == star { + if equipment, err = this.modelEquipment.newEquipment(session.GetUserId(), v, nil, false); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + for i := int32(0); i < lv; i++ { + if intensify, err = this.configure.GetEquipmentIntensifyConfigureById(v.EquipId, v.Color, equipment.Lv); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + if len(intensify.Need) > 0 { + if err = this.modelEquipment.upgradeEquipment(equipment, v, intensify); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + } + } + equips = append(equips, equipment) + } + } + + errdata = this.AddEquipment(session, equips...) + return +} + // Evens-------------------------------------------------------------------------------------------------------------------------------- // 推送道具变化消息 func (this *Equipment) equipmentsChangePush(session comm.IUserSession, items []*pb.DB_Equipment) (err error) { diff --git a/modules/gm/module.go b/modules/gm/module.go index 3445408df..f0c00a8f5 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -451,6 +451,51 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er return } + this.Debug("使用bingo命令:uid = %s ", + log.Field{Key: "uid", Value: session.GetUserId()}, + log.Field{Key: "0", Value: datas[0]}, + ) + } else if len(datas) == 5 && (datas[0] == "sutequip") { // 自定义战备 + module1, err := this.service.GetModule(comm.ModuleEquipment) + if err != nil { + return + } + suit, err := strconv.Atoi(datas[1]) + if err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } + star, err := strconv.Atoi(datas[2]) + if err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } + lv, err := strconv.Atoi(datas[3]) + if err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } + num, err := strconv.Atoi(datas[4]) + if err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } + if errdata = module1.(comm.IEquipment).GMGetSuitAllEquip(session, int32(suit), int32(star), int32(lv), int32(num)); errdata != nil { + return + } + this.Debug("使用bingo命令:uid = %s ", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "0", Value: datas[0]},