xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(副将): gvg激战期阵容保存校验错误

Browse Source
This commit is contained in:
luying
2023-07-22 17:54:04 +08:00
parent 6b066ad5a4
commit d9dbf15788
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
game-server/app/services/gvg/gvgBattleService.ts
View File

@@ -883,14 +883,25 @@ export async function checkGVGLineupWhenSave(roleId: string, index: number, line
if(team.index != index) { if(team.index != index) {
let hasActor = team.lineup.find(hero => hero.actorId == actorId); let hasActor = team.lineup.find(hero => hero.actorId == actorId);
if(hasActor) return STATUS.GVG_TEAM_HERO_DUPLICATE; if(hasActor) return STATUS.GVG_TEAM_HERO_DUPLICATE;
}
// 查actorId没有在其他队伍作为副将 // 查actorId没有在其他队伍作为副将
let hasActorIsSubHero = team.lineup.find(hero => hero.subHid == actorId); let hasActorIsSubHero = team.lineup.find(hero => hero.subHid == actorId);
if(hasActorIsSubHero) return STATUS.GVG_TEAM_HERO_USED_AS_SUB_HERO; if(hasActorIsSubHero) return STATUS.GVG_TEAM_HERO_USED_AS_SUB_HERO;
// 查副将 // 查副将
if(subHid) { if(subHid) {
let hasSubHero = team.lineup.find(hero => hero.actorId == subHid); let hasSubHero = team.lineup.find(hero => hero.actorId == subHid);
if(hasSubHero) return STATUS.GVG_TEAM_SUB_HERO_DUPLICATE; if(hasSubHero) return STATUS.GVG_TEAM_SUB_HERO_DUPLICATE;
}
} else {
// 查actorId没有在其他队伍作为副将
let hasActorIsSubHero = lineup.find(hero => hero.subHid == actorId);
if(hasActorIsSubHero) return STATUS.GVG_TEAM_HERO_USED_AS_SUB_HERO;
// 查副将
if(subHid) {
let hasSubHero = lineup.find(hero => hero.actorId == subHid);
if(hasSubHero) return STATUS.GVG_TEAM_SUB_HERO_DUPLICATE;
}
} }
} }
} }

3
game-server/app/services/gvg/gvgFightService.ts
View File

@@ -163,6 +163,9 @@ export async function checkHeroIsUsedInOtherVestige(roleId: string, curVestigeId
// 查副将 // 查副将
if(subHid) { if(subHid) {
if(usedHeroes.indexOf(subHid) != -1) return true; if(usedHeroes.indexOf(subHid) != -1) return true;
let hasSubHero = heroes.find(hero => hero.actorId == subHid);
if(hasSubHero) return true;
} }
} }
return false; return false;

1
shared/domain/dbGeneral.ts
View File

@@ -158,7 +158,6 @@ export class PvpHeroInfo {
} }
setSubHero(subHero: HeroType) { setSubHero(subHero: HeroType) {
console.log('#### setSubHero', subHero)
this.subHid = subHero?.skinId||0; this.subHid = subHero?.skinId||0;
this.subActorId = subHero?.hid||0; this.subActorId = subHero?.hid||0;
} }