军团活动:修复活动结束定时任务bug

This commit is contained in:
luying
2021-03-25 12:24:37 +08:00
parent aa6cc25757
commit 0e8a8245a0
+6 -3
View File
@@ -380,11 +380,11 @@ export async function guildActivityStart(dicGuildActivity?: DicGuildActivity) {
if(dicGuildActivity.id == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) { if(dicGuildActivity.id == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) {
guildActSecondsJobId = scheduleJob('guildActivitySeconds', '*/10 * * * * *', gateActivitySeconds); guildActSecondsJobId = scheduleJob('guildActivitySeconds', '*/10 * * * * *', gateActivitySeconds);
// 结束时间 // 结束时间
guildActEndJobId = scheduleJob('guildActivityEnd', dicGuildActivity.duringTime, gateActivityEnd); guildActEndJobId = scheduleJob('guildActivityEnd', Date.now() + dicGuildActivity.duringTime * 1000, gateActivityEnd);
} else if (dicGuildActivity.id == GUILD_ACTIVITY_TYPE.CITY_ACTIVITY) { } else if (dicGuildActivity.id == GUILD_ACTIVITY_TYPE.CITY_ACTIVITY) {
guildActSecondsJobId = scheduleJob('guildActivitySeconds', '*/10 * * * * *', cityActivitySeconds); guildActSecondsJobId = scheduleJob('guildActivitySeconds', '*/10 * * * * *', cityActivitySeconds);
// 结束时间 // 结束时间
guildActEndJobId = scheduleJob('guildActivityEnd', dicGuildActivity.duringTime, cityActivityEnd); guildActEndJobId = scheduleJob('guildActivityEnd', Date.now() + dicGuildActivity.duringTime * 1000, cityActivityEnd);
} else if (dicGuildActivity.id == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) { } else if (dicGuildActivity.id == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
} }
@@ -395,6 +395,7 @@ export async function guildActivityStart(dicGuildActivity?: DicGuildActivity) {
// 结束军团活动 // 结束军团活动
export async function gateActivityEnd() { export async function gateActivityEnd() {
console.log('*****gateActivityEnd')
let servers = pinus.app.getServersByType('guild'); let servers = pinus.app.getServersByType('guild');
for(let { id } of servers) { for(let { id } of servers) {
await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.toServer(id, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY); await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.toServer(id, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY);
@@ -406,6 +407,7 @@ export async function gateActivityEnd() {
// 每10秒下发一次的任务 // 每10秒下发一次的任务
export async function gateActivitySeconds() { export async function gateActivitySeconds() {
console.log('*****gateActivitySeconds')
let servers = pinus.app.getServersByType('guild'); let servers = pinus.app.getServersByType('guild');
for(let { id } of servers) { for(let { id } of servers) {
await pinus.app.rpc.guild.guildActivityRemote.sendRankToGuilds.toServer(id, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY); await pinus.app.rpc.guild.guildActivityRemote.sendRankToGuilds.toServer(id, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY);
@@ -415,7 +417,7 @@ export async function gateActivitySeconds() {
// 诸侯混战 // 诸侯混战
// 结束军团活动 // 结束军团活动
export async function cityActivityEnd() { export async function cityActivityEnd() {
console.log('*****cityActivityEnd')
let servers = pinus.app.getServersByType('guild'); let servers = pinus.app.getServersByType('guild');
for(let { id } of servers) { for(let { id } of servers) {
await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.toServer(id, GUILD_ACTIVITY_TYPE.CITY_ACTIVITY); await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.toServer(id, GUILD_ACTIVITY_TYPE.CITY_ACTIVITY);
@@ -427,6 +429,7 @@ export async function cityActivityEnd() {
// 每10秒下发一次的任务 // 每10秒下发一次的任务
export async function cityActivitySeconds() { export async function cityActivitySeconds() {
console.log('*****cityActivitySeconds')
let servers = pinus.app.getServersByType('guild'); let servers = pinus.app.getServersByType('guild');
for(let { id } of servers) { for(let { id } of servers) {
await pinus.app.rpc.guild.guildActivityRemote.sendRankToGuilds.toServer(id, GUILD_ACTIVITY_TYPE.CITY_ACTIVITY); await pinus.app.rpc.guild.guildActivityRemote.sendRankToGuilds.toServer(id, GUILD_ACTIVITY_TYPE.CITY_ACTIVITY);