diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts index c9ac6c2b1..402dd289c 100644 --- a/game-server/app/servers/battle/handler/pvpHandler.ts +++ b/game-server/app/servers/battle/handler/pvpHandler.ts @@ -103,7 +103,6 @@ export class PvpHandler { seasonEndTime = oldSeasonData.seasonEndTime; heroScores = oldSeasonData.heroScores; score = oldSeasonData.score; - winStreakNum = oldSeasonData.winStreakNum; refOppCnt = oldSeasonData.refOppCnt; challengeCnt = oldSeasonData.challengeCnt; challengeRefTime = oldSeasonData.challengeRefTime; @@ -286,8 +285,6 @@ export class PvpHandler { score, pLv, myRank, hisScore, heroScores: showHeroScores, oppPlayers: result, - seasonNum: pvpDefense.seasonNum, - seasonEndTime: pvpDefense.seasonEndTime, refOppCnt: pvpDefense.refOppCnt, challengeCnt: pvpDefense.challengeCnt, challengeRefTime: pvpDefense.challengeRefTime, diff --git a/game-server/app/services/timeTaskService.ts b/game-server/app/services/timeTaskService.ts index edb43c1f8..6ddc0a485 100644 --- a/game-server/app/services/timeTaskService.ts +++ b/game-server/app/services/timeTaskService.ts @@ -69,8 +69,8 @@ export async function setPvpDefResultOnTime(pvpDefense: PvpDefenseType, seasonNu if (!role) { return; } - let { score, pLv, heroScores, winStreakNum, challengeCnt, challengeRefTime, goods } = await checkResult(pvpDefense, seasonNum, seasonEndTime); - pvpDefense = await PvpDefenseModel.updateInfo(pvpDefense.roleId, {score, pLv, heroScores, winStreakNum, seasonNum, challengeCnt, challengeRefTime, seasonEndTime}); + let { score, pLv, heroScores, challengeCnt, challengeRefTime, goods } = await checkResult(pvpDefense, seasonNum, seasonEndTime); + pvpDefense = await PvpDefenseModel.updateInfo(pvpDefense.roleId, {score, pLv, heroScores, seasonNum, challengeCnt, challengeRefTime, seasonEndTime}); let { roleName, lv, vLv, headHid, sHid, title } = role; let params = new RankParam(roleName, lv, vLv, headHid, sHid, title); 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 rankLv = await getMyRank(REDIS_KEY.PVP_RANK, 0, pvpDefense.roleId);// 排行榜排名 let oldPLv = getLvByScore(pvpDefense.heroScores); - let { winStreakNum, challengeCnt, challengeRefTime } = pvpDefense; + let { challengeCnt, challengeRefTime } = pvpDefense; let pvpRankReward = getScore(pvpRankRewards, rankLv); let rankGoods = []; if(pvpRankReward) { @@ -119,10 +119,10 @@ export async function checkResult(pvpDefense: PvpDefenseType, seasonNum: number, } let pLv = getLvByScore(pvpDefense.heroScores); 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 }, 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) { @@ -130,8 +130,8 @@ export async function setPvpDefResult(pvpDefense: PvpDefenseType, seasonNum: num if (!role) { return; } - let {score, pLv, heroScores, winStreakNum, challengeCnt, challengeRefTime, goods } = await checkResult(pvpDefense, seasonNum, seasonEndTime); - pvpDefense = await PvpDefenseModel.updateInfo(pvpDefense.roleId, {score, pLv, heroScores, winStreakNum, seasonNum, challengeCnt, challengeRefTime, seasonEndTime}); + let {score, pLv, heroScores, challengeCnt, challengeRefTime, goods } = await checkResult(pvpDefense, seasonNum, seasonEndTime); + pvpDefense = await PvpDefenseModel.updateInfo(pvpDefense.roleId, {score, pLv, heroScores, seasonNum, challengeCnt, challengeRefTime, seasonEndTime}); let { roleName, lv, vLv, headHid, sHid, title , roleId } = role; let params = new RankParam(roleName, lv, vLv, headHid, sHid, title); setRank(REDIS_KEY.PVP_RANK, 0, pvpDefense.roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), params);