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

🐞 fix(gvg): 修复gvg守城会出现一个联军3个城

Browse Source
This commit is contained in:
luying
2023-03-07 13:43:18 +08:00
parent b749660bf9
commit 7e583b8f5d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
game-server/app/services/gvg/gvgBattleService.ts
View File

@@ -561,7 +561,7 @@ export async function calCityGuard(configId: number) {
for(let [groupKey, cities] of sortCities) { for(let [groupKey, cities] of sortCities) {
let cityResult: number[] = []; let cityResult: number[] = [];
let index = 0; // 防死循环，万一出什么事cityResult.length一直不等于cities.length let index = 0; // 防死循环，万一出什么事cityResult.length一直不等于cities.length
let guardLeagueCnt = new Map<string, number>();
while(cityResult.length != cities.length && (++index < 1000)) { while(cityResult.length != cities.length && (++index < 1000)) {
let sorted = cities let sorted = cities
.filter(city => cityResult.indexOf(city.cityId) == -1) .filter(city => cityResult.indexOf(city.cityId) == -1)
@@ -571,8 +571,8 @@ export async function calCityGuard(configId: number) {
return b.cityId - a.cityId; return b.cityId - a.cityId;
}); });
let guardLeagueCnt = new Map<string, number>();
for(let { league: leagueCode, cityId } of sorted) { for(let { league: leagueCode, cityId } of sorted) {
if(!leagueCode) continue;
let cnt = guardLeagueCnt.get(leagueCode)||0; let cnt = guardLeagueCnt.get(leagueCode)||0;
if(cnt < GVG.GVG_CITY_OCCUPIED_NUMBER) { if(cnt < GVG.GVG_CITY_OCCUPIED_NUMBER) {
await addGuardCity(configId, groupKey, cityId, leagueCode); await addGuardCity(configId, groupKey, cityId, leagueCode);
@@ -619,11 +619,12 @@ async function generateData(configId: number, sortCities: Map<string, SortCities
let r = new Rank(REDIS_KEY.GVG_BATTLE_LEAGUE_RANK_BY_CITY, { configId, groupKey, cityId }); let r = new Rank(REDIS_KEY.GVG_BATTLE_LEAGUE_RANK_BY_CITY, { configId, groupKey, cityId });
let ranks = <LeagueRankInfo[]>await r.getRankByRange(); let ranks = <LeagueRankInfo[]>await r.getRankByRange();
let guardCity = lastCities.find(city => city.cityId == cityId && city.groupKey == groupKey); if(ranks.length <= 0) continue;
if(!sortCities.has(groupKey)) sortCities.set(groupKey, []); if(!sortCities.has(groupKey)) sortCities.set(groupKey, []);
sortCities.get(groupKey).push({ cityType: dicCity.cityType, cityId, index: 0, league: ranks.length > 0? ranks[0].code: (guardCity?.guardLeague), score: ranks.length > 0? ranks[0].num: 0 }); sortCities.get(groupKey).push({ cityType: dicCity.cityType, cityId, index: 0, league: ranks[0].code, score: ranks[0].num });
if(!rankByCity.has(groupKey)) rankByCity.set(groupKey, new Map()); if(!rankByCity.has(groupKey)) rankByCity.set(groupKey, new Map());
let guardCity = lastCities.find(city => city.cityId == cityId && city.groupKey == groupKey);
if(!rankByCity.get(groupKey).has(cityId)) rankByCity.get(groupKey).set(cityId, { ranks, lastLeague: guardCity?.guardLeague??'' }) if(!rankByCity.get(groupKey).has(cityId)) rankByCity.get(groupKey).set(cityId, { ranks, lastLeague: guardCity?.guardLeague??'' })
} }
for(let { groupKey, cityId, guardLeague } of lastCities) { for(let { groupKey, cityId, guardLeague } of lastCities) {
@@ -641,9 +642,11 @@ async function generateData(configId: number, sortCities: Map<string, SortCities
} }
async function addGuardCity(configId: number, groupKey: string, cityId: number, leagueCode: string) { async function addGuardCity(configId: number, groupKey: string, cityId: number, leagueCode: string) {
console.log('####### addGuardCity', configId, groupKey, cityId, leagueCode)
let dicCity = gameData.gvgCity.get(cityId); let dicCity = gameData.gvgCity.get(cityId);
let dicCityAdd = gameData.gvgCityAdd.get(dicCity.cityType); let dicCityAdd = gameData.gvgCityAdd.get(dicCity.cityType);
let league = await GVGLeagueModel.findByCodeWithoutPopulate(leagueCode); let league = await GVGLeagueModel.findByCodeWithoutPopulate(leagueCode);
if(!league) return;
await GVGCityModel.guardCity(configId, groupKey, cityId, league); await GVGCityModel.guardCity(configId, groupKey, cityId, league);
await sendMailToLeagueByContent(MAIL_TYPE.GVG_GUARD_CITY_REWARD, leagueCode, { params: [dicCity.cityName], goods: dicCityAdd.occupyReward }, league); await sendMailToLeagueByContent(MAIL_TYPE.GVG_GUARD_CITY_REWARD, leagueCode, { params: [dicCity.cityName], goods: dicCityAdd.occupyReward }, league);
await addCityGuardMessage(league, cityId); await addCityGuardMessage(league, cityId);