添加刷新消耗

game-server/app/services/pvpService.ts

@@ -3,10 +3,10 @@
  */
 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 { PVP_HERO_POS, ROBOT_NAME, REDIS_KEY, PVP_CONST } from '../consts';
 import { setPvpDefResult } from '../services/timeTaskService';
 import { dicPvpOpponent, DicPvpOpponent } from "../pubUtils/dictionary/DicPvpOpponent";
-import { getRandomIndexByLen, genCode, getRandomByLen } from '../pubUtils/util';
+import { getRandomIndexByLen, genCode, getRandomByLen, shouldRefresh } from '../pubUtils/util';
 import { oppPlayersInter, RankParam } from '../pubUtils/interface';
 import { gameData, getPLvByScore } from "../pubUtils/data";
 import { PVP } from '../pubUtils/dicParam';
@@ -267,3 +267,15 @@ export async function findPvpDefByRoleId(roleId: string) {
         return {pvpDefense, warId};
     }
 }
+
+// 获取刷新对手次数及消耗
+export function getRefOppCnt(refOppCnt: number, refOppTime: Date) {
+    let curTime = new Date();
+    if(shouldRefresh(refOppTime, curTime, PVP_CONST.REFRESH_TIME)) {
+        refOppCnt = 0; refOppTime = curTime;
+    }
+    return {
+        refOppCnt, refOppTime,
+        consume: gameData.pvpRefreshConsume.get(refOppCnt + 1)
+    }
+}

game-server/app/services/timeTaskService.ts

@@ -7,8 +7,11 @@ import { SystemConfigModel } from '../db/SystemConfig';
 import PvpDefenseType,{ PvpDefenseModel } from '../db/PvpDefense';
 import { PVP } from '../pubUtils/dicParam';
 import { nowSeconds, getTodayZeroPoint } from '../pubUtils/timeUtil';
-import { getPvpGkWarIds, getPvpRankRewards, getPvpHeroRewards, getPLvByScore } from '../pubUtils/data';
+import { getPvpGkWarIds, getPvpRankRewards, getPvpHeroRewards } from '../pubUtils/data';
 import { getRandomArr } from '../pubUtils/util';
+import { getLvByScore } from './pvpService';
+import { getMyRank } from './redisService';
+import { REDIS_KEY } from '../consts';
 const _ = require('underscore');
 const PER_SECOND = 1 * 1000;
 const PER_DAY = 24 * 60 * 60;
@@ -51,18 +54,22 @@ export async function setPvpDefResult(pvpDefense: PvpDefenseType, seasonNum: num
     let pvpRankRewards = getPvpRankRewards();
     let pvpHeroRewards = getPvpHeroRewards();
     let goods = [];
-    let rankLv = 0;//TODO 排行榜
+    let rankLv = await getMyRank(REDIS_KEY.PVP_RANK, 0, pvpDefense.roleId);// 排行榜排名
     let pvpRankReward = getScore(pvpRankRewards, rankLv);
-    goods = goods.concat(pvpRankReward.reward);
+    if(pvpRankReward) {
+        goods = goods.concat(pvpRankReward.reward);
+    }
     let score = 0
     for (let i = 0; i < pvpDefense.heroScores.length; i++) {
         let heroScore = pvpDefense.heroScores[i];
         let pvpHeroReward = getScore(pvpHeroRewards, heroScore.score);
-        goods = goods.concat(pvpHeroReward.reward);
-        heroScore.score = pvpHeroReward.heroscore;
+        if(pvpHeroReward) {
+            goods = goods.concat(pvpHeroReward.reward);
+            heroScore.score = pvpHeroReward.heroscore;
+        }
         score += heroScore.score; 
     }
-    let pLv = getPLvByScore(score);
+    let pLv = getLvByScore(pvpDefense.heroScores);
     pvpDefense = await PvpDefenseModel.updateInfo(pvpDefense.roleId, {score:score, pLv, heroScores: pvpDefense.heroScores, winStreakNum:0, seasonNum, refOppCnt:0, challengeCnt:PVP.PVP_CHALLENGE_COUNTS, challengeRefTime:0, seasonEndTime});
     //TODO 下发邮件
     return pvpDefense;
@@ -91,7 +98,7 @@ async function setNextPvpTime() {
 
 function getScore(arr, score) {
     for (let item of arr) {
-        if (item.max >= score && score < item.min) {
+        if ((item.max >= score||item.max == -1) && score >= item.min) {
             return item;
         }
     }