挑战次数恢复上线

game-server/app/services/pvpService.ts

@@ -17,6 +17,7 @@ import { HeroesRecord } from '../db/PvpRecord';
 import { HeroModel, HeroType } from '../db/Hero';
 import { CeAttrNumber, CeAttr, CeAttrRole } from '../db/generalField';
 import { DicWarJson } from '../pubUtils/dictionary/DicWarJson';
+import { OutliningSpanKind } from 'typescript';
 const _ = require('underscore');
 
 
@@ -36,7 +37,7 @@ export async function initPvpInfo(role: RoleType) {
     }
     //初始化对手人阵容
     let oppPlayers: Array<OppPlayers> = await refreshEnemies(role, 0, 1);
-    let {warId, seasonNum, seasonEndTime} = await SystemConfigModel.findSystemConfig();
+    let {seasonNum, seasonEndTime} = await SystemConfigModel.findSystemConfig();
     let challengeCnt = PVP.PVP_CHALLENGE_COUNTS;
     let result = await PvpDefenseModel.createPvpDefense({ roleId: role.roleId, roleName: role.roleName, role: role._id, heroes, oppPlayers, defCe: role.topFiveCe, seasonNum, seasonEndTime, challengeCnt });
 
@@ -77,7 +78,7 @@ export async function getEnemies(oppPlayers: OppPlayers[], winStreakNum: number)
         } else {
             let opp = <PvpDefenseType>oppDef;
             let role = <RoleType>opp.role;
-            let { roleId, roleName, headHid, sHid } = role;
+            let { roleId, roleName, headHid, sHid, lv } = role;
             let { pLv, defCe } = opp;
             let rankLv = await getMyRank(REDIS_KEY.PVP_RANK, 0, roleId);
             result.push({
@@ -289,6 +290,7 @@ export function refresh(challengeCnt: number, challengeRefTime: number, seasonEn
         challengeCnt += num;
         challengeRefTime = challengeRefTime + period * num;
     } 
+    challengeCnt = challengeCnt > PVP.PVP_CHALLENGE_COUNTS?PVP.PVP_CHALLENGE_COUNTS:challengeCnt;
     return {challengeCnt, challengeRefTime};
 }