diff --git a/game-server/app/servers/guild/handler/cityActivityHandler.ts b/game-server/app/servers/guild/handler/cityActivityHandler.ts index 8afdc7b76..f0a883554 100644 --- a/game-server/app/servers/guild/handler/cityActivityHandler.ts +++ b/game-server/app/servers/guild/handler/cityActivityHandler.ts @@ -321,8 +321,6 @@ export class CityActivityHandler { let myGuildActivityRec = await UserGuildActivityRecModel.updateInfo(code, { isSuccess, isCompleted: true, cityId, challengeTime }); if (!myGuildActivityRec) return resResult(STATUS.WRONG_PARMS); - // 发放活跃 - await addActive(roleId, serverId, GUILD_POINT_WAYS.ACTIVITY); //获得活跃值 // 返回当前军团总军功 let myR = new Rank(REDIS_KEY.USER_CITY_ACTIVITY, { serverId, guildCode }, true); let myScore = await myR.getMyScore({ roleId }); diff --git a/game-server/app/servers/guild/handler/gateActivityHandler.ts b/game-server/app/servers/guild/handler/gateActivityHandler.ts index 9cb49e7b3..3c006103a 100644 --- a/game-server/app/servers/guild/handler/gateActivityHandler.ts +++ b/game-server/app/servers/guild/handler/gateActivityHandler.ts @@ -7,9 +7,7 @@ import { GUILDACTIVITY } from "../../../pubUtils/dicParam"; import { GuildActivityRecordModel } from "../../../db/GuildActivityRec"; import { delGuildActivityRank } from "../../../services/redisService"; import { REDIS_KEY } from "../../../consts"; -import { addActive } from "../../../services/guildService"; import { gameData } from "../../../pubUtils/data"; -import { getGuildChannelSid } from "../../../services/chatService"; import { UserGuildModel } from "../../../db/UserGuild"; import { GuildActivityCityModel } from "../../../db/GuildActivityCity"; import { Rank } from "../../../services/rankService"; @@ -195,8 +193,6 @@ export class GateActivityHandler { await r.setRank({ guildCode }, [score, Date.now()], true); } - // 发放活跃 - await addActive(roleId, serverId, GUILD_POINT_WAYS.ACTIVITY); //获得活跃值 // 返回当前军团总军功 let guildScore = await r.getMyScore({ guildCode }); let myScore = await myR.getMyScore({ roleId }); diff --git a/game-server/app/services/guildActivity/guildActivityService.ts b/game-server/app/services/guildActivity/guildActivityService.ts index 83a56e963..4ec15d7fc 100644 --- a/game-server/app/services/guildActivity/guildActivityService.ts +++ b/game-server/app/services/guildActivity/guildActivityService.ts @@ -401,11 +401,14 @@ export async function gateActivitySettleReward(guildCode: string, serverId: numb hasSentMember.push(roleId); } } - for (let { roleId } of members) { // 只参加了,没有分数的人 + for (let { roleId } of members) { + // 只参加了,没有分数的人 if(hasSentMember.indexOf(roleId) == -1) { await updateUserRecAndSendHonour(dic.honour, 0, 0, roleId); hasSentMember.push(roleId); } + // 发放活跃 + await addActive(roleId, serverId, GUILD_POINT_WAYS.ACTIVITY); //获得活跃值 } // 加入拍卖行 @@ -480,6 +483,8 @@ export async function cityActivitySettleReward(cityId: number, serverId: number) await updateUserRecAndSendHonour(honour, 0, 0, roleId); hasSentMember.push(roleId); } + // 发放活跃 + await addActive(roleId, serverId, GUILD_POINT_WAYS.ACTIVITY); //获得活跃值 } }