diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go index ea082b0b5..5cf9894c4 100644 --- a/modules/equipment/modelEquipment.go +++ b/modules/equipment/modelEquipment.go @@ -16,13 +16,13 @@ import ( "go.mongodb.org/mongo-driver/x/bsonx" ) -///装备 数据组件 +// /装备 数据组件 type modelEquipmentComp struct { modules.MCompModel module *Equipment } -//组件初始化接口 +// 组件初始化接口 func (this *modelEquipmentComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { this.TableName = comm.TableEquipment this.MCompModel.Init(service, module, comp, opt) @@ -34,14 +34,14 @@ func (this *modelEquipmentComp) Init(service core.IService, module core.IModule, return } -//查询用户装备数据 +// 查询用户装备数据 func (this *modelEquipmentComp) QueryUserEquipmentsById(uId, id string) (equipment *pb.DB_Equipment, err error) { equipment = &pb.DB_Equipment{} err = this.GetListObj(uId, id, equipment) return } -//查询用户装备数据 +// 查询用户装备数据 func (this *modelEquipmentComp) QueryUserEquipmentsByIds(uId string, ids []string) (equipments []*pb.DB_Equipment, err error) { equipments = []*pb.DB_Equipment{} if err = this.GetListObjs(uId, ids, &equipments); err != nil { @@ -50,7 +50,7 @@ func (this *modelEquipmentComp) QueryUserEquipmentsByIds(uId string, ids []strin return } -///查询用户的武器背包 +// /查询用户的武器背包 func (this *modelEquipmentComp) QueryUserEquipments(uId string) (equipments []*pb.DB_Equipment, err error) { var ( model *db.DBModel @@ -73,7 +73,7 @@ func (this *modelEquipmentComp) QueryUserEquipments(uId string) (equipments []*p return } -///查询目标卡片数量 +// /查询目标卡片数量 func (this *modelEquipmentComp) QueryEquipmentAmount(uid string, equipmentId string) (amount uint32) { var ( equipments []*pb.DB_Equipment @@ -91,7 +91,7 @@ func (this *modelEquipmentComp) QueryEquipmentAmount(uid string, equipmentId str return } -//添加装备 +// 添加装备 func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds map[string]uint32) (change []*pb.DB_Equipment, err error) { var ( configure *cfg.GameEquip @@ -183,7 +183,7 @@ func (this *modelEquipmentComp) addEquipment(equip *pb.DB_Equipment) (err error) return } -//删除装备 +// 删除装备 func (this *modelEquipmentComp) DelEquipments(uId string, eIds []string) (change []*pb.DB_Equipment, err error) { var ( model *db.DBModel @@ -214,7 +214,7 @@ func (this *modelEquipmentComp) DelEquipments(uId string, eIds []string) (change return } -//更新武器挂载信息 +// 更新武器挂载信息 func (this *modelEquipmentComp) UpdateByHeroId(uid string, equipments ...*pb.DB_Equipment) (err error) { var ( model *db.DBModel @@ -246,7 +246,7 @@ func (this *modelEquipmentComp) UpdateByHeroId(uid string, equipments ...*pb.DB_ return } -//创建新的武器对象 +// 创建新的武器对象 func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData, dyweight []int32, isepic bool) (equipment *pb.DB_Equipment, err error) { var ( mattr []*cfg.GameEquipAttrlibrarySData @@ -358,16 +358,16 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData return } -//升级武器 +// 升级武器 func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equip *cfg.GameEquipData, intensify *cfg.GameEquipIntensifyData) (err error) { equipment.Lv++ equipment.MainEntry.Lv++ - var mainconfigure *cfg.GameEquipAttrlibrarySData - if mainconfigure, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.MainEntry.Id); err != nil { - this.module.Errorf("升级服务错误 读取主词条配置错误!") - return - } - equipment.MainEntry.Value = equipment.MainEntry.BaseValue + int32(float64(mainconfigure.AttrvarCorrect)*float64(intensify.Bonus)/1000.0) + // var mainconfigure *cfg.GameEquipAttrlibrarySData + // if mainconfigure, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.MainEntry.Id); err != nil { + // this.module.Errorf("升级服务错误 读取主词条配置错误!") + // return + // } + equipment.MainEntry.Value = equipment.MainEntry.BaseValue + int32(float64(equipment.MainEntry.BaseValue)*float64(intensify.Bonus)/1000.0) if intensify.Activation { //不触发副词条变化 if len(equipment.AdverbEntry) < 4 { //去随机副词条 var (