liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
wh_zcy 2023-05-29 10:47:19 +08:00
commit 0c0615b756
6 changed files with 1681 additions and 1681 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1508
bin/json/game_rdtaskcondi.json
View File

File diff suppressed because it is too large Load Diff

1828
bin/json/game_worldtask.json
View File

File diff suppressed because it is too large Load Diff

2
modules/equipment/api_wash.go
View File

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

12
modules/equipment/configure.go
View File

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

8
modules/equipment/modelEquipment.go
View File

@ -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 {

4
modules/oldtimes/api_getall.go
View File

@ -78,12 +78,12 @@ func (this *apiComp) Getall(session comm.IUserSession, req *pb.OldtimesGetallReq
if levelConf != nil {
chapter := this.module.modelOldtimes.getChatper(levelConf.Group, d)
if chapter != nil {
chapter.Levels = append(chapter.Levels, &pb.Level{Lid: lid})
chapter.Levels = append(chapter.Levels, &pb.Level{Lid: lid, Status: int32(unlock)})
} else {
chapter := &pb.Chapter{
Cid: levelConf.Group,
}
chapter.Levels = append(chapter.Levels, &pb.Level{Lid: lid})
chapter.Levels = append(chapter.Levels, &pb.Level{Lid: lid, Status: int32(unlock)})
d.Chapters = append(d.Chapters, chapter)
}
}