diff --git a/game-server/app/servers/guild/handler/cityActivityHandler.ts b/game-server/app/servers/guild/handler/cityActivityHandler.ts index 60d2d600e..3cb212f3d 100644 --- a/game-server/app/servers/guild/handler/cityActivityHandler.ts +++ b/game-server/app/servers/guild/handler/cityActivityHandler.ts @@ -1,7 +1,7 @@ import { Application, ChannelService, BackendSession, pinus, HandlerService, } from "pinus"; import { GUILD_ACTIVITY_TYPE, STATUS, REDIS_KEY, CITY_STATUS, TASK_TYPE, ITEM_CHANGE_REASON, PUSH_ROUTE, GUILD_ACTIVITY_STATUS } from "../../../consts"; import { genCode, resResult } from "../../../pubUtils/util"; -import { getGuildActivityStatus, getCityActivityObj, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank, sendSingleCityActEndMsg, declareCity, autoDeclareMyCity, getGAIndexInPinus, getDeclareIndex } from "../../../services/guildActivity/guildActivityService"; +import { getGuildActivityStatus, getCityActivityObj, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank, sendSingleCityActEndMsg, declareCity, autoDeclareMyCity, getGAIndexInPinus, getDeclareIndex, sendCityGuildRankToUser } from "../../../services/guildActivity/guildActivityService"; import { GuildActivityCityModel } from "../../../db/GuildActivityCity"; import { gameData } from "../../../pubUtils/data"; import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec"; @@ -296,8 +296,7 @@ export class CityActivityHandler { } // 推送 城门血量 await sendMessageToCityWithSuc(cityId, PUSH_ROUTE.GUILD_CITY_ACT_HP, { cityId, gateHp, maxHp }); - - await pinus.app.rpc.guild.guildActivityRemote.sendRankToGuilds.broadcast(this.aid); + await sendCityGuildRankToUser(serverId, cityId, guildCode, roleId); return resResult(STATUS.SUCCESS, { code, diff --git a/game-server/app/services/guildActivity/guildActivityService.ts b/game-server/app/services/guildActivity/guildActivityService.ts index d975e469e..6c74f7a77 100644 --- a/game-server/app/services/guildActivity/guildActivityService.ts +++ b/game-server/app/services/guildActivity/guildActivityService.ts @@ -25,7 +25,7 @@ import { addActive } from "../guildService"; import { ActivePlayer, GuildRecord, ServerRecordModel } from "../../db/ServerRecords"; import { Attack } from "../../domain/battleField/pvp"; import { getHonourObject } from "../role/rewardService"; -import { sendMessageToCityWithSuc, sendMessageToGuildWithSuc, sendMessageToServerWithSuc } from "../pushService"; +import { sendMessageToCityWithSuc, sendMessageToGuildWithSuc, sendMessageToServerWithSuc, sendMessageToUserWithSuc } from "../pushService"; import { saveGuildGateHpLog } from "../../pubUtils/logUtil"; import { GuildActivityCityDeclareModel } from "../../db/GuildActivityCityDeclare"; import { getRandSingleEelm } from "../../pubUtils/util"; @@ -289,6 +289,11 @@ export async function sendAllGuildRanks(aid: number) { } } +export async function sendCityGuildRankToUser(serverId: number, cityId: number, guildCode: string, roleId: string) { + let ranks = await getCityActivityRank(guildCode, serverId, cityId); + await sendMessageToUserWithSuc(roleId, PUSH_ROUTE.CITY_ACT_RANK, ranks); +} + /** * 活动结算奖励 * @param aid 活动类型 diff --git a/game-server/app/services/pushService.ts b/game-server/app/services/pushService.ts index 48e18d347..36aabe56f 100644 --- a/game-server/app/services/pushService.ts +++ b/game-server/app/services/pushService.ts @@ -184,11 +184,19 @@ function encryptMsg(event: string, json: any) { function checkNotEncryptRoute(event: string) { return isSkipEncode(isDevelopEnv()) || [ - PUSH_ROUTE.PUSH_CURRENT_TIME, - PUSH_ROUTE.RACE_START, - PUSH_ROUTE.GUILD_ACTIVITY_END, - PUSH_ROUTE.GUILD_RACE_UPDATE, - PUSH_ROUTE.GUILD_RACE_EVENT, - PUSH_ROUTE.TEAMMATE_ACT, + PUSH_ROUTE.PUSH_CURRENT_TIME, // onPushCurrentTime 推送时间 + PUSH_ROUTE.RACE_START, // onRaceStart 粮草先行开始 + PUSH_ROUTE.GUILD_ACTIVITY_END, // onGuildActivityEnd 军团活动结束 + PUSH_ROUTE.GUILD_RACE_UPDATE, // onRaceHorseUpdate 粮草先行状态 + PUSH_ROUTE.GUILD_RACE_EVENT, // onRaceEventUpdate 更新木马事件 + PUSH_ROUTE.TEAMMATE_ACT, // onTeammateAct 寻宝队友行动 + PUSH_ROUTE.CITY_ACT_RANK, // onGuildCityRankUpdate 诸侯混战排行榜 + PUSH_ROUTE.GUILD_CITY_ACT_HP, // onGuildCityGateHpUpdate 诸侯混战城门血条 + PUSH_ROUTE.GUILD_GATE_ACT_HP, // onGuildGateHpUpdate 蛮夷入侵城门血条 + PUSH_ROUTE.GATE_ACT_RANK, // onGuildGateRankUpdate 蛮夷入侵排行榜 + PUSH_ROUTE.BOSS_HP_UPDATE, // onBossHpUpdate 演武台更新 + PUSH_ROUTE.DIVIDEND_UPDATE, // onDividendsUpdate 拍卖行分红更新 + PUSH_ROUTE.AUCTION_OVER, // onAuctionOver 拍卖价格超过 + PUSH_ROUTE.GUILD_BOSS_ENCOURAGE, // onGuildBossEncourage 鼓舞 ].indexOf(event) != -1 } \ No newline at end of file