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

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);
}