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:28:15 +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
game-server/app/services/guildActivityService.ts
+95 -13
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);
}
game-server/app/services/redisService.ts
+30 -5
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'));
}
}
}
game-server/app/services/timeTaskService.ts
+56 -6
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')