From 22b92c8ae89fa44c75007a0fecd510a1ebb0f1ed Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 7 Jan 2022 11:19:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E5=8D=96=EF=BC=9A=E5=86=9B=E5=9B=A2?= =?UTF-8?q?=E6=8B=8D=E5=8D=96=E6=97=B6=E6=9C=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/auctionService.ts | 2 +- game-server/app/services/guildService.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/game-server/app/services/auctionService.ts b/game-server/app/services/auctionService.ts index 2a61678b4..5e8bd8370 100644 --- a/game-server/app/services/auctionService.ts +++ b/game-server/app/services/auctionService.ts @@ -70,7 +70,7 @@ export async function treatSingleLotTime(lot: LotType) { if(Math.floor(current/1000) != nowSeconds()) { lot.begin.setHours(20, 20, 0, 0); lot.end.setHours(22, 0, 0, 0); - return {...lot, begin: lot.begin, end: lot.end} + return {...lot, begin: lot.begin, end: lot.end} } } return lot diff --git a/game-server/app/services/guildService.ts b/game-server/app/services/guildService.ts index 439d85e95..dcfd91000 100644 --- a/game-server/app/services/guildService.ts +++ b/game-server/app/services/guildService.ts @@ -18,6 +18,7 @@ import { addRoleToGuildChannel } from "./chatService"; import { Rank } from "./rankService"; import { checkActivityTask, checkTask } from "./taskService"; import { CounterModel } from "../db/Counter"; +import { getAuction } from "./auctionService"; export async function getMyGuildInfo(roleId: string, sid: string, userGuild: UserGuildType, guild: GuildType, serverId: number, session: FrontendOrBackendSession) { @@ -113,6 +114,9 @@ export async function joinGuild(code: string, guildName: string, lv: number, rol if (sid) { await addRoleToGuildChannel(roleId, sid, code); await pinus.app.rpc.connector.connectorRemote.setOtherUserGuildSession.toServer(sid,[{ roleId, userGuild }]); + session.set('guildCode', code); + let auctionInfo = await getAuction(code, session); + pinus.app.channelService.pushMessageByUids('onAuctionUpdate', resResult(STATUS.SUCCESS, auctionInfo), [{ uid: roleId, sid }]); } //成长任务-加入军团