pvp: 更改pvpdefense结构

shared/pubUtils/data.ts

@@ -38,7 +38,6 @@ import { dicHeroScroll, preHeroScroll, loadHeroScroll } from './dictionary/DicHe
 import { dicPvpOpponent, loadPvpOpponent } from './dictionary/DicPvpOpponent';
 import { dicPvpTeamLevel, loadPvpTeamLevel } from './dictionary/DicPvpTeamLevel';
 import { dicPvpRefreshConsume, maxPvpRefreshCnt, loadPvpRefreshConsume } from './dictionary/DicPvpRefreshConsume';
-import { dicGkPvp, dicGkPvps, loadGkPvp } from './dictionary/DicGkPvp';
 import { dicHeroRewads, loadPvpHeroReward } from './dictionary/DicPvpHeroReward';
 import { dicRankRewads, dicRankMax, loadPvpRankReward } from './dictionary/DicPvpRankReward';
 import { dicPvpBoxs, loadPvpBox } from './dictionary/DicPvpBox';
@@ -153,8 +152,6 @@ export const gameData = {
     pvpWar: dicWarPvp,
     pvpRefreshConsume: dicPvpRefreshConsume,
     maxPvpRefreshCnt: maxPvpRefreshCnt,
-    pvpGk: dicGkPvp,
-    pvpGks: dicGkPvps,
     pvpHeroRewards: dicHeroRewads,
     pvpRankRewards: dicRankRewads,
     pvpBoxs: dicPvpBoxs,
@@ -450,21 +447,22 @@ export function getPLvByScore(score: number) {
     return lv;
 }
 
-export function getPvpGkByWarId(warId: number) {
-    return gameData.pvpGk.get(warId);
+export function getPvpHeroRewardsByScore(score: number) {
+    for (let item of gameData.pvpHeroRewards) {
+        if ((item.max >= score || item.max == -1) && score >= item.min) {
+            return item;
+        }
+    }
+    return null
 }
 
-export function getPvpGkWarIds() {
-    let warIds = gameData.pvpGks;
-    return warIds;
-}
-
-export function getPvpHeroRewards() {
-    return gameData.pvpHeroRewards;
-}
-
-export function getPvpRankRewards() {
-    return gameData.pvpRankRewards;
+export function getPvpRankRewardsByRank(rankLv: number) {
+    for (let item of gameData.pvpRankRewards) {
+        if ((item.max >= rankLv || item.max == -1) && rankLv >= item.min) {
+            return item;
+        }
+    }
+    return gameData.pvpRankMax.max;
 }
 
 export function getPvpBoxs() {
@@ -876,7 +874,6 @@ function loadDatas() {
     loadPvpOpponent();
     loadPvpTeamLevel();
     loadPvpRefreshConsume();
-    loadGkPvp();
     loadPvpHeroReward();
     loadPvpRankReward();
     loadPvpBox();

shared/pubUtils/dictionary/DicGkPvp.ts

@@ -1,23 +0,0 @@
-import { readFileAndParse } from '../util'
-import { FILENAME } from '../../consts'
-
-export interface DicGkPvp {
-    readonly war_id: number;
-    readonly dispatchJsonId: number;
-    readonly bg_img_id: number;
-    readonly warType: number;
-}
-
-export const dicGkPvp = new Map<number, DicGkPvp>();
-export const dicGkPvps = new Array<number>();
-export function loadGkPvp() {
-    dicGkPvp.clear();
-    dicGkPvps.splice(0, dicGkPvps.length);
-    let arr = readFileAndParse(FILENAME.DIC_GK_PVP);
-
-    arr.forEach(o => {
-        dicGkPvp.set(o.war_id, o);
-        dicGkPvps.push(o.war_id);
-    });
-    arr = undefined;
-}

shared/pubUtils/dictionary/DicWarJson.ts

@@ -1,5 +1,5 @@
 // 关卡表
-import {decodeArrayListStr, readWarJsonFileAndParse} from '../util'
+import {decodeArrayListStr, parseNumberList, readWarJsonFileAndParse} from '../util'
 
 export interface DicWarJson {
 
@@ -47,6 +47,8 @@ export interface DicWarJson {
     readonly callSkillData: string;
     // 敌军数量
     readonly enemyCount: number;
+    // pvp中随机敌军
+    readonly randomEnemy: number[];
 }
 
 export const dicWarJson = new Map<number, Array<DicWarJson>>();
@@ -63,6 +65,7 @@ export function loadWarJson() {
             if(o.relation == 2) enemyCount++;
         });
         arr.forEach(o => {
+            o.randomEnemy = parseNumberList(o.randomEnemy);
             o.enemyCount = enemyCount;
             warjson.push(o);
         });

shared/pubUtils/interface.ts

@@ -29,20 +29,6 @@ export interface SclResultInter {
     position: SclPosInter[]
 }
 
-// pvp对手返回
-export interface oppPlayersInter {
-    pos: number; // 对手位置
-    roleId: string; // 对手玩家id
-    roleName: string; // 对手玩家名
-    head: number; // 头像
-    frame: number; // 相框
-    spine: number; // 形象
-    pLv: number; // 对手队伍等级
-    defCe: number; // 防守阵容战力
-    addScore: number; // 战胜后可获军功
-    plusScore: number; // 连胜加成军功
-    rankLv: number;
-}
 
 export interface pvpEndParamInter {
     hid: number;