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

pvp：修复保存最强防守阵容位置无效bug

Browse Source
This commit is contained in:
luying
2021-03-10 18:16:02 +08:00
parent 841ede8735
commit f240cc3cb8
2 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/battle/handler/pvpHandler.ts
+42 -32
View File
@@ -316,41 +316,51 @@ export class PvpHandler {
let { challengeCnt, challengeRefTime } = refresh(lastChallengeCnt, lastChallengeRefTime, seasonEndTime); let { challengeCnt, challengeRefTime } = refresh(lastChallengeCnt, lastChallengeRefTime, seasonEndTime);
if (!!isDefaultHero) { if (!!isDefaultHero) {
let role = await RoleModel.findByRoleId(roleId); let { topLineup } = await RoleModel.findByRoleId(roleId);
let { resHeroes } = await defaultHeroes(role, challengeCnt, challengeRefTime, true); let hids = topLineup.filter(cur => {
return resResult(STATUS.SUCCESS, { heroes: resHeroes, challengeCnt, challengeRefTime, isDefaultHero} ); return !heroes.find(ccur => ccur.actorId == cur.hid);
} else { }).map(cur => cur.hid);
for (let dataId = PVP_HERO_POS.START; dataId <= PVP_HERO_POS.END; dataId++) { for(let hero of heroes) {
let index = findIndex(heroes, {dataId}); if(hero.actorId) {
let defIndex = findIndex(defHeros, {dataId}); let isInTop = topLineup.find(cur => cur.hid == hero.actorId);
if (defIndex == -1) { if(!isInTop) {
defIndex = defHeros.length; hero.actorId = hids.shift();
defHeros.push({actorId:0, order:0,ce:0, hero:null,dataId}); }
} }
if (index == -1) {
defHeros[defIndex].actorId = 0;
defHeros[defIndex].order = 0;
defHeros[defIndex].ce = 0;
defHeros[defIndex].hero = null;
defHeros[defIndex].dataId = dataId;
continue;
}
if (heroes[index].order < 1 || heroes[index].order > LINEUP_NUM) {
return resResult(STATUS.WRONG_PARMS);
}
let hero = await HeroModel.findByHidAndRole(heroes[index].actorId, roleId);
if (!hero) {
continue;
}
defHeros[defIndex].actorId = heroes[index].actorId;
defHeros[defIndex].order = heroes[index].order;
defHeros[defIndex].ce = hero.ce;
defHeros[defIndex].hero = hero._id;
defCe += hero.ce;
} }
let { heroes: resHeroes } = await PvpDefenseModel.updateInfo(roleId, {defCe, heroes: defHeros, challengeCnt, challengeRefTime, isDefaultHero });
return resResult(STATUS.SUCCESS, { heroes: resHeroes, challengeCnt, challengeRefTime, isDefaultHero });
} }
for (let dataId = PVP_HERO_POS.START; dataId <= PVP_HERO_POS.END; dataId++) {
let index = findIndex(heroes, {dataId});
let defIndex = findIndex(defHeros, {dataId});
if (defIndex == -1) {
defIndex = defHeros.length;
defHeros.push({actorId:0, order:0,ce:0, hero:null,dataId});
}
if (index == -1) {
defHeros[defIndex].actorId = 0;
defHeros[defIndex].order = 0;
defHeros[defIndex].ce = 0;
defHeros[defIndex].hero = null;
defHeros[defIndex].dataId = dataId;
continue;
}
if (heroes[index].order < 1 || heroes[index].order > LINEUP_NUM) {
return resResult(STATUS.WRONG_PARMS);
}
let hero = await HeroModel.findByHidAndRole(heroes[index].actorId, roleId);
if (!hero) {
continue;
}
defHeros[defIndex].actorId = heroes[index].actorId;
defHeros[defIndex].order = heroes[index].order;
defHeros[defIndex].ce = hero.ce;
defHeros[defIndex].hero = hero._id;
defCe += hero.ce;
}
let { heroes: resHeroes } = await PvpDefenseModel.updateInfo(roleId, {defCe, heroes: defHeros, challengeCnt, challengeRefTime, isDefaultHero });
return resResult(STATUS.SUCCESS, { heroes: resHeroes, challengeCnt, challengeRefTime, isDefaultHero });
} }
async getRank(msg: {}, session: BackendSession) { async getRank(msg: {}, session: BackendSession) {
shared/resource/jsons/dic_email_content.json
+5
View File
@@ -1,4 +1,9 @@
[ [
{
"id": 0,
"content": "%d",
"time": 24
},
{ {
"id": 1, "id": 1,
"content": "您对军团%d的申请被拒绝", "content": "您对军团%d的申请被拒绝",