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:
meixiongfeng 2023-06-19 16:10:04 +08:00
commit 16dca8f3db
5 changed files with 99016 additions and 99002 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

197958
bin/json/game_monsterformat.json
View File

File diff suppressed because it is too large Load Diff

2
modules/buried/configure.go
View File

@ -107,7 +107,7 @@ func (this *configureComp) getburiedcondidata(cid int32) (result *cfg.GameBuried
return return
} else { } else {
if result, ok = v.(*cfg.GameBuriedCondi).GetDataMap()[cid]; !ok { if result, ok = v.(*cfg.GameBuriedCondi).GetDataMap()[cid]; !ok {
err = comm.NewNotFoundConfErr(moduleName, game_buriedtype, cid) err = comm.NewNotFoundConfErr(moduleName, game_buriedcondi, cid)
this.module.Errorf("err:%v", err) this.module.Errorf("err:%v", err)
return return
} }

12
modules/buried/module.go
View File

@ -82,6 +82,9 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
} }
for _, v := range condiIds { for _, v := range condiIds {
if v == 0 {
continue
}
if conf, err = this.configure.getburiedcondidata(v); err != nil { if conf, err = this.configure.getburiedcondidata(v); err != nil {
return return
} }
@ -150,6 +153,9 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.
} }
condis = make([]*pb.ConIProgress, 0) condis = make([]*pb.ConIProgress, 0)
for _, v := range condiIds { for _, v := range condiIds {
if v == 0 {
continue
}
if conf, err = this.configure.getburiedcondidata(v); err != nil { if conf, err = this.configure.getburiedcondidata(v); err != nil {
return return
} }
@ -225,6 +231,9 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
condis = make([]*pb.ConIProgress, 0) condis = make([]*pb.ConIProgress, 0)
for _, v := range finishcondiIds { for _, v := range finishcondiIds {
if v == 0 {
continue
}
if conf, err = this.configure.getburiedcondidata(v); err != nil { if conf, err = this.configure.getburiedcondidata(v); err != nil {
return return
} }
@ -280,6 +289,9 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
} }
for _, v := range condiIds { for _, v := range condiIds {
if v == 0 {
continue
}
if conf, err = this.configure.getburiedcondidata(v); err != nil { if conf, err = this.configure.getburiedcondidata(v); err != nil {
return return
} }

5
modules/equipment/api_equip.go
View File

@ -94,8 +94,9 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
} }
suit = nil suit = nil
for _, suit = range suits { for _, _suit := range suits {
if suit.Suitid == confs[i].Suittype && !suit.Effect { //找到一个未生效的套装 if _suit.Suitid == confs[i].Suittype && !_suit.Effect { //找到一个未生效的套装
suit = _suit
break break
} }
} }

5
modules/equipment/api_upgrade.go
View File

@ -229,8 +229,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
} }
} }
suit = nil suit = nil
for _, suit = range suits { for _, _suit := range suits {
if suit.Suitid == confs[i].Suittype && !suit.Effect { //找到一个未生效的套装 if _suit.Suitid == confs[i].Suittype && !_suit.Effect { //找到一个未生效的套装
suit = _suit
break break
} }
} }