diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts index f785112b6..829a2793e 100644 --- a/game-server/app/services/pvpService.ts +++ b/game-server/app/services/pvpService.ts @@ -201,7 +201,7 @@ async function generPlayerOppHis(pvpdefense: PvpDefenseType, roleId: string, pos if (warJson && warJson.relation == 2) { let heroInfo = new PvpHeroInfo(); heroInfo.setHeroInfo(dbHero); - heroInfo.setOutIndex(h.order); + // heroInfo.setOutIndex(h.order); let { attribute, ce } = getPlayerAttribute(dbHero.lv, dbHero.attr, role.attr); heroInfo.setAttribute(attribute); let enemy = new PvpEnemies(warJson, heroInfo, hs ? hs.score : 0, ce); diff --git a/game-server/test/CheckPatten.ts b/game-server/test/CheckPatten.ts index 3d2424c35..19b6c361b 100644 --- a/game-server/test/CheckPatten.ts +++ b/game-server/test/CheckPatten.ts @@ -129,4 +129,144 @@ export function checkWarJson(heroes, cb?) { expect(hero.spine).to.be.a('string'); if(cb) cb(hero); }) +} + +export function checkRoleInfo(roleInfo) { + expect(roleInfo.hasInit).to.be.a('boolean'); + expect(roleInfo.roleId).to.be.a('string'); + expect(roleInfo.roleName).to.be.a('string'); + expect(roleInfo.serverId).to.be.a('number'); + expect(roleInfo.ce).to.be.a('number'); + expect(roleInfo.topLineupCe).to.be.a('number'); + expect(roleInfo.lv).to.be.a('number'); + expect(roleInfo.exp).to.be.a('number'); + expect(roleInfo.gold).to.be.a('number'); + expect(roleInfo.coin).to.be.a('number'); + checkRoleHero(roleInfo.heros); + checkConsumeGoods(roleInfo.consumeGoods); + expect(roleInfo.title).to.be.a('number'); + checkTeraphs(roleInfo.teraphs); + checkShowLineup(roleInfo.showLineup); + checkFigure(roleInfo.heads); + expect(roleInfo.head).to.be.a('number'); + checkFigure(roleInfo.frames); + expect(roleInfo.frame).to.be.a('number'); + checkFigure(roleInfo.spines); + expect(roleInfo.spine).to.be.a('number'); + expect(roleInfo.hasGuild).to.be.a('boolean'); + if(roleInfo.hasGuild) { + expect(roleInfo.guildCode).to.be.a('string'); + } + checkTimeStamp(roleInfo.todayZeroPoint, 10, false); + checkApJson(roleInfo.apJson); + expect(roleInfo.totalPay).to.be.a('number') + expect(roleInfo.guide).to.be.an('array'); + roleInfo.guide.forEach(guide => { + expect(guide).to.be.a('number'); + }); +} +export const ENTERY_ROLE_PICK = [ 'todayZeroPoint', 'apJson', 'skins', 'totalPay', 'guide', 'hasInit', 'renameCnt']; + + +function checkRoleHero(heros) { + expect(heros).to.be.an('array'); + heros.forEach(hero => { + expect(hero.hid).to.be.a('number'); + expect(hero.hName).to.be.a('string'); + expect(hero.seqId).to.be.a('number'); + expect(hero.exp).to.be.a('number'); + expect(hero.lv).to.be.a('number'); + expect(hero.ce).to.be.a('number'); + expect(hero.historyCe).to.be.a('number'); + expect(hero.star).to.be.a('number'); + expect(hero.starStage).to.be.a('number'); + expect(hero.colorStar).to.be.a('number'); + expect(hero.colorStarStage).to.be.a('number'); + expect(hero.quality).to.be.a('number'); + expect(hero.scrollActive).to.be.a('boolean'); + expect(hero.scrollId).to.be.a('number'); + expect(hero.scrollStar).to.be.a('number'); + expect(hero.scrollColorStar).to.be.a('number'); + expect(hero.scrollQuality).to.be.a('number'); + expect(hero.job).to.be.a('number'); + expect(hero.jobStage).to.be.a('number'); + expect(hero.skinId).to.be.a('number'); + expect(hero.favour).to.be.a('number'); + expect(hero.favourLv).to.be.a('number'); + expect(hero.connections).to.be.an('array'); + hero.connections.forEach(connect => { + expect(connect.shipId).to.be.a('number'); + expect(connect.level).to.be.a('number'); + }); + expect(hero.skins).to.be.an('array'); + hero.skins.forEach(skin => { + expect(skin.id).to.be.a('number'); + expect(skin.enable).to.be.a('boolean'); + expect(skin.skinId).to.be.a('number'); + }); + expect(hero.ePlace).to.be.an('array'); + hero.ePlace.forEach(eplace => { + expect(eplace.id).to.be.a('number'); + expect(eplace.lv).to.be.a('number'); + expect(eplace.refineLv).to.be.a('number'); + }); + }) +} + +function checkConsumeGoods(consumes) { + expect(consumes).to.be.an('array'); + consumes.forEach(consume => { + expect(consume.id).to.be.a('number'); + expect(consume.count).to.be.a('number'); + expect(consume.type).to.be.a('number'); + }) +} + +function checkTeraphs(teraphs) { + expect(teraphs).to.be.an('array'); + teraphs.forEach(teraph => { + expect(teraph.id).to.be.a('number'); + expect(teraph.grade).to.be.a('number'); + expect(teraph.hp).to.be.a('number'); + expect(teraph.atk).to.be.a('number'); + expect(teraph.def).to.be.a('number'); + expect(teraph.mdef).to.be.a('number'); + expect(teraph.count).to.be.a('number'); + expect(teraph.criCount).to.be.a('number'); + }) +} + +function checkShowLineup(lineup) { + expect(lineup).to.be.an('array'); + lineup.forEach(hid => { + expect(hid).to.be.a('number'); + }) +} + +function checkFigure(figures) { + expect(figures).to.be.an('array'); + figures.forEach(figure => { + expect(figure.id).to.be.a('number'); + expect(figure.enable).to.be.a('boolean'); + expect(figure.status).to.be.a('boolean'); + }) +} + +function checkApJson(apJson) { + expect(apJson).to.be.an('object'); + expect(apJson.ap).to.be.a('number'); + expect(apJson.maxAp).to.be.a('number'); + expect(apJson.apRemainTime).to.be.a('number'); + expect(apJson.apMaxRemainTime).to.be.a('number'); + expect(apJson.buyTimes).to.be.a('number'); +} + +function checkSkins(skins) { + expect(skins).to.be.an('array'); + skins.forEach(skin => { + expect(skin.id).to.be.a('number'); + expect(skin.skinId).to.be.a('number'); + expect(skin.skinName).to.be.a('string'); + expect(skin.hid).to.be.a('number'); + }) } \ No newline at end of file diff --git a/game-server/test/Client.ts b/game-server/test/Client.ts index 1e519a609..d6349cf42 100644 --- a/game-server/test/Client.ts +++ b/game-server/test/Client.ts @@ -1,6 +1,6 @@ import { PinusWSClient } from 'pinus-robot-plugin'; import { expect } from 'chai'; -import { checkSuccessResponse } from './CheckPatten'; +import { checkSuccessResponse, checkRoleInfo } from './CheckPatten'; import { ON_ADD_CHANNEL_ROUTE, STATUS } from '../app/consts'; import { genCode } from '../app/pubUtils/util'; const request = require('request'); @@ -70,7 +70,9 @@ export class Client { // 消息回调 checkSuccessResponse(enterRes); expect(enterRes.data.role).to.be.an('object'); + checkRoleInfo(enterRes.data.role) this._roleInfo = enterRes.data.role; + this._client.request('role.roleHandler.initRole', { serverId: this.serverId, token, roleName: genCode(8) }, (initRoleRes) => { if (initRoleRes.code !== 0 && initRoleRes.code !== STATUS.ROLE_HAS_INIT.code) { console.error('initRole error', initRoleRes.code, typeof initRoleRes.code); @@ -101,4 +103,4 @@ export class Client { decrypted += decipher.final('utf8'); return decrypted; } -} \ No newline at end of file +} diff --git a/game-server/test/task.test.ts b/game-server/test/task.test.ts index 4b84cc581..f59f6523b 100644 --- a/game-server/test/task.test.ts +++ b/game-server/test/task.test.ts @@ -137,7 +137,7 @@ function checkReceiveTask(pinusClient, done, type: number) { // 检查主线任务数据 -function checkMainTask(mainTask) { +export function checkMainTask(mainTask) { if (!mainTask) return; expect(mainTask).to.be.an('object'); expect(mainTask.stage).to.be.a('number'); @@ -146,7 +146,7 @@ function checkMainTask(mainTask) { } // 检查日常任务数据 -function checkDailyTask(dailyTask) { +export function checkDailyTask(dailyTask) { if (!dailyTask) return; expect(dailyTask).to.be.an('object'); expect(dailyTask.point).to.be.a('number'); @@ -158,7 +158,7 @@ function checkDailyTask(dailyTask) { } // 检查成就 -function checkAchievement(achievement) { +export function checkAchievement(achievement) { if (!achievement) return; expect(achievement).to.be.an('object'); expect(achievement.point).to.be.a('number'); @@ -169,7 +169,7 @@ function checkAchievement(achievement) { } // 检查pvp任务数据 -function checkPvpTask(pvpTask) { +export function checkPvpTask(pvpTask) { if (!pvpTask) return; expect(pvpTask.taskList).to.be.an('array'); pvpTask.taskList.forEach(task => checkSingleTask(task));