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

军团活动：粮草先行还缺event记录和权限限制

Browse Source
This commit is contained in:
luying
2021-03-27 19:27:49 +08:00
parent 2afc250fd6
commit 2ea59fc3a3
15 changed files with 519 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
game-server/app/servers/chat/remote/chatRemote.ts
View File

@@ -31,6 +31,7 @@ export class ChatRemote {
private channelService: ChannelService;
private GUILD_ACTIVITY_END = 'onGuildActivityEnd';
private RACE_ACTIVITY_START = 'onRaceStart';
/**
* 加入世界频道（分服）.
@@ -166,7 +167,6 @@ export class ChatRemote {
}
/**
* @description 全服推送活动结束通知
* @param serverId
@@ -177,4 +177,15 @@ export class ChatRemote {
if (!channel) return;
channel.pushMessage(this.GUILD_ACTIVITY_END, resResult(STATUS.SUCCESS, { }));
}
/**
* @description 全服推送竞赛活动开始通知
* @param serverId
*/
public async sendRaceActivityStart(serverId: number) {
let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId);
let channel = this.channelService.getChannel(roomId, false);
if (!channel) return;
channel.pushMessage(this.RACE_ACTIVITY_START, resResult(STATUS.SUCCESS, { }));
}
}

35
game-server/app/servers/chat/remote/guildRemote.ts
View File

@@ -5,7 +5,7 @@ import { GuildType } from '../../../db/Guild';
import { RoleType } from '../../../db/Role';
import { GuildRecType } from '../../../db/GuildRec';
import { leaveGuildChannel, groupRoomId } from '../../../services/chatService';
import { GuildGateRankParam } from '../../../domain/battleField/guildActivity';
import { GuildRankParams, WoodenHorse, Event } from '../../../domain/battleField/guildActivity';
export default function (app: Application) {
return new GuildRemote(app);
@@ -31,6 +31,8 @@ export class GuildRemote {
private GUILD_ACTIVITY_END = 'onGuildActivityEnd'; // 军团活动结束
private GUILD_CITY_DECLARE = 'onGuildCityDeclare'; // 有军团对这个城池进行宣战了
private GUILD_CITY_ACT_HP = 'onGuildCityGateHpUpdate'; // 诸侯入侵城门血条
private GUILD_RACE_UPDATE = 'onRaceHorseUpdate'; /// 更新木牛流马
private GUILD_RACE_EVENT = 'onRaceEventUpdate'; /// 更新木牛流马
/**
* 封装，军团相关channel名: 'guild'+guildCode
@@ -199,7 +201,7 @@ export class GuildRemote {
* 向军团推送排行榜名次
* @param guildCode
*/
public pushRank(guildCode: string, msg: GuildGateRankParam) {
public pushRank(guildCode: string, msg: GuildRankParams) {
this.pushMessage(guildCode, this.GATE_ACT_RANK, msg);
}
@@ -207,7 +209,7 @@ export class GuildRemote {
* 向军团推送排行榜名次
* @param guildCode
*/
public pushCityActRank(guildCode: string, msg: GuildGateRankParam) {
public pushCityActRank(guildCode: string, msg: GuildRankParams) {
this.pushMessage(guildCode, this.CITY_ACT_RANK, msg);
}
@@ -236,7 +238,8 @@ export class GuildRemote {
/**
* @description 推送城池城门血条
* @param guildCode
* @param cityId 城池
* @param gateHp 血条
*/
public async pushCityGateHp(cityId: number, gateHp: number ) {
this.pushMessageToCity(cityId, this.GUILD_CITY_ACT_HP, {
@@ -244,4 +247,28 @@ export class GuildRemote {
gateHp
});
}
/**
* @description 推送木牛流马状态
* @param guildCode 军团
* @param woodenHorseList 木马
* @param ranks 军团排名和自己所在的排名
*/
public async pushRaceHorseUpdate(guildCode: string, woodenHorseList: WoodenHorse[], ranks: GuildRankParams, events: Event[] ) {
this.pushMessage(guildCode, this.GUILD_RACE_UPDATE, {
timestamp: Date.now(),
woodenHorseList,
...ranks,
events
});
}
/**
* @description 向军团推送事件
* @param guildCode
*/
public async sendRaceEvent(guildCode: string, events: Event[]) {
this.pushMessage(guildCode, this.GUILD_RACE_EVENT, { timestamp: Date.now(), events });
}
}

28
game-server/app/servers/guild/handler/gateActivityHandler.ts
View File

@@ -306,17 +306,6 @@ export class GateActivityHandler {
return resResult(STATUS.GUILD_ACTIVITY_IS_OPEN)
}
let map = new Map<number, string[]>();
let guilds = await GuildModel.findAllGuild('serverId code');
for(let { serverId, code } of guilds) {
if(map.has(serverId)) {
map.get(serverId).push(code);
} else {
map.set(serverId, [code]);
}
}
await delGuildActivityRank(aid, map);
return resResult(STATUS.SUCCESS);
}
@@ -327,10 +316,27 @@ export class GateActivityHandler {
await pinus.app.rpc.systimer.systimerRemote.gateActivityEnd.toServer('systimer-server-1');
} else if (aid == GUILD_ACTIVITY_TYPE.CITY_ACTIVITY) {
await pinus.app.rpc.systimer.systimerRemote.cityActivityEnd.toServer('systimer-server-1');
} else if (aid == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
await pinus.app.rpc.systimer.systimerRemote.raceActivityEnd.toServer('systimer-server-1');
}
return resResult(STATUS.SUCCESS);
}
async debugDelRedis(msg: { aid: number }, session: BackendSession) {
let { aid } = msg;
let map = new Map<number, string[]>();
let guilds = await GuildModel.findAllGuild('serverId code');
for(let { serverId, code } of guilds) {
if(map.has(serverId)) {
map.get(serverId).push(code);
} else {
map.set(serverId, [code]);
}
}
await delGuildActivityRank(aid, map);
}
// ! 测试接口 将自己添加进活动roleId里
async debugAddParticipants(msg: { aid: number }, session: BackendSession) {
let roleId = session.get('roleId');

63
game-server/app/servers/guild/handler/raceActivityHandler.ts
View File

@@ -1,8 +1,12 @@
import { Application, ChannelService, BackendSession } from "pinus";
import { GUILD_ACTIVITY_TYPE, STATUS, GUILD_ACTIVITY_STATUS } from "../../../consts";
import { GUILD_ACTIVITY_TYPE, STATUS, GUILD_ACTIVITY_STATUS, GUILD_POINT_WAYS, REDIS_KEY } from "../../../consts";
import { resResult } from "../../../pubUtils/util";
import { getGuildActivityStatus, getRaceActivityObj, getRaceActivityRank, getWoodenHorseList, calWoodenHorseAndSend } from "../../../services/guildActivityService";
import { UserGuildModel } from "../../../db/UserGuild";
import { GuildActivityRecordModel } from "../../../db/GuildActivityRec";
import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
import { addActive } from "../../../services/guildService";
import { getMyUnionRank } from "../../../services/redisService";
export default function (app: Application) {
return new RaceActivityHandler(app);
@@ -52,6 +56,7 @@ export class RaceActivityHandler {
const roleName = session.get('roleName');
const serverId = session.get('serverId');
const guildCode = session.get('guildCode');
const sid = session.get('sid');
if(!guildCode) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let statusResult = getGuildActivityStatus(this.aid);
@@ -59,14 +64,26 @@ export class RaceActivityHandler {
let obj = getRaceActivityObj();
let hasJoin = obj.hasJoin(guildCode, roleId);
if(hasJoin) {
return resResult(STATUS.RACE_HAS_JOIN);
}
let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid);
if(!guildActivityRec) return resResult(STATUS.INTERNAL_ERR);
let { code: sourceCode } = guildActivityRec;
let myGuildActivityRec = await UserGuildActivityRecModel.getRecord(roleId, roleName, guildCode, serverId, sourceCode, this.aid);
let myGuild = await UserGuildModel.getMyGuild(roleId, 'job');
let woodenHorse = obj.joinWoodenHorse(guildCode, roleId, roleName, myGuild.job);
let woodenHorse = await obj.joinWoodenHorse(guildCode, roleId, roleName, serverId, sid, myGuild.job);
if(!woodenHorse) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let events = obj.getEvents(guildCode, woodenHorse.distance);
let hasJoin = obj.hasJoin(guildCode, roleId);
return resResult(STATUS.SUCCESS, {
code: myGuildActivityRec.code,
...statusResult,
hasJoin,
woodenHorse,
@@ -106,6 +123,46 @@ export class RaceActivityHandler {
});
}
// 结束挑战
async useItem(msg: { id: number, toGuild: string }, session: BackendSession) {
let roleId = session.get('roleId');
let roleName = session.get('roleName');
let guildCode = session.get('guildCode');
let serverId = session.get('serverId');
return resResult(STATUS.SUCCESS);
}
// 结束挑战
async battleEnd(msg: { code: string, isSuccess: boolean }, session: BackendSession) {
let roleId = session.get('roleId');
let roleName = session.get('roleName');
let guildCode = session.get('guildCode');
let serverId = session.get('serverId');
let { code, isSuccess } = msg;
let statusResult = getGuildActivityStatus(this.aid);
if(!statusResult) return resResult(STATUS.DIC_DATA_NOT_FOUND);
// 更新userGuildActivityRecord
let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid);
let myGuildActivityRec = await UserGuildActivityRecModel.updateInfo(code, { isSuccess, isCompleted: true });
if(!guildActivityRec || !myGuildActivityRec) return resResult(STATUS.INTERNAL_ERR);
// 发放活跃
await addActive(roleId, serverId, GUILD_POINT_WAYS.ACTIVITY); //获得活跃值
// 返回当前军团总军功
let myGuildRank = await getMyUnionRank(REDIS_KEY.RACE_ACTIVITY, serverId, guildCode);
return resResult(STATUS.SUCCESS, {
timestamp: Date.now(),
woodenHorse: guildActivityRec.woodenHorse,
myGuildRank
})
}
async test(msg: { serverId: number }, session: BackendSession) {
let {serverId} = msg;
await calWoodenHorseAndSend(serverId);

9
game-server/app/servers/guild/remote/guildActivityRemote.ts
View File

@@ -1,5 +1,5 @@
import { Application, ChannelService } from 'pinus';
import { sendAllGuildRanks, sendGuildActEndMsg, calWoodenHorseAndSend } from '../../../services/guildActivityService';
import { sendAllGuildRanks, sendGuildActEndMsg, calWoodenHorseAndSend, sendRaceStartMsg } from '../../../services/guildActivityService';
export default function (app: Application) {
return new GuildActivityRemote(app);
@@ -34,4 +34,11 @@ export class GuildActivityRemote {
public async calWoodenHorseAndSend(serverId: number) {
await calWoodenHorseAndSend(serverId);
}
/**
* 发送粮草先行活动开始通知
*/
async raceActivityStart(serverId: number) {
await sendRaceStartMsg(serverId);
}
}

6
game-server/app/servers/systimer/remote/systimerRemote.ts
View File

@@ -1,5 +1,5 @@
import { Application, ChannelService } from 'pinus';
import { resetPvpSeasonTime, setPvpDefResult, guildActivityStart, gateActivityEnd, cityActivityEnd } from '../../../services/timeTaskService';
import { resetPvpSeasonTime, setPvpDefResult, guildActivityStart, gateActivityEnd, cityActivityEnd, raceActivityEnd } from '../../../services/timeTaskService';
import PvpDefenseType from '../../../db/PvpDefense';
import { DicGuildActivity } from '../../../pubUtils/dictionary/DicGuildActivity';
export default function (app: Application) {
@@ -33,4 +33,8 @@ export class SystimerRemote {
public async cityActivityEnd() {
return await cityActivityEnd();
}
public async raceActivityEnd() {
return await raceActivityEnd();
}
}

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

@@ -138,7 +138,6 @@ export function getRecordScore(aid: number, round: number, record: { round: numb
let score = gameData.gateActivityPoint.get(enemyType);
newRecords.push({ round, dataId, score, enemyType});
sum += score;
console.log('*******', sum, score, enemyType);
historyEnemies.push(dataId);
}
@@ -147,7 +146,6 @@ export function getRecordScore(aid: number, round: number, record: { round: numb
for(let i = curRound + 1; i <= round; i++) {
sum += gameData.gateActivityPoint.get(GET_POINT_WAYS.ROUND_START);
memberRecord.round = i;
console.log('********', sum, i);
}
return { score: sum, newRecords, memberRecord }
@@ -313,6 +311,12 @@ export async function sendGuildActEndMsg(aid: number) {
await autoDeclare(serverId);
}
cityActivityObj = new CityActivityObject();
} else if (aid == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
let obj = getRaceActivityObj();
let woodenHorseList = obj.getAllWoodenHorses();
for(let [guildCode, woodenHorse] of woodenHorseList) {
await raceActivitySettleReward(guildCode, woodenHorse);
}
}
}
@@ -351,6 +355,17 @@ export async function sendSingleCityActEndMsg(cityId: number, serverId: number)
}
/**
* 单个军团抵达赛道之后给他发奖励
* @param guildCode 军团code
*/
export async function sendSingleRaceActEndMsg(guildCode: string, woodenHorse: WoodenHorse) {
let chatSid = await getGuildChannelSid(guildCode);
pinus.app.rpc.chat.guildRemote.sendGuildActivityEnd.toServer(chatSid, guildCode);
await raceActivitySettleReward(guildCode, woodenHorse);
}
/**
* 结算蛮夷入侵奖励
* @param guildCode 军团code
@@ -534,14 +549,27 @@ export function getCityStatus(guildCode: string, cityId: number, preCity: number
return status;
}
/**
* 每秒计算木牛流马状态并下发
* @param serverId 区id
*/
export async function calWoodenHorseAndSend(serverId: number) {
console.log('calWoodenHorseAndSend');
let guildKey = REDIS_KEY.RACE_ACTIVITY;
let obj = getRaceActivityObj();
let { ranks } = await getUnionRank(guildKey, serverId, '');
let map = new Map<number, WoodenHorse[]>();
let user = new Map<number, string>();
let guildRank = new Array<SimpleGuildRankWithTimeParam>();
let l = ranks.length > 10?10: ranks.length;
for(let i = 0; i < l; i++) {
let { rank, code, name, num } = ranks[i]
let _obj = await obj.getWoodenHorse(code, serverId);
let param = new SimpleGuildRankWithTimeParam(rank, code, name, num, _obj?_obj.time:0, _obj?_obj.durability:0);
guildRank.push(param);
}
// 找到往前和往后2艘船
for(let i = 0; i < ranks.length; i++) {
let { code } = ranks[i];
for(let j = i; j <= i + 2; j++) {
@@ -549,23 +577,28 @@ export async function calWoodenHorseAndSend(serverId: number) {
map.set(j, new Array<WoodenHorse>());
}
}
user.set(i, code);
for(let [rank, woodenHorseList] of map) {
let woodenHorse = await obj.getWoodenHorse(code, serverId);
if(woodenHorse) {
map.get(rank).push(woodenHorse);
} else {
map.get(rank).push(new WoodenHorse(rank.toString(), 's',0));
}
let len = map.get(rank).length;
let limit = 5;
if(rank - 2 < 0) limit += rank - 2;
if(rank + 2 > ranks.length - 1) limit -= (rank + 2) - (ranks.length - 1);
let woodenHorse = await obj.getWoodenHorse(code, serverId);
if(!!woodenHorse) {
map.get(rank).push(woodenHorse);
} else {
limit --; // 理论上不能出现没有woodenHorse的情况，但是如果出现了，以防无返回
}
let len = map.get(rank).length;
if( len >= limit) {
// 发送
let roleId = user.get(rank);
console.log('send', roleId, woodenHorseList.length, JSON.stringify(woodenHorseList));
console.log('send', woodenHorseList.length);
let curRank = ranks[rank];
let wh = await obj.getWoodenHorse(curRank.code, serverId);
let myGuildRank = new SimpleGuildRankWithTimeParam(curRank.rank, curRank.code, curRank.name, curRank.num, wh?wh.time:0, wh?wh.durability:0);
let chatSid = await getGuildChannelSid(curRank.code);
let events = obj.getEvents(curRank.code, wh?wh.distance:0);
pinus.app.rpc.chat.guildRemote.pushRaceHorseUpdate.toServer(chatSid, curRank.code, woodenHorseList, { guildRank, myGuildRank }, events);
map.delete(rank);
}
@@ -573,4 +606,53 @@ export async function calWoodenHorseAndSend(serverId: number) {
}
return ;
}
/**
* 木牛流马活动开始信号
*/
export async function sendRaceStartMsg(serverId: number) {
let obj = getRaceActivityObj();
obj.startRace(); // 设置开启活动
let chatSid = await getWorldChannelSid(serverId);
pinus.app.rpc.chat.chatRemote.sendRaceActivityStart.toServer(chatSid, serverId);
await calWoodenHorseAndSend(serverId);
}
/**
* 结算粮草先行奖励
* @param cityId 城镇id
* @param serverId 服务器id
*/
export async function raceActivitySettleReward(guildCode: string, woodenHorse: WoodenHorse) {
let { serverId, durability, distance } = woodenHorse;
let obj = getRaceActivityObj();
// 计算排名，计算耐久，发送奖励
let rank = await getMyUnionRank(REDIS_KEY.RACE_ACTIVITY, serverId, guildCode);
let isSuccess = distance >= GUILDACTIVITY.RACEACTIVITY_LENGTH; // 血条未击破则没有占领军团
let myGuildRank = await getMyUnionRank(REDIS_KEY.RACE_ACTIVITY, serverId, guildCode);
let members = obj.getMembersOfGuild(guildCode);
let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.RACE_ACTIVITY, myGuildRank);
let rec = await GuildActivityRecordModel.updateInfo(guildCode, {
memberCnt: members.length, members,
isSuccess, isCompleted: true, rank: myGuildRank,
rewards,
woodenHorse,
});
// 奖励加入拍卖行
await genAuction(guildCode, AUCTION_SOURCE.GATE, rec.code, serverId, rewards);
let dic = gameData.guildActivity.get(GUILD_ACTIVITY_TYPE.RACE_ACTIVITY);
let honour = dic.honour + Math.floor(durability * GUILDACTIVITY.RACEACTIVITY_DURABILITY_REWARD);
for(let { roleId } of members) {
await updateUserRecAndSendHonour(honour, 0, rank, roleId, members);
}
// 删除数据
obj.deleteRecord(guildCode);
}

35
game-server/app/services/redisService.ts
View File

@@ -164,9 +164,9 @@ export async function setRank(key: string, serverId: number, myId: string, score
} else {
const _score = encodeScoreWithTime(score, timestamp);
await redisClient().zaddAsync(getKeyName(key, serverId), _score, myId);
// 移除100名以外
await redisClient().zremrangebyrankAsync(getKeyName(key, serverId), limit, 10000);
}
// 移除100名以外
await redisClient().zremrangebyrankAsync(getKeyName(key, serverId), limit, 10000);
let infoKey = REDIS_RANK_TO_INFO.get(key)||REDIS_KEY.USER_INFO;
// 如果没有信息，更新玩家信息
@@ -177,6 +177,21 @@ export async function setRank(key: string, serverId: number, myId: string, score
return parseInt(newScore.toString());
}
export async function setRankWithoutUserInfo(key: string, serverId: number, myId: string, score: number, timestamp: number, isAtom = false, isInc = true, limit = 100) {
// 更新分数
let newScore = score;
if(isAtom) {
newScore = await updateRankAtom(key, serverId, myId, score, timestamp, isInc);
} else {
const _score = encodeScoreWithTime(score, timestamp);
await redisClient().zaddAsync(getKeyName(key, serverId), _score, myId);
// 移除100名以外
await redisClient().zremrangebyrankAsync(getKeyName(key, serverId), limit, 10000);
}
return parseInt(newScore.toString());
}
// 获取排行榜
export async function getRank(key: string, serverId: number, roleId: string, limit = 100) {
@@ -563,14 +578,18 @@ function redisClient() {
* @param score 得分
* @param time 事件
*/
async function updateRankAtom(key: string, serverId: number, field: string, score: number, timestamp: number) {
async function updateRankAtom(key: string, serverId: number, field: string, score: number, timestamp: number, isInc = true) {
let originKey = getKeyName(key, serverId);
let timeKey = getKeyName(key, serverId, 'time');
let timelen = 10;
let pow = Math.pow(10, timelen + 1);
let newScore = await redisClient().zincrbyAsync(originKey, score, field);
let newScore = 0;
if(isInc) {
newScore = await redisClient().zincrbyAsync(originKey, score, field);
} else {
newScore = await redisClient().zaddAsync(originKey, score, field);
}
await redisClient().zaddAsync(timeKey, pow - 1 - Math.floor(timestamp/1000), field);
await redisClient().expireatAsync(originKey, getNextHourPoint(5));
@@ -729,6 +748,12 @@ export async function delGuildActivityRank(aid: number, params: Map<number, stri
}
}
}
} else if (aid == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
for(let [serverId] of params) {
await redisClient().delAsync(getKeyName(REDIS_KEY.RACE_ACTIVITY, serverId));
await redisClient().delAsync(getKeyName(REDIS_KEY.RACE_ACTIVITY, serverId, 'time'));
await redisClient().delAsync(getKeyName(REDIS_KEY.RACE_ACTIVITY, serverId, 'union'));
}
}
}

62
game-server/app/services/timeTaskService.ts
View File

@@ -364,18 +364,25 @@ async function guildActivitySchedule() {
if(!statusResult) return;
if(statusResult.status == GUILD_ACTIVITY_STATUS.START) {
// 断掉活动续期
if(!guildActSecondsJobId) {
if(dicGuildActivity.id == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) {
guildActSecondsJobId = scheduleJob('guildActivitySeconds', `*/10 * * * * *`, gateActivitySeconds);
} else if(dicGuildActivity.id == GUILD_ACTIVITY_TYPE.CITY_ACTIVITY) {
guildActSecondsJobId = scheduleJob('guildActivitySeconds', `*/10 * * * * *`, cityActivitySeconds);
} else if(dicGuildActivity.id == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
// guildActSecondsJobId = scheduleJob('guildActivitySeconds', `*/1 * * * * *`, raceActivitySeconds);
guildActSecondsJobId = scheduleJob('guildActivitySeconds', `*/1 * * * * *`, raceActivitySeconds);
}
}
if(!guildActEndJobId) {
guildActEndJobId = scheduleJob('guildActivityEnd', statusResult.time, gateActivityEnd);
if(dicGuildActivity.id == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) {
guildActEndJobId = scheduleJob('guildActivityEnd', statusResult.time, gateActivityEnd);
} else if(dicGuildActivity.id == GUILD_ACTIVITY_TYPE.CITY_ACTIVITY) {
guildActEndJobId = scheduleJob('guildActivityEnd', statusResult.time, cityActivityEnd);
} else if(dicGuildActivity.id == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
guildActEndJobId = scheduleJob('guildActivityEnd', statusResult.time, raceActivityEnd);
}
}
}
}
@@ -404,6 +411,17 @@ export async function guildActivityStart(dicGuildActivity?: DicGuildActivity) {
guildActEndJobId = scheduleJob('guildActivityEnd', Date.now() + dicGuildActivity.duringTime * 1000, cityActivityEnd);
} else if (dicGuildActivity.id == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
// 开始活动
let servers = await getAllServers(); // 玩家serverId列表
let guildServers = pinus.app.getServersByType('guild');
for(let serverId of servers) {
let sid = dispatch(serverId.toString(), guildServers);
await pinus.app.rpc.guild.guildActivityRemote.raceActivityStart.toServer(sid.id, serverId);
}
guildActSecondsJobId = scheduleJob('guildActivitySeconds', '*/1 * * * * *', raceActivitySeconds);
// 结束时间
guildActEndJobId = scheduleJob('guildActivityEnd', Date.now() + dicGuildActivity.duringTime * 1000, raceActivityEnd);
}
return true;
}
@@ -419,8 +437,14 @@ export async function gateActivityEnd() {
await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.toServer(id, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY);
}
if(guildActSecondsJobId) guildActSecondsJobId.cancel();
if(guildActEndJobId) guildActEndJobId.cancel();
if(guildActSecondsJobId) {
guildActSecondsJobId.cancel();
guildActSecondsJobId = undefined;
}
if(guildActEndJobId) {
guildActEndJobId.cancel();
guildActEndJobId = undefined;
}
}
// 每10秒下发一次的任务
@@ -442,8 +466,14 @@ export async function cityActivityEnd() {
await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.toServer(id, GUILD_ACTIVITY_TYPE.CITY_ACTIVITY);
}
if(guildActSecondsJobId) guildActSecondsJobId.cancel();
if(guildActEndJobId) guildActEndJobId.cancel();
if(guildActSecondsJobId) {
guildActSecondsJobId.cancel();
guildActSecondsJobId = undefined;
}
if(guildActEndJobId) {
guildActEndJobId.cancel();
guildActEndJobId = undefined;
}
}
// 每10秒下发一次的任务
@@ -455,6 +485,26 @@ export async function cityActivitySeconds() {
}
}
// 粮草先行
// 结束军团活动
export async function raceActivityEnd() {
console.log('*****raceActivityEnd');
await sendEndMsgToAll();
let servers = pinus.app.getServersByType('guild');
for(let { id } of servers) {
await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.toServer(id, GUILD_ACTIVITY_TYPE.RACE_ACTIVITY);
}
if(guildActSecondsJobId) {
guildActSecondsJobId.cancel();
guildActSecondsJobId = undefined;
}
if(guildActEndJobId) {
guildActEndJobId.cancel();
guildActEndJobId = undefined;
}
}
// 每10秒下发一次的任务
export async function raceActivitySeconds() {
console.log('*****raveActivitySeconds')

2
game-server/app/util/routeUtil.ts
View File

@@ -80,7 +80,7 @@ export function guild(session: Session, msg: any, app: Application, cb: (err: Er
} else if (['guild.raceActivityHandler.getRaceActivity',
'guild.raceActivityHandler.join',
'guild.raceActivityHandler.getRace',
]) {
].indexOf(arg.route) !== -1) {
rid = session.get('serverId').toString();
}