diff --git a/game-server/app/servers/guild/handler/guildHandler.ts b/game-server/app/servers/guild/handler/guildHandler.ts index abc708ef5..5ed3a16c0 100644 --- a/game-server/app/servers/guild/handler/guildHandler.ts +++ b/game-server/app/servers/guild/handler/guildHandler.ts @@ -215,7 +215,7 @@ export class GuildHandler { if (!userGuild) { return resResult(STATUS.GUILD_MEMBER_NOT_FOUND); } - await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.toServer(sid,[{ roleId: memberRoleId, userGuild }]); + await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.broadcast([{ roleId: memberRoleId, userGuild }]); const role = await RoleModel.findByRoleId(memberRoleId); let updateObject = {}; diff --git a/game-server/app/servers/guild/handler/wishPoolHandler.ts b/game-server/app/servers/guild/handler/wishPoolHandler.ts index 64e2ea1e9..9e819f721 100644 --- a/game-server/app/servers/guild/handler/wishPoolHandler.ts +++ b/game-server/app/servers/guild/handler/wishPoolHandler.ts @@ -14,7 +14,7 @@ import { RoleModel } from '../../../db/Role'; import { getRoleOnlineInfo } from '../../../services/redisService'; import { ARMY } from '../../../pubUtils/dicParam'; import { guildInter } from '../../../pubUtils/interface'; -import { getSeconds, nowSeconds } from '../../../pubUtils/timeUtil'; +import { getSeconds, getZeroPoint, nowSeconds } from '../../../pubUtils/timeUtil'; export default function(app: Application) { return new WishPoolHandler(app); } @@ -70,7 +70,8 @@ export class WishPoolHandler { if (resType == type) len++; }); - if(receivedWishPool.indexOf(type) != -1 && getSeconds(createdAt) > nowSeconds()) { + + if(receivedWishPool.indexOf(type) != -1 && getSeconds(createdAt) > getZeroPoint()) { return resResult(STATUS.HAS_REACH_WISH_COUNT_LIMIT); } if (len >= ARMY.ARMY_WISH_TIMES) //今日已经许愿过