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

战斗结束，赛季不变bug修复

Browse Source
This commit is contained in:
mamengke01
2021-01-14 20:43:10 +08:00
parent 5f8a7c0adc
commit 94540dab16
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/battle/handler/pvpHandler.ts
-3
View File
@@ -103,7 +103,6 @@ export class PvpHandler {
seasonEndTime = oldSeasonData.seasonEndTime; seasonEndTime = oldSeasonData.seasonEndTime;
heroScores = oldSeasonData.heroScores; heroScores = oldSeasonData.heroScores;
score = oldSeasonData.score; score = oldSeasonData.score;
winStreakNum = oldSeasonData.winStreakNum;
refOppCnt = oldSeasonData.refOppCnt; refOppCnt = oldSeasonData.refOppCnt;
challengeCnt = oldSeasonData.challengeCnt; challengeCnt = oldSeasonData.challengeCnt;
challengeRefTime = oldSeasonData.challengeRefTime; challengeRefTime = oldSeasonData.challengeRefTime;
@@ -286,8 +285,6 @@ export class PvpHandler {
score, pLv, myRank, hisScore, score, pLv, myRank, hisScore,
heroScores: showHeroScores, heroScores: showHeroScores,
oppPlayers: result, oppPlayers: result,
seasonNum: pvpDefense.seasonNum,
seasonEndTime: pvpDefense.seasonEndTime,
refOppCnt: pvpDefense.refOppCnt, refOppCnt: pvpDefense.refOppCnt,
challengeCnt: pvpDefense.challengeCnt, challengeCnt: pvpDefense.challengeCnt,
challengeRefTime: pvpDefense.challengeRefTime, challengeRefTime: pvpDefense.challengeRefTime,
game-server/app/services/timeTaskService.ts
+7 -7
View File
@@ -69,8 +69,8 @@ export async function setPvpDefResultOnTime(pvpDefense: PvpDefenseType, seasonNu
if (!role) { if (!role) {
return; return;
} }
let { score, pLv, heroScores, winStreakNum, challengeCnt, challengeRefTime, goods } = await checkResult(pvpDefense, seasonNum, seasonEndTime); let { score, pLv, heroScores, challengeCnt, challengeRefTime, goods } = await checkResult(pvpDefense, seasonNum, seasonEndTime);
pvpDefense = await PvpDefenseModel.updateInfo(pvpDefense.roleId, {score, pLv, heroScores, winStreakNum, seasonNum, challengeCnt, challengeRefTime, seasonEndTime}); pvpDefense = await PvpDefenseModel.updateInfo(pvpDefense.roleId, {score, pLv, heroScores, seasonNum, challengeCnt, challengeRefTime, seasonEndTime});
let { roleName, lv, vLv, headHid, sHid, title } = role; let { roleName, lv, vLv, headHid, sHid, title } = role;
let params = new RankParam(roleName, lv, vLv, headHid, sHid, title); let params = new RankParam(roleName, lv, vLv, headHid, sHid, title);
setRank(REDIS_KEY.PVP_RANK, 0, pvpDefense.roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), params); setRank(REDIS_KEY.PVP_RANK, 0, pvpDefense.roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), params);
@@ -92,7 +92,7 @@ export async function checkResult(pvpDefense: PvpDefenseType, seasonNum: number,
let goods = []; let goods = [];
let rankLv = await getMyRank(REDIS_KEY.PVP_RANK, 0, pvpDefense.roleId);// 排行榜排名 let rankLv = await getMyRank(REDIS_KEY.PVP_RANK, 0, pvpDefense.roleId);// 排行榜排名
let oldPLv = getLvByScore(pvpDefense.heroScores); let oldPLv = getLvByScore(pvpDefense.heroScores);
let { winStreakNum, challengeCnt, challengeRefTime } = pvpDefense; let { challengeCnt, challengeRefTime } = pvpDefense;
let pvpRankReward = getScore(pvpRankRewards, rankLv); let pvpRankReward = getScore(pvpRankRewards, rankLv);
let rankGoods = []; let rankGoods = [];
if(pvpRankReward) { if(pvpRankReward) {
@@ -119,10 +119,10 @@ export async function checkResult(pvpDefense: PvpDefenseType, seasonNum: number,
} }
let pLv = getLvByScore(pvpDefense.heroScores); let pLv = getLvByScore(pvpDefense.heroScores);
await PvpSeasonResultModel.updatePvpSeasonResult(pvpDefense.roleId, { await PvpSeasonResultModel.updatePvpSeasonResult(pvpDefense.roleId, {
oldSeasonData:{refOppCnt: pvpDefense.refOppCnt, rankLv, score: pvpDefense.score, pLv: oldPLv, heroScores: deepCopy(pvpDefense.heroScores), winStreakNum, oldSeasonData:{refOppCnt: pvpDefense.refOppCnt, rankLv, score: pvpDefense.score, pLv: oldPLv, heroScores: deepCopy(pvpDefense.heroScores),
seasonNum: pvpDefense.seasonNum, challengeCnt, challengeRefTime, seasonEndTime: pvpDefense.seasonEndTime seasonNum: pvpDefense.seasonNum, challengeCnt, challengeRefTime, seasonEndTime: pvpDefense.seasonEndTime
}, heroGoods, rankGoods, show: true}); }, heroGoods, rankGoods, show: true});
return { rankLv, score, pLv, heroScores: pvpDefense.heroScores, winStreakNum:0, seasonNum, challengeCnt:PVP.PVP_CHALLENGE_COUNTS, challengeRefTime:0, seasonEndTime, goods}; return { rankLv, score, pLv, heroScores: pvpDefense.heroScores, seasonNum, challengeCnt:PVP.PVP_CHALLENGE_COUNTS, challengeRefTime:0, seasonEndTime, goods};
} }
export async function setPvpDefResult(pvpDefense: PvpDefenseType, seasonNum: number, seasonEndTime:number) { export async function setPvpDefResult(pvpDefense: PvpDefenseType, seasonNum: number, seasonEndTime:number) {
@@ -130,8 +130,8 @@ export async function setPvpDefResult(pvpDefense: PvpDefenseType, seasonNum: num
if (!role) { if (!role) {
return; return;
} }
let {score, pLv, heroScores, winStreakNum, challengeCnt, challengeRefTime, goods } = await checkResult(pvpDefense, seasonNum, seasonEndTime); let {score, pLv, heroScores, challengeCnt, challengeRefTime, goods } = await checkResult(pvpDefense, seasonNum, seasonEndTime);
pvpDefense = await PvpDefenseModel.updateInfo(pvpDefense.roleId, {score, pLv, heroScores, winStreakNum, seasonNum, challengeCnt, challengeRefTime, seasonEndTime}); pvpDefense = await PvpDefenseModel.updateInfo(pvpDefense.roleId, {score, pLv, heroScores, seasonNum, challengeCnt, challengeRefTime, seasonEndTime});
let { roleName, lv, vLv, headHid, sHid, title , roleId } = role; let { roleName, lv, vLv, headHid, sHid, title , roleId } = role;
let params = new RankParam(roleName, lv, vLv, headHid, sHid, title); let params = new RankParam(roleName, lv, vLv, headHid, sHid, title);
setRank(REDIS_KEY.PVP_RANK, 0, pvpDefense.roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), params); setRank(REDIS_KEY.PVP_RANK, 0, pvpDefense.roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), params);