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

军团活动：粮草先行优化

Browse Source
This commit is contained in:
luying
2022-07-05 18:55:00 +08:00
parent 2a9fccf59f
commit 061a63d4ea
6 changed files with 124 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
game-server/app/services/guildActivity/guildActivityService.ts
View File

@@ -5,7 +5,7 @@ import { gameData, getGuildAuctionRewards, getCityActivityRewards } from "../../
import { getCurDay, nowSeconds, getTimeFun, getZeroPoint } from "../../pubUtils/timeUtil";
import { GUILD_ACTIVITY_STATUS, GET_POINT_WAYS, GUILD_ACTIVITY_TYPE, REDIS_KEY, AUCTION_SOURCE, MAIL_TYPE, CITY_STATUS, DEBUG_MAGIC_WORD, GUILD_POINT_WAYS, TASK_TYPE, AUCTION_TIME, CITY_ACTIVITY_DOOR, ABI_TYPE, PUSH_ROUTE, RACE_ACTIVITY_STATUS, SHOP_REFRESH_TYPE } from "../../consts";
import { Record, UserGuildActivityRecModel } from "../../db/UserGuildActivityRec";
import { GateMembersRec, CityParam, Member, WoodenHorse } from "../../domain/battleField/guildActivity";
import { GateMembersRec, CityParam, Member, WoodenHorse, RaceActivityRankParam } from "../../domain/battleField/guildActivity";
import { DicGuildActivity } from "../../pubUtils/dictionary/DicGuildActivity";
import { getAllServers, getRoleOnlineInfo } from "../redisService";
import { SimpleGuildRankParam, SimpleRoleRankParam, GuildRankInfo, RoleRankInfo } from "../../domain/rank";
@@ -622,42 +622,7 @@ export async function sendGuildCityDeclare(cityId: number, declareGuildCode: str
export async function calWoodenHorseAndSend(serverId: number) {
console.log('calWoodenHorseAndSend');
let obj = getRaceActivityObj();
let { guildRank: ranks } = await obj.getRanks(serverId);
let map = new Map<number, WoodenHorse[]>();
// 找到往前和往后2艘船
for (let i = 0; i < ranks.length; i++) {
let { code } = ranks[i];
for (let j = i; j <= i + 2; j++) {
if (j <= ranks.length - 1 && !map.has(j)) {
map.set(j, new Array<WoodenHorse>());
}
}
for (let [rank, woodenHorseList] of map) {
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) {
// 发送
// console.log('send', woodenHorseList.length);
let curRank = ranks[rank];
let wh = await obj.getWoodenHorse(curRank.code, serverId);
let events = obj.getEvents(curRank.code, wh ? wh.distance : 0);
await sendMessageToGuildWithSuc(curRank.code, PUSH_ROUTE.GUILD_RACE_UPDATE, { timestamp: Date.now(), woodenHorseList: woodenHorseList.filter(cur => cur.status != RACE_ACTIVITY_STATUS.END), guildRank: ranks, myGuildRank: curRank, events });
map.delete(rank);
}
}
}
return;
return await obj.calServerHorses(serverId);
}
/**
@@ -687,7 +652,8 @@ export async function gateActivityStart() {
* @param serverId 服务器id
*/
export async function raceActivitySettleReward(guildCode: string, woodenHorse: WoodenHorse) {
let { serverId, durability, distance } = woodenHorse;
let { serverId, durability, distance, isRobot } = woodenHorse;
if(isRobot) return;
let obj = getRaceActivityObj();
// 计算排名，计算耐久，发送奖励
let { guildRank, myGuildRank } = await obj.getRanks(serverId, guildCode);