Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server

This commit is contained in:
mamengke01
2021-01-15 16:07:39 +08:00
6 changed files with 61 additions and 30 deletions

View File

@@ -389,11 +389,17 @@ export class PvpHandler {
return resResult(STATUS.PVP_ROLE_NOT_FOUND);
}
let heroes = pvpHistoryOpp.heroes.map(hero => {
let heroes = new Array<PlayerDetailHero>();
for(let hero of pvpHistoryOpp.heroes) {
let newHero = new PlayerDetailHero();
newHero.setPvpHeroInfo(hero);
return newHero;
})
heroes.push(newHero);
}
for(let hero of pvpHistoryOpp.otherHeroes) {
let newHero = new PlayerDetailHero();
newHero.setPvpHeroInfo(hero);
heroes.push(newHero);
}
result = new PlayerDetail({...pvpHistoryOpp, roleId: pvpHistoryOpp.oppRoleId, heroes, rank: pvpHistoryOpp.rankLv});
} else { // 查询对方pvpDefense
let pvpDefense = await PvpDefenseModel.findByRoleId(oppoRoleId);