Commit 318a7041fa2a63a6fe181703b3be72f53d937697
Merge branch 'develop' of 120.26.43.151:wasteland/server into develop
* 'develop' of 120.26.43.151:wasteland/server: 好友 无阵容 bug
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
src/models/RoleCross.lua
| ... | ... | @@ -287,7 +287,7 @@ end |
| 287 | 287 | |
| 288 | 288 | function CMD.friendBattleInfo(roleId) |
| 289 | 289 | local info = CMD.getProperties(roleId, {"pvpTBC", "hangTB"}) |
| 290 | - return next(info.pvpTBC) and info.pvpTBC or info.hangTB | |
| 290 | + return (next(info.pvpTBC) and next(info.pvpTBC.heros)) and info.pvpTBC or info.hangTB | |
| 291 | 291 | end |
| 292 | 292 | |
| 293 | 293 | function CMD.pvpCInfo(roleId) | ... | ... |