diff --git a/game-server/app/services/pushService.ts b/game-server/app/services/pushService.ts index b2cac931d..e76d8f0ae 100644 --- a/game-server/app/services/pushService.ts +++ b/game-server/app/services/pushService.ts @@ -78,8 +78,8 @@ export async function sendMessageToUsersWithSuc(route: string, data: any, uids: // 推送给个人的方法收束于这个函数 export async function sendMessageToUsers(route: string, data: any, uids: { uid: string, sid: string }[]) { if(uids.length > 0) { - infologger.debug(`pushMessage route: ${route} data: ${data} members: ${uids.map(obj => obj.uid).join()}`); pinus.app.get('channelService').pushMessageByUids(route, data, uids); + infologger.debug(`pushMessage route: ${route} data: ${JSON.stringify(data)} members: ${uids.map(obj => obj.uid).join()}`); } } @@ -130,8 +130,8 @@ export function sendMessgeToChannelByBatch(channel: Channel, route: string, data // 抽下下来pushMessage收束 export function sendMessageToChannel(channel: Channel, route: string, data: any) { - infologger.debug(`pushMessage route: ${route} data: ${data} members: ${channel.getMembers().join()}`); channel.pushMessage(route, data); + infologger.debug(`pushMessage route: ${route} data: ${JSON.stringify(data)} members: ${channel.getMembers().join()}`); } export function delTeamChannel(teamCode: string) { diff --git a/game-server/app/services/role/createHero.ts b/game-server/app/services/role/createHero.ts index 6dc02ecf9..c98f63acf 100644 --- a/game-server/app/services/role/createHero.ts +++ b/game-server/app/services/role/createHero.ts @@ -4,7 +4,7 @@ import { HeroModel, HeroSkin, HeroType, HeroUpdate } from "../../db/Hero"; import { SkinUpdate } from "../../db/Skin"; import { nowSeconds } from "../../pubUtils/timeUtil"; import { resResult } from "../../pubUtils/util"; -import { CreateHeroParam, HeroShowParam } from "../../domain/roleField/hero"; +import { CreateHeroParam, HeroParam, HeroShowParam } from "../../domain/roleField/hero"; import { pinus } from "pinus"; import { ItemInter, RewardInter } from "../../pubUtils/interface"; import { transPiece } from "./util"; @@ -70,7 +70,7 @@ import { sendMessageToUser, sendMessageToUserWithSuc } from "../pushService"; await SkinModel.insertSkins(roleId, roleName, skins); sendMessageToUserWithSuc(roleId, PUSH_ROUTE.HERO_SKIN_CHANGE, getSkinPushMsg(resultHeroes, skins), sid); - sendMessageToUserWithSuc(roleId, PUSH_ROUTE.HERO_UPDATE, { heroes }, sid); + sendMessageToUserWithSuc(roleId, PUSH_ROUTE.HERO_UPDATE, { heroes: heroes.map(hero => new HeroParam(hero)) }, sid); } if (pieces.length > 0) { diff --git a/shared/pubUtils/roleUtil.ts b/shared/pubUtils/roleUtil.ts index a21c3907e..c9fc98560 100644 --- a/shared/pubUtils/roleUtil.ts +++ b/shared/pubUtils/roleUtil.ts @@ -83,6 +83,7 @@ import { UserTaskRecModel } from '../db/UserTaskRec'; import { WishPoolReportModel } from '../db/WishPoolReport'; import { pick } from "underscore"; import { JewelModel } from "../db/Jewel"; +import { RoleCeModel } from "../db/RoleCe"; export async function deletRole(roleId: string) { let role = await RoleModel.findByRoleId(roleId); @@ -197,6 +198,7 @@ export async function deletRole(roleId: string) { await UserTaskRecModel.deleteMany({ roleId }); await WishPoolReportModel.deleteMany({ wishRoleId: roleId}); await WishPoolReportModel.deleteMany({ dntRoleId: roleId}); + await RoleCeModel.deleteMany({ roleId }); let doc = new RoleModel(); const update = Object.assign(doc.toJSON(), pick(role, ['serverType', 'userInfo', 'seqId', 'serverId']), { roleName: role.roleId });