diff --git a/game-server/app/servers/guild/handler/gvgBattleHandler.ts b/game-server/app/servers/guild/handler/gvgBattleHandler.ts index 3e7f8cc30..b562a813e 100644 --- a/game-server/app/servers/guild/handler/gvgBattleHandler.ts +++ b/game-server/app/servers/guild/handler/gvgBattleHandler.ts @@ -235,13 +235,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); + const recs = await GVGRecModel.findBattleRecByRole(configId, roleId, myLeague.leagueCode, 5); await leaveGVGCityTeamChannel(roleId, sid); await addRoleToGVGCityChannel(roleId, groupKey, cityId, sid); return resResult(STATUS.SUCCESS, { cityId, ranks, myRank, memberRanks, myMemberRank, memberSettleRanks, myMemberSettleRank, - recs: [], + recs, teams: teamResult, }); } diff --git a/game-server/app/services/gvg/gvgBattleService.ts b/game-server/app/services/gvg/gvgBattleService.ts index f22838c4d..71546bb75 100644 --- a/game-server/app/services/gvg/gvgBattleService.ts +++ b/game-server/app/services/gvg/gvgBattleService.ts @@ -450,9 +450,13 @@ export async function redisAddBattleScore(gvgTeam: GVGTeamType, incScore: number if(isRobot) return; let nextWeek = getTimeFun().getAfterDayWithHour(7); - let r = new Rank(REDIS_KEY.GVG_BATTLE_RANK, { configId, groupKey, cityId }); + let r = new Rank(REDIS_KEY.GVG_BATTLE_RANK, { configId, groupKey }); await r.setExpire(nextWeek); await r.setRankWithRoleInfo(roleId, incScore, Date.now(), null, true); + + let r2 = new Rank(REDIS_KEY.GVG_BATTLE_USR_SETTLE_RANK_BY_CITY, { configId, groupKey, cityId }); + await r2.setExpire(nextWeek); + await r2.setRankWithRoleInfo(roleId, incScore, Date.now(), null, true); } export async function redisAddSettleScore(gvgTeam: GVGTeamType, incScore: number) {