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

镇念塔：重复上阵武将bug

Browse Source
This commit is contained in:
luying
2021-08-23 15:25:56 +08:00
parent 7bc1e3b4e7
commit 383402ee4f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/battle/handler/normalBattleHandler.ts
+1 -1
View File
@@ -72,7 +72,7 @@ export class NormalBattleHandler {
} }
dailyNum = Object.assign(dailyNum, checkResult.data); dailyNum = Object.assign(dailyNum, checkResult.data);
} else if (warInfo.warType == WAR_TYPE.TOWER) { } else if (warInfo.warType == WAR_TYPE.TOWER) {
let checkResult = await checkTowerWar(roleId, battleId, heroes); let checkResult = await checkTowerWar(roleId, battleId, seqIds, heroes);
if (checkResult.status == -1) { if (checkResult.status == -1) {
return checkResult.resResult return checkResult.resResult
} }
game-server/app/services/battleService.ts
+7 -4
View File
@@ -140,7 +140,7 @@ export async function checkTaskRewards(roleId: string, batchCode: string, tasks:
return { compTasks, rewards }; return { compTasks, rewards };
} }
export async function checkTowerWar(roleId: string, battleId: number, heroes: Array<number>) { export async function checkTowerWar(roleId: string, battleId: number, seqIds: number[], heroes: Array<number>) {
let { towerLv } = await RoleModel.findByRoleId(roleId); let { towerLv } = await RoleModel.findByRoleId(roleId);
const towerInfo = gameData.tower.get(towerLv); const towerInfo = gameData.tower.get(towerLv);
if (!towerInfo) { if (!towerInfo) {
@@ -160,14 +160,15 @@ export async function checkTowerWar(roleId: string, battleId: number, heroes: Ar
let { heroes: recHeroes = [], warStatus = [] } = tower; let { heroes: recHeroes = [], warStatus = [] } = tower;
let dicWar = gameData.war.get(battleId); let dicWar = gameData.war.get(battleId);
let { fobiddenCharactor } = dicWar; let { fobiddenCharactor } = dicWar;
for (let hid of heroes) { for (let hid of seqIds) {
if (recHeroes.indexOf(hid) !== -1) { if (recHeroes.indexOf(hid) !== -1) {
return { status: -1, resResult: resResult(STATUS.TOWER_DUPLICATE_HERO) }; return { status: -1, resResult: resResult(STATUS.TOWER_DUPLICATE_HERO) };
} }
}
for(let hid of heroes) {
if(checkForbiddenChar(hid, fobiddenCharactor)) { if(checkForbiddenChar(hid, fobiddenCharactor)) {
return { status: -1, resResult: resResult(STATUS.TOWER_HERO_FORBIDDEN) }; return { status: -1, resResult: resResult(STATUS.TOWER_HERO_FORBIDDEN) };
} }
} }
const curWarStatus = warStatus.find(elem => elem.warId == battleId); const curWarStatus = warStatus.find(elem => elem.warId == battleId);
if (curWarStatus && curWarStatus.status) { if (curWarStatus && curWarStatus.status) {
@@ -208,11 +209,13 @@ export async function towerBattleEnd(sid: string, funcs: number[], roleId: strin
if (battleRec.battleId != battleId) { if (battleRec.battleId != battleId) {
return { status: -1, resResult: resResult(STATUS.BATTLE_ID_NOT_MATCH) }; return { status: -1, resResult: resResult(STATUS.BATTLE_ID_NOT_MATCH) };
} }
let { towerLv, roleName } = await RoleModel.findByRoleId(roleId); let { towerLv, roleName } = await RoleModel.findByRoleId(roleId);
let { warStatus, heroes: recHeroes } = await TowerRecordModel.getRecordByLv(roleId, towerLv); let { warStatus, heroes: recHeroes } = await TowerRecordModel.getRecordByLv(roleId, towerLv);
console.log('*******', towerLv, heroes.join(), recHeroes.join())
for (let hid of heroes) { for (let hid of heroes) {
if (recHeroes.indexOf(hid) !== -1) { if (recHeroes.indexOf(hid) !== -1) {
return { status: -1, resResult: resResult(STATUS.TOWER_DUPLICATE_CHALLENGE) }; return { status: -1, resResult: resResult(STATUS.TOWER_DUPLICATE_HERO) };
} }
} }