diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go index cdf202b69..9ea460956 100644 --- a/modules/equipment/api_wash.go +++ b/modules/equipment/api_wash.go @@ -21,7 +21,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) ( var ( equip *pb.DB_Equipment conf *cfg.GameEquipData - attrlibrarys []*cfg.GameEquipAttrlibraryData + attrlibrarys []*cfg.GameEquipAttrlibrarySData adverbEntry []*pb.EquipmentAttributeEntry err error ) diff --git a/modules/equipment/configure.go b/modules/equipment/configure.go index c5c53eb9e..a4384e1ed 100644 --- a/modules/equipment/configure.go +++ b/modules/equipment/configure.go @@ -35,7 +35,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*Equipment) this.LoadConfigure(game_equip, cfg.NewGameEquip) - this.LoadConfigure(equip_attrlibrary, cfg.NewGameEquipAttrlibrary) + this.LoadConfigure(equip_attrlibrary, cfg.NewGameEquipAttrlibraryS) this.LoadConfigure(equip_intensify, cfg.NewGameEquipIntensify) this.LoadConfigure(equip_suit, cfg.NewGameEquipSuit) this.LoadConfigure(game_equipcompose, cfg.NewGameEquipSCompose) @@ -136,7 +136,7 @@ func (this *configureComp) GetEquipmentConfigureByIds(equipmentId []string) (con } //获取装备属性表 -func (this *configureComp) GetEquipmentAttrlibraryConfigure() (configure *cfg.GameEquipAttrlibrary, err error) { +func (this *configureComp) GetEquipmentAttrlibraryConfigure() (configure *cfg.GameEquipAttrlibraryS, err error) { var ( v interface{} ok bool @@ -145,7 +145,7 @@ func (this *configureComp) GetEquipmentAttrlibraryConfigure() (configure *cfg.Ga this.module.Errorf("err:%v", err) return } else { - if configure, ok = v.(*cfg.GameEquipAttrlibrary); !ok { + if configure, ok = v.(*cfg.GameEquipAttrlibraryS); !ok { err = fmt.Errorf("%T no is *cfg.Game_equipment", v) this.module.Errorf("err:%v", err) return @@ -175,7 +175,7 @@ func (this *configureComp) GetEquipmentAttrlibraryConfigureByKey(key int32) (con } //获取属性词列表 -func (this *configureComp) GetEquipmentAttrlibraryConfigureById(Id int32) (configure []*cfg.GameEquipAttrlibraryData, err error) { +func (this *configureComp) GetEquipmentAttrlibraryConfigureById(Id int32) (configure []*cfg.GameEquipAttrlibrarySData, err error) { var ( v interface{} ) @@ -183,8 +183,8 @@ func (this *configureComp) GetEquipmentAttrlibraryConfigureById(Id int32) (confi this.module.Errorf("err:%v", err) return } else { - configure = make([]*cfg.GameEquipAttrlibraryData, 0) - for _, v1 := range v.(*cfg.GameEquipAttrlibrary).GetDataList() { + configure = make([]*cfg.GameEquipAttrlibrarySData, 0) + for _, v1 := range v.(*cfg.GameEquipAttrlibraryS).GetDataList() { if v1.Libraryid == Id { configure = append(configure, v1) } diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go index 5eb9f2b10..bbcc7658a 100644 --- a/modules/equipment/modelEquipment.go +++ b/modules/equipment/modelEquipment.go @@ -249,8 +249,8 @@ func (this *modelEquipmentComp) UpdateByHeroId(uid string, equipments ...*pb.DB_ //创建新的武器对象 func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData, dyweight []int32) (equipment *pb.DB_Equipment, err error) { var ( - mattr []*cfg.GameEquipAttrlibraryData - sattr []*cfg.GameEquipAttrlibraryData + mattr []*cfg.GameEquipAttrlibrarySData + sattr []*cfg.GameEquipAttrlibrarySData equipatt *cfg.GameEquipAttributeData weight []int32 total int @@ -360,8 +360,8 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ } if len(equipment.AdverbEntry) < 4 { //去随机副词条 var ( - temp []*cfg.GameEquipAttrlibraryData - sattr []*cfg.GameEquipAttrlibraryData + temp []*cfg.GameEquipAttrlibrarySData + sattr []*cfg.GameEquipAttrlibrarySData equipatt *cfg.GameEquipAttributeData ) if temp, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(equip.Addlibrary); err != nil {