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

🐞 fix(副将): 名将擂台判断副将错误

Browse Source
This commit is contained in:
luying
2023-07-19 14:42:17 +08:00
parent 0c6bea6ad1
commit aa6240cb65
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app/servers/battle/handler/ladderHandler.ts
View File

@@ -286,7 +286,7 @@ export class LadderHandler {
if(isHeroHidden(...hids)) return resResult(STATUS.HERO_IS_HIDDEN); if(isHeroHidden(...hids)) return resResult(STATUS.HERO_IS_HIDDEN);
for(let { actorId, subHid } of heroes) { for(let { actorId, subHid } of heroes) {
let dicHero = gameData.hero.get(actorId); let dicHero = gameData.hero.get(actorId);
if(!dicHero || dicHero.urType != 1) return resResult(STATUS.HERO_CAN_NOT_SET_SUB); if(subHid && (!dicHero || dicHero.urType != 1)) return resResult(STATUS.HERO_CAN_NOT_SET_SUB);
if(subHid && hids.indexOf(subHid) != -1) return resResult(STATUS.HERO_SUB_DUPLICATE); if(subHid && hids.indexOf(subHid) != -1) return resResult(STATUS.HERO_SUB_DUPLICATE);
} }

2
game-server/app/servers/battle/handler/pvpHandler.ts
View File

@@ -470,7 +470,7 @@ export class PvpHandler {
for(let { actorId, subHid } of heroes) { for(let { actorId, subHid } of heroes) {
if(isHeroHidden(actorId)) return resResult(STATUS.HERO_IS_HIDDEN); if(isHeroHidden(actorId)) return resResult(STATUS.HERO_IS_HIDDEN);
let dicHero = gameData.hero.get(actorId); let dicHero = gameData.hero.get(actorId);
if(!dicHero || dicHero.urType != 1) return resResult(STATUS.HERO_CAN_NOT_SET_SUB); if(subHid && (!dicHero || dicHero.urType != 1)) return resResult(STATUS.HERO_CAN_NOT_SET_SUB);
if(subHid && heroes.findIndex(hero => hero.actorId == subHid) != -1) return resResult(STATUS.HERO_SUB_DUPLICATE); if(subHid && heroes.findIndex(hero => hero.actorId == subHid) != -1) return resResult(STATUS.HERO_SUB_DUPLICATE);
let heroScore = pvpDefense.heroScores.find(cur => cur.hid == actorId); let heroScore = pvpDefense.heroScores.find(cur => cur.hid == actorId);

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

@@ -876,7 +876,7 @@ export async function checkGVGLineupWhenSave(roleId: string, index: number, line
const teams = await GVGTeamModel.findByRole(roleId, '-_id index lineup'); const teams = await GVGTeamModel.findByRole(roleId, '-_id index lineup');
for(let { actorId, subHid } of lineup) { for(let { actorId, subHid } of lineup) {
let dicHero = gameData.hero.get(actorId); let dicHero = gameData.hero.get(actorId);
if(!dicHero || dicHero.urType != 1) return STATUS.HERO_CAN_NOT_SET_SUB; if(subHid && (!dicHero || dicHero.urType != 1)) return STATUS.HERO_CAN_NOT_SET_SUB;
for(let team of teams) { for(let team of teams) {
// 查actorId没有在其他队伍中使用 // 查actorId没有在其他队伍中使用