From 2dffa0204f92c148b6d0d5253fc2f87a47f21bf6 Mon Sep 17 00:00:00 2001 From: luying Date: Wed, 6 Apr 2022 10:45:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../servers/connector/handler/entryHandler.ts | 32 +++++++++++++++++++ game-server/test/CheckPatten.ts | 2 +- game-server/test/Client.ts | 19 ++++++----- web-server/typings/app/service/index.d.ts | 2 ++ 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/game-server/app/servers/connector/handler/entryHandler.ts b/game-server/app/servers/connector/handler/entryHandler.ts index a7a5777aa..6bc9b372f 100644 --- a/game-server/app/servers/connector/handler/entryHandler.ts +++ b/game-server/app/servers/connector/handler/entryHandler.ts @@ -20,6 +20,11 @@ import Counter from '../../../db/Counter'; import { getExpByLv } from '../../../pubUtils/data'; import { reportTAUserSet } from '../../../services/sdkService'; import { saveLoginAndOutLog } from '../../../pubUtils/logUtil'; +import { JewelModel } from '../../../db/Jewel'; +import { ItemModel } from '../../../db/Item'; +import { SkinModel } from '../../../db/Skin'; +import { HeroParam } from '../../../domain/roleField/hero'; +import { getAp } from '../../../services/actionPointService'; export default function (app: Application) { new HandlerService(app, {}); @@ -294,6 +299,33 @@ export class EntryHandler { return resResult(STATUS.SUCCESS, { user }); } + async debugGetRole(msg: { magicWord: string }, session: FrontendSession) { + const { magicWord } = msg; + if (magicWord !== DEBUG_MAGIC_WORD) { + return resResult(STATUS.TOKEN_ERR); + } + let roleId = session.get('roleId'); + + let role = await RoleModel.findByRoleId(roleId, '-_id', true, true); + let heros = await HeroModel.findByRole(role.roleId, [], HERO_SELECT.ENTRY, true); + let jewels = await JewelModel.findbyRole(role.roleId); + let items = await ItemModel.findbyRole(role.roleId); + let skins = await SkinModel.findbyRole(role.roleId); + + role['heros'] = heros.map(hero => new HeroParam(hero)); + role['jewels'] = jewels; + role['consumeGoods'] = items; + role['skins'] = skins; + let apJson = await getAp(role.roleId, '', role.lv); + role['apJson'] = apJson; + + if (!role.showLineup) role.showLineup = role.topLineup.map(cur => cur.hid); + role.heads = role.heads.filter(cur => cur.status); + role.frames = role.frames.filter(cur => cur.status); + role.spines = role.spines.filter(cur => cur.status); + return resResult(STATUS.SUCCESS, { role }); + } + async debugQueryTokenByTel(msg: { tel: string, magicWord: string, serverId: number }, session: FrontendSession) { const { tel, magicWord, serverId } = msg; if (magicWord !== DEBUG_MAGIC_WORD) { diff --git a/game-server/test/CheckPatten.ts b/game-server/test/CheckPatten.ts index e2f52a30c..5878f8e6b 100644 --- a/game-server/test/CheckPatten.ts +++ b/game-server/test/CheckPatten.ts @@ -157,7 +157,7 @@ export function checkRoleInfo(roleInfo) { if(roleInfo.hasGuild) { expect(roleInfo.guildCode).to.be.a('string'); } - checkTimeStamp(roleInfo.todayZeroPoint, 10, false); + // checkTimeStamp(roleInfo.todayZeroPoint, 10, false); checkApJson(roleInfo.apJson); expect(roleInfo.totalPay).to.be.a('number') expect(roleInfo.guide).to.be.an('array'); diff --git a/game-server/test/Client.ts b/game-server/test/Client.ts index d6349cf42..3e2aecd6d 100644 --- a/game-server/test/Client.ts +++ b/game-server/test/Client.ts @@ -1,7 +1,7 @@ import { PinusWSClient } from 'pinus-robot-plugin'; import { expect } from 'chai'; import { checkSuccessResponse, checkRoleInfo } from './CheckPatten'; -import { ON_ADD_CHANNEL_ROUTE, STATUS } from '../app/consts'; +import { DEBUG_MAGIC_WORD, ON_ADD_CHANNEL_ROUTE, STATUS } from '../app/consts'; import { genCode } from '../app/pubUtils/util'; const request = require('request'); const crypto = require('crypto'); @@ -69,14 +69,17 @@ export class Client { this._client.request('connector.entryHandler.enter', { serverId: this.serverId, token }, (enterRes) => { // 消息回调 checkSuccessResponse(enterRes); - expect(enterRes.data.role).to.be.an('object'); - checkRoleInfo(enterRes.data.role) - this._roleInfo = enterRes.data.role; + this._client.request('connector.entryHandler.debugGetRole', { magicWord: DEBUG_MAGIC_WORD }, (enterRes) => { + 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); - } + 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); + } + }); }); }); }); diff --git a/web-server/typings/app/service/index.d.ts b/web-server/typings/app/service/index.d.ts index c555ba577..291d94247 100644 --- a/web-server/typings/app/service/index.d.ts +++ b/web-server/typings/app/service/index.d.ts @@ -12,6 +12,7 @@ import ExportTest from '../../../app/service/Test'; import ExportTurboCore from '../../../app/service/TurboCore'; import ExportUpdate from '../../../app/service/Update'; import ExportUtils from '../../../app/service/Utils'; +import ExportWjx from '../../../app/service/Wjx'; declare module 'egg' { interface IService { @@ -21,5 +22,6 @@ declare module 'egg' { turboCore: AutoInstanceType; update: AutoInstanceType; utils: AutoInstanceType; + wjx: AutoInstanceType; } }