xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

诸侯混战：优化推送

Browse Source
This commit is contained in:
luying
2022-09-29 12:00:38 +08:00
parent b622e32f43
commit 78cfd36556
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/guild/handler/cityActivityHandler.ts
+2 -3
View File
@@ -1,7 +1,7 @@
import { Application, ChannelService, BackendSession, pinus, HandlerService, } from "pinus"; 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 { 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 { 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 { GuildActivityCityModel } from "../../../db/GuildActivityCity";
import { gameData } from "../../../pubUtils/data"; import { gameData } from "../../../pubUtils/data";
import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec"; 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 sendMessageToCityWithSuc(cityId, PUSH_ROUTE.GUILD_CITY_ACT_HP, { cityId, gateHp, maxHp });
await sendCityGuildRankToUser(serverId, cityId, guildCode, roleId);
await pinus.app.rpc.guild.guildActivityRemote.sendRankToGuilds.broadcast(this.aid);
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
code, code,
game-server/app/services/guildActivity/guildActivityService.ts
+6 -1
View File
@@ -25,7 +25,7 @@ import { addActive } from "../guildService";
import { ActivePlayer, GuildRecord, ServerRecordModel } from "../../db/ServerRecords"; import { ActivePlayer, GuildRecord, ServerRecordModel } from "../../db/ServerRecords";
import { Attack } from "../../domain/battleField/pvp"; import { Attack } from "../../domain/battleField/pvp";
import { getHonourObject } from "../role/rewardService"; import { getHonourObject } from "../role/rewardService";
import { sendMessageToCityWithSuc, sendMessageToGuildWithSuc, sendMessageToServerWithSuc } from "../pushService"; import { sendMessageToCityWithSuc, sendMessageToGuildWithSuc, sendMessageToServerWithSuc, sendMessageToUserWithSuc } from "../pushService";
import { saveGuildGateHpLog } from "../../pubUtils/logUtil"; import { saveGuildGateHpLog } from "../../pubUtils/logUtil";
import { GuildActivityCityDeclareModel } from "../../db/GuildActivityCityDeclare"; import { GuildActivityCityDeclareModel } from "../../db/GuildActivityCityDeclare";
import { getRandSingleEelm } from "../../pubUtils/util"; 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 活动类型 * @param aid 活动类型
game-server/app/services/pushService.ts
+14 -6
View File
@@ -184,11 +184,19 @@ function encryptMsg(event: string, json: any) {
function checkNotEncryptRoute(event: string) { function checkNotEncryptRoute(event: string) {
return isSkipEncode(isDevelopEnv()) || [ return isSkipEncode(isDevelopEnv()) || [
PUSH_ROUTE.PUSH_CURRENT_TIME, PUSH_ROUTE.PUSH_CURRENT_TIME, // onPushCurrentTime 推送时间
PUSH_ROUTE.RACE_START, PUSH_ROUTE.RACE_START, // onRaceStart 粮草先行开始
PUSH_ROUTE.GUILD_ACTIVITY_END, PUSH_ROUTE.GUILD_ACTIVITY_END, // onGuildActivityEnd 军团活动结束
PUSH_ROUTE.GUILD_RACE_UPDATE, PUSH_ROUTE.GUILD_RACE_UPDATE, // onRaceHorseUpdate 粮草先行状态
PUSH_ROUTE.GUILD_RACE_EVENT, PUSH_ROUTE.GUILD_RACE_EVENT, // onRaceEventUpdate 更新木马事件
PUSH_ROUTE.TEAMMATE_ACT, 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 ].indexOf(event) != -1
} }