diff --git a/game-server/app/services/refreshService.ts b/game-server/app/services/refreshService.ts index 80663faae..fa1f1a118 100644 --- a/game-server/app/services/refreshService.ts +++ b/game-server/app/services/refreshService.ts @@ -4,6 +4,8 @@ import { resResult, shouldRefresh, shouldRefreshWeek } from '../pubUtils/util'; import { nowSeconds } from "../pubUtils/timeUtil"; // import { RoleModel } from '../db/Role'; import { refDailyTask, refDailyTaskBox } from './taskService' +import { EVENT_STATUS, FUNCS_ID } from "../consts"; +import { startEvent } from "./eventSercive"; /** * 刷新 @@ -12,9 +14,15 @@ import { refDailyTask, refDailyTaskBox } from './taskService' export async function refresh(session: FrontendOrBackendSession) { const roleId = session.get('roleId'); const sid = session.get('sid'); + const funcs = session.get('funcs'); + const eventStatus = session.get('eventStatus')||EVENT_STATUS.WAITING; + let uids = [{uid: roleId, sid}]; pinus.app.get('channelService').pushMessageByUids('onPushCurrentTime', resResult(STATUS.SUCCESS, {time: Date.now()}), uids); await refreshDaily(session); + if(funcs && funcs.includes(FUNCS_ID.EVENT) && eventStatus == EVENT_STATUS.WAITING) { + await startEvent(session); + } } /** diff --git a/shared/domain/roleField/friend.ts b/shared/domain/roleField/friend.ts index 208a01030..a02d7288c 100644 --- a/shared/domain/roleField/friend.ts +++ b/shared/domain/roleField/friend.ts @@ -15,6 +15,7 @@ export class FriendParams { serverId: number; serverName: string; type: number = FRIEND_RELATION_TYPE.NORMAL; + guildName: string = ''; constructor(role: RoleType) { this.roleId = role.roleId; @@ -25,6 +26,7 @@ export class FriendParams { this.spine = role.spine; this.ce = role.ce; this.title = role.title; + this.guildName = role.guildName||''; } setServerName(serverId: number, serverName: string) {