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-02-21 14:53:05 +08:00
commit 0be6315357
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/battle/modelBattle.go
View File

@ -639,6 +639,7 @@ func (this *modelBattleComp) checkBattlereadyCapskill(leadpos int32, heros []*pb
} }
if n < int(caprule.Lv[1]) { if n < int(caprule.Lv[1]) {
ok = false ok = false
return
} }
} }
if len(caprule.Start) == 2 { //星级校验 if len(caprule.Start) == 2 { //星级校验
@ -650,6 +651,7 @@ func (this *modelBattleComp) checkBattlereadyCapskill(leadpos int32, heros []*pb
} }
if n < int(caprule.Start[1]) { if n < int(caprule.Start[1]) {
ok = false ok = false
return
} }
} }
@ -662,19 +664,25 @@ func (this *modelBattleComp) checkBattlereadyCapskill(leadpos int32, heros []*pb
} }
if n < int(caprule.Race[1]) { if n < int(caprule.Race[1]) {
ok = false ok = false
return
} }
} }
if len(caprule.Heroid) > 0 { //阵营校验 if len(caprule.Heroid) > 0 { //阵营校验
n := 0
for _, v := range conf { for _, v := range caprule.Heroid {
if v != nil && v.Race == caprule.Race[0] { iskeep := false
n++ for _, v1 := range heros {
if v1 != nil && v1.HeroID == v {
iskeep = true
}
}
if !iskeep {
ok = false
return
} }
} }
if n < int(caprule.Race[1]) {
ok = false
}
} }
return return
} }