获得战报，刷新，领取

game-server/app/services/pvpService.ts

@@ -4,7 +4,7 @@
 import { PvpDefenseModel, Heroes, OppPlayers, Robot, PvpDefenseType, HeroScores } from '../db/PvpDefense';
 import { RoleType } from '../db/Role';
 import { PVP_HERO_POS, ROBOT_NAME, REDIS_KEY } from '../consts';
-
+import { setPvpDefResult } from '../services/timeTaskService';
 import { dicPvpOpponent, DicPvpOpponent } from "../pubUtils/dictionary/DicPvpOpponent";
 import { getRandomIndexByLen, genCode, getRandomByLen } from '../pubUtils/util';
 import { oppPlayersInter, RankParam } from '../pubUtils/interface';
@@ -12,6 +12,7 @@ import { gameData, getPLvByScore } from "../pubUtils/data";
 import { PVP } from '../pubUtils/dicParam';
 import { SystemConfigModel } from '../db/SystemConfig'
 import { setRank, getMyRank } from './redisService';
+import { nowSeconds, checkTodayTime } from '../pubUtils/timeUtil';
 const _ = require('underscore');
 
 
@@ -31,9 +32,9 @@ export async function initPvpInfo(role: RoleType) {
     }
     //初始化对手人阵容
     let oppPlayers: Array<OppPlayers> = await refreshEnemies(role, 0, 1);
-    let {warId, seasonNum } = await SystemConfigModel.findSystemConfig();
+    let {warId, 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, warId, challengeCnt });
+    let result = await PvpDefenseModel.createPvpDefense({ roleId: role.roleId, roleName: role.roleName, role: role._id, heroes, oppPlayers, defCe: role.topFiveCe, seasonNum, seasonEndTime, challengeCnt });
 
     //加入排行榜 
     let { roleId, roleName, lv, vLv, headHid, sHid, title  } = role;
@@ -185,7 +186,7 @@ export function getLvByScore(heroScores: HeroScores[]) {
     return getPLvByScore(score);
 }
 
-export async function defaultHeroes ( role:RoleType) {
+export async function defaultHeroes ( role:RoleType, challengeCnt?:number, challengeRefTime?:number,) {
     let { heroes } = await PvpDefenseModel.findByRoleId(role.roleId);
     heroes.sort(function(a, b) {
         return a.ce + a.dataId - b.ce + b.dataId;
@@ -214,6 +215,55 @@ export async function defaultHeroes ( role:RoleType) {
         }
         defCe += item.ce;
     }
-    let { heroes: resHeroes} = await PvpDefenseModel.updateInfo(role.roleId, {defCe, heroes});
-    return { resHeroes};
-}
+    if (!!challengeCnt && !!challengeRefTime) {
+        let { heroes: resHeroes} = await PvpDefenseModel.updateInfo(role.roleId, {defCe, heroes, challengeCnt, challengeRefTime});
+        return { resHeroes};
+    } else {
+        let { heroes: resHeroes} = await PvpDefenseModel.updateInfo(role.roleId, {defCe, heroes});
+        return { resHeroes};
+    }
+}
+
+export function refresh(challengeCnt: number, challengeRefTime: number, seasonEndTime: number) {
+    if (challengeCnt >= PVP.PVP_CHALLENGE_COUNTS) {
+        return {challengeCnt, challengeRefTime};
+    }
+    let period = PVP.PVP_CHALLENGE_NORMALTIMES;
+    if (checkTodayTime(seasonEndTime)) {
+        period = PVP.PVP_CHALLENGE_FINALTIMES;
+    }
+    let time = nowSeconds();
+    let num = Math.floor(( time - challengeRefTime)/period);
+    if (num > 0) {
+        challengeCnt += num;
+        challengeRefTime = challengeRefTime + period * num;
+    } 
+    return {challengeCnt, challengeRefTime};
+}
+
+export function comsumeChallengeCnt( challengeCnt: number, challengeRefTime: number, seasonEndTime:number ) {
+    challengeCnt--;
+    if (challengeCnt >= PVP.PVP_CHALLENGE_COUNTS) {
+        return {challengeCnt, challengeRefTime};
+    }
+    if (challengeCnt == PVP.PVP_CHALLENGE_COUNTS - 1) {
+        challengeRefTime = nowSeconds();
+        return {challengeCnt, challengeRefTime};
+    }
+    return refresh(challengeCnt, challengeRefTime, seasonEndTime);
+}
+
+export async function findPvpDefByRoleId(roleId: string) {
+    let pvpDefense = await PvpDefenseModel.findByRoleId(roleId);
+    let {warId, seasonNum, seasonEndTime} = await SystemConfigModel.findSystemConfig();
+    if (pvpDefense.seasonNum !== seasonNum) {
+        let newPvpDefense = await setPvpDefResult(pvpDefense, seasonNum, seasonEndTime);
+        return {pvpDefense: newPvpDefense, warId};
+    } else {
+        let {challengeCnt, challengeRefTime} = refresh(pvpDefense.challengeCnt, pvpDefense.challengeRefTime, pvpDefense.seasonEndTime)
+        if (challengeCnt != pvpDefense.challengeCnt) {
+            pvpDefense = await PvpDefenseModel.updateInfo( roleId, { challengeCnt, challengeRefTime});
+        }
+        return {pvpDefense, warId};
+    }
+}