线上：粮草先行重新加入玩家

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) {

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":

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;