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

军团活动：修复活动结束信号发送bug

Browse Source
This commit is contained in:
luying
2021-03-25 15:37:03 +08:00
parent 0e8a8245a0
commit 7c0ede3e52
8 changed files with 99 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
game-server/app/services/guildActivityService.ts
View File

@@ -8,7 +8,7 @@ import { GUILD_ACTIVITY_STATUS, GET_POINT_WAYS, GUILD_ACTIVITY_TYPE, REDIS_KEY,
import { Record, UserGuildActivityRecModel } from "../db/UserGuildActivityRec";
import { GateMembersRec, GateActivityObject, CityActivityObject, CityParam, Member } from "../domain/battleField/guildActivity";
import { DicGuildActivity } from "../pubUtils/dictionary/DicGuildActivity";
import { getUnionRank, getRank, getGuildKeyName, getMyUnionRank, getRankScore, getCityKeyName } from "./redisService";
import { getUnionRank, getRank, getGuildKeyName, getMyUnionRank, getRankScore, getCityKeyName, getAllServers } from "./redisService";
import { GuildModel } from "../db/Guild";
import { SimpleGuildRankParam, SimpleRoleRankParam } from "../domain/rank";
import { getGuildChannelSid, getWorldChannelSid, getCityChannelSid } from "./chatChannelService";
@@ -221,7 +221,7 @@ export async function sendAllGuildRanks(aid: number) {
} else if (aid == GUILD_ACTIVITY_TYPE.CITY_ACTIVITY) {
let obj = getCityActivityObj();
let { cities } = obj.getAllCities();
console.log(JSON.stringify(cities));
// console.log(JSON.stringify(cities));
for(let { serverId, cityId, guildCodes } of cities) {
for(let guildCode of guildCodes) {
let ranks = await getCityActivityRank(guildCode, serverId, cityId);
@@ -233,7 +233,7 @@ export async function sendAllGuildRanks(aid: number) {
}
/**
* 活动结束发送结束信号以及结算奖励
* 活动结算奖励
* @param aid 活动类型
*/
export async function sendGuildActEndMsg(aid: number) {
@@ -242,9 +242,6 @@ export async function sendGuildActEndMsg(aid: number) {
let obj = getGateActivityObj();
let guilds = obj.getGuilds();
for(let [ serverId, guildCodes ] of guilds) {
let chatSid = await getWorldChannelSid(serverId);
pinus.app.rpc.chat.chatRemote.sendGuildActivityEnd.toServer(chatSid, serverId);
for(let guildCode of guildCodes) {
await gateActivitySettleReward(guildCode, serverId);
}
@@ -258,14 +255,21 @@ export async function sendGuildActEndMsg(aid: number) {
}
// 发完之后再做下周自动宣战
for(let serverId of serverlists) {
let chatSid = await getWorldChannelSid(serverId);
pinus.app.rpc.chat.chatRemote.sendGuildActivityEnd.toServer(chatSid, serverId);
await autoDeclare(serverId);
}
cityActivityObj = new CityActivityObject();
}
}
// 全服发送结束新号
export async function sendEndMsgToAll() {
let serverlist = await getAllServers();
for(let serverId of serverlist) {
let chatSid = await getWorldChannelSid(serverId);
pinus.app.rpc.chat.chatRemote.sendGuildActivityEnd.toServer(chatSid, serverId);
}
}
/**
* 单个军团城门血条破了之后给他发奖励
* @param guildCode 军团code