From 623a7ad1f54872e14f94d5e6fa25a8bfa17c8542 Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 9 Sep 2022 17:12:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=EF=BC=9A=E7=B2=AE=E8=8D=89?= =?UTF-8?q?=E5=85=88=E8=A1=8C=E9=87=8D=E6=96=B0=E5=8A=A0=E5=85=A5=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/guild/handler/raceActivityHandler.ts | 5 ++++- game-server/app/services/checkParam.ts | 2 +- .../app/services/guildActivity/guildActivityService.ts | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/game-server/app/servers/guild/handler/raceActivityHandler.ts b/game-server/app/servers/guild/handler/raceActivityHandler.ts index 6f22da5ac..f874df389 100644 --- a/game-server/app/servers/guild/handler/raceActivityHandler.ts +++ b/game-server/app/servers/guild/handler/raceActivityHandler.ts @@ -255,7 +255,10 @@ export class RaceActivityHandler { // 加入木马 async debugResetJoin(msg: { magicWord: string }, session: BackendSession) { - + const { magicWord } = msg; + if (magicWord !== DEBUG_MAGIC_WORD) { + return resResult(STATUS.TOKEN_ERR); + } let servers = await ServerlistModel.findByEnv(pinus.app.get('env')); let guild = pinus.app.getServersByType('guild'); for(let { id: serverId } of servers) { diff --git a/game-server/app/services/checkParam.ts b/game-server/app/services/checkParam.ts index bd269566c..3ffc1f2cd 100644 --- a/game-server/app/services/checkParam.ts +++ b/game-server/app/services/checkParam.ts @@ -1629,7 +1629,7 @@ export function checkRouteParam(route: string, msg: any) { case "guild.raceActivityHandler.debugAddHorse": case "activity.gachaHandler.debugClearGachaRecord": case "battle.eventBattleHandler.debugRefEvent": - case "guild.raceActivityHandler.debugResetJoin": + // case "guild.raceActivityHandler.debugResetJoin": case "guild.cityActivityHandler.debugStartHitGate": case "guild.cityActivityHandler.debugStopHitGate": case "guild.cityActivityHandler.debugTestAutoDeclare": diff --git a/game-server/app/services/guildActivity/guildActivityService.ts b/game-server/app/services/guildActivity/guildActivityService.ts index 6e3dc0eea..6062bba55 100644 --- a/game-server/app/services/guildActivity/guildActivityService.ts +++ b/game-server/app/services/guildActivity/guildActivityService.ts @@ -883,6 +883,10 @@ export async function debugResetJoin(serverId: number) { if(role) { let guildCode = role.guildCode; let roleName = role.roleName; + let hasJoin = !!obj.getMember(guildCode, roleId); + + if (hasJoin) continue; + let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, GUILD_ACTIVITY_TYPE.RACE_ACTIVITY, joinIndex, obj.getEvents(guildCode, 0)); if (!guildActivityRec) return false;