diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts index c53d3932c..c1f7b3569 100644 --- a/game-server/app/servers/battle/handler/pvpHandler.ts +++ b/game-server/app/servers/battle/handler/pvpHandler.ts @@ -23,7 +23,7 @@ export class PvpHandler { let serverId = session.get('serverId'); let result = await PvpDefenseModel.findByRoleIdIncludeAll(roleId); let system = await SystemConfigModel.findSystemConfig(); - + return resResult(STATUS.SUCCESS, { data: result }); } } diff --git a/shared/consts/constModules/itemConst.ts b/shared/consts/constModules/itemConst.ts index eb0c7d1cc..c90915c10 100644 --- a/shared/consts/constModules/itemConst.ts +++ b/shared/consts/constModules/itemConst.ts @@ -37,8 +37,8 @@ export enum PVP_PLAYER_POS { } export enum PVP_HERO_POS { - START = 1, - END = 5 + START = 2001, + END = 2009 } export enum EQUIP_TYPE { diff --git a/shared/db/PvpDefense.ts b/shared/db/PvpDefense.ts index 9a6fb8cd2..13be46dfb 100644 --- a/shared/db/PvpDefense.ts +++ b/shared/db/PvpDefense.ts @@ -13,7 +13,7 @@ export class Heroes { @prop({ required: true }) ce: number; // 战斗力 @prop({ required: true }) - pos: number; + dataId: number; @prop({ required: true }) order: number; } @@ -34,7 +34,7 @@ function getInitialOppHeros() { let heros = new Array(); for(let i = PVP_HERO_POS.START; i <= PVP_HERO_POS.END; i++) { let p = new Heroes(); - p.pos = i; + p.dataId = i; p.order = i; heros.push(p); } @@ -96,6 +96,15 @@ export default class PvpDefense extends BaseModel { heroScores: Array; @prop({ required: true, default: true }) isDefaultHero: boolean; + @prop({ required: true, default: 0 }) + refOppCnt: number; // 刷新对手总次数,消耗可根据消耗表算出 + @prop({ required: true, default: 0 }) + challengeCnt: number; // 可挑战次数 + @prop({ required: true, default: 0 }) + challengeRefTime: number; // 上一次刷新的时间 + @prop({ required: true, default: [] }) + receivedBox: Array; + public static async findByRoleId(roleId: string, lean = true) { const result: PvpDefenseType = await PvpDefenseModel.findOne({ roleId }).lean(lean); return result; diff --git a/shared/pubUtils/pvpUtil.ts b/shared/pubUtils/pvpUtil.ts index 9c7c31c2f..256e4ec7d 100644 --- a/shared/pubUtils/pvpUtil.ts +++ b/shared/pubUtils/pvpUtil.ts @@ -3,18 +3,20 @@ */ import { PvpDefenseModel, Heroes, OppPlayers } from '../db/pvpDefense'; import { RoleType } from '../db/Role'; +import { PVP_PLAYER_POS, PVP_HERO_POS } from '../consts'; + export async function initPvpInfo(role: RoleType) { let heroes: Array = []; //初始化最强5人阵容 - for (let i = 1; i <= role.topFive.length; i++) { - let item = role.topFive[i - 1]; + for (let i = 0; i < role.topFive.length; i++) { + let item = role.topFive[i]; if (item.hid) { heroes.push({ actorId: item.hid, hero: item.hero, ce: item.ce, - pos: i, - order: i, + dataId: PVP_HERO_POS.START + i, + order: i + 1, }); } }