diff --git a/game-server/app/servers/guild/handler/gvgBattleHandler.ts b/game-server/app/servers/guild/handler/gvgBattleHandler.ts index 11367c964..9f9c24061 100644 --- a/game-server/app/servers/guild/handler/gvgBattleHandler.ts +++ b/game-server/app/servers/guild/handler/gvgBattleHandler.ts @@ -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, getAllGVGCitiesInfo, 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, getPlayerRanksByCity, getPlayerSettleRanksByCity } from '../../../services/gvg/gvgBattleService'; import { getGVGBattleData } from '../../../services/memoryCache/gvgBattleData'; import { GVGBattleRecModel } from '../../../db/GVGBattleRec'; import { getFightTimeByPeriod } from '../../../services/gvg/gvgFightService'; @@ -233,12 +233,14 @@ export class GVGBattleHandler { } const { ranks, myRank } = await getBattleRanksByCity(configId, groupKey, cityId, myLeague); + const { ranks: memberRanks, myRank: myMemberRank } = await getPlayerRanksByCity(configId, groupKey, cityId, roleId); + const { ranks: memberSettleRanks, myRank: myMemberSettleRank } = await getPlayerSettleRanksByCity(configId, groupKey, cityId, roleId); await leaveGVGCityTeamChannel(roleId, sid); await addRoleToGVGCityChannel(roleId, groupKey, cityId, sid); return resResult(STATUS.SUCCESS, { cityId, - ranks, myRank, + ranks, myRank, memberRanks, myMemberRank, memberSettleRanks, myMemberSettleRank, recs: [], teams: teamResult, }); @@ -716,9 +718,10 @@ export class GVGBattleHandler { let { myRank: myLeagueRank, ranks: leagueRanks } = await getBattleRank(REDIS_KEY.GVG_BATTLE_LEAGUE_RANK, { configId, groupKey }, { leagueCode: myLeague.leagueCode }); let { myRank: myMemberRank, ranks: memberRanks } = await getBattleRank(REDIS_KEY.GVG_BATTLE_RANK, { configId, groupKey }, { roleId }); + let { myRank: memberSettleRanks, ranks: myMemberSettleRank } = await getBattleRank(REDIS_KEY.GVG_BATTLE_USR_SETTLE_RANK, { configId, groupKey }, { roleId }); return resResult(STATUS.SUCCESS, { - cities, leagueRanks, myLeagueRank, memberRanks, myMemberRank + cities, leagueRanks, myLeagueRank, memberRanks, myMemberRank, memberSettleRanks, myMemberSettleRank }) } @@ -792,6 +795,7 @@ export class GVGBattleHandler { async getRankByCity(msg: { cityId: number }, session: BackendSession) { const guildCode = session.get('guildCode'); const serverId = session.get('serverId'); + const roleId = session.get('roleId'); const { cityId } = msg; let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode); if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST); @@ -800,8 +804,10 @@ export class GVGBattleHandler { const groupKey = await getGroupKey(serverId); const { ranks, myRank } = await getBattleRanksByCity(configId, groupKey, cityId, myLeague); + const { ranks: memberRanks, myRank: myMemberRank } = await getPlayerRanksByCity(configId, groupKey, cityId, roleId); + const { ranks: memberSettleRanks, myRank: myMemberSettleRank } = await getPlayerSettleRanksByCity(configId, groupKey, cityId, roleId); return resResult(STATUS.SUCCESS, { - cityId, ranks, myRank + cityId, ranks, myRank, memberRanks, myMemberRank, memberSettleRanks, myMemberSettleRank }) }