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

🐞 fix(gvg): 结算页面将其他城池也返回

Browse Source
This commit is contained in:
luying
2023-03-22 18:06:39 +08:00
parent d98e96c403
commit f289856722
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/guild/handler/gvgBattleHandler.ts
+3 -2
View File
@@ -7,7 +7,7 @@ import { Application, BackendSession, ChannelService, HandlerService, pinus } fr
import { resResult, genCode, getRandSingleEelm } from "../../../pubUtils/util";
import { GVGLeagueModel } from '../../../db/GVGLeague';
import { getGroupKey, getGVGConfig, getGVGPeriodData, getGVGServerType } from '../../../services/gvg/gvgService';
import { redisAddBattleScore, battleEndSendMessage, calBattleScoreByCe, checkAreaIsInCity, checkGVGBattleStart, checkMoveStatus, getBattleRanksByCity, getBirthAreaOfCity, getGVGWarId, getOppHeroes, getTechKnifeHurt, getTechReviveMinus, initRobots, pushTeamMoveMessage, getGVGCitiesInfo, leaveCity, refreshTeams, checkEnterCityTime, generNewLineup, getBattleRank, checkSettleStatus, getSpineCnt } from '../../../services/gvg/gvgBattleService';
import { redisAddBattleScore, battleEndSendMessage, calBattleScoreByCe, checkAreaIsInCity, checkGVGBattleStart, checkMoveStatus, getBattleRanksByCity, getBirthAreaOfCity, getGVGWarId, getOppHeroes, getTechKnifeHurt, getTechReviveMinus, initRobots, pushTeamMoveMessage, getAllGVGCitiesInfo, leaveCity, refreshTeams, checkEnterCityTime, generNewLineup, getBattleRank, checkSettleStatus, getSpineCnt } from '../../../services/gvg/gvgBattleService';
import { getGVGBattleData } from '../../../services/gvg/gvgBattleMemory';
import { GVGBattleRecModel } from '../../../db/GVGBattleRec';
import { getFightTimeByPeriod } from '../../../services/gvg/gvgFightService';
@@ -700,7 +700,8 @@ export class GVGBattleHandler {
let { configId } = getGVGPeriodData();
let groupKey = await getGroupKey(serverId);
let cities = await getGVGCitiesInfo(configId, groupKey);
let serverType = await getGVGServerType(serverId);
let cities = await getAllGVGCitiesInfo(configId, groupKey, serverType);
let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode);
if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);
game-server/app/servers/guild/handler/gvgHandler.ts
+2 -1
View File
@@ -587,7 +587,7 @@ export class GVGHandler {
const guilds = await GuildModel.findByCodesWithoutPopulate(leagues.reduce((pre, cur) => [...pre, ...cur.guildCodes], []));
const result: GuardCityInfoPage[] = [];
for(let { cityId, guardLeagueCode } of result) {
for(let { cityId, guardLeague: guardLeagueCode } of cities) {
let league = leagues.find(cur => cur.leagueCode == guardLeagueCode);
if(!league) continue;
let prepare = prepares.find(cur => cur.leagueCode == guardLeagueCode);
@@ -596,6 +596,7 @@ export class GVGHandler {
let data = new GuardCityInfoPage(cityId);
data.setGuardLeague(league, prepare, leagueCe);
result.push(data);
}
return resResult(STATUS.SUCCESS, {