✨ feat(pvp): 巅峰演武战区化

game-server/app/servers/battle/handler/pvpHandler.ts

@@ -29,6 +29,7 @@ import { PVPConfigModel } from '../../../db/PvpConfig';
 import { getAllServerName, getServerName } from '../../../services/redisService';
 import { RoleRankInfo } from '../../../domain/rank';
 import { isHeroHidden } from '../../../services/dataService';
+import { getPVPGroupIdOfServer } from '../../../services/serverService';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -42,6 +43,7 @@ export class PvpHandler {
     //1获取主界面
     async getData(msg: {}, session: BackendSession) {
         let roleId = session.get('roleId');
+        let serverId = session.get('serverId');
  
         let seasonNum: number = this.app.get('pvpSeasonNum');
         let seasonStartTime: number = this.app.get('pvpSeasonStartTime');
@@ -90,8 +92,9 @@ export class PvpHandler {
             result.setPvpSeasonResult(pvpSeasonResult);
             await PvpSeasonResultModel.setShow(roleId);
         }
-        // 拍卖
-        let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum });
+        // 排行榜
+        let groupId = await getPVPGroupIdOfServer(serverId);
+        let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum, groupId });
         let myRank = await r.getMyRank({ roleId });//去redis中获取排名
         result.setMyRank(myRank);
 
@@ -285,7 +288,8 @@ export class PvpHandler {
 
         if(seasonNum == pvpSeasonNum) {
             // 加入排行榜
-            let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum: pvpSeasonNum });
+            let groupId = await getPVPGroupIdOfServer(serverId);
+            let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum: pvpSeasonNum, groupId });
             await r.setRankWithRoleInfo(roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), role);
             let myRank = await r.getMyRank({ roleId });
             result.setMyRank(myRank);
@@ -482,6 +486,7 @@ export class PvpHandler {
     async getRank(msg: {}, session: BackendSession) {
 
         let roleId = session.get('roleId');
+        let serverId = session.get('serverId');
 
         let seasonNum: number = this.app.get('pvpSeasonNum');
         if(checkPvpSeasonIsWaiting()) { // 休赛期
@@ -489,7 +494,8 @@ export class PvpHandler {
         }
 
         let serverNames = await getAllServerName();
-        let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum });
+        let groupId = await getPVPGroupIdOfServer(serverId);
+        let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum, groupId });
         r.setGenerFieldsFun(function (param: RoleRankInfo) {
             let { serverId } = param;
             return { ...param, serverName: serverNames[serverId]||'无' };
@@ -557,7 +563,8 @@ export class PvpHandler {
             }
             heroes.sort((a, b) => b.score - a.score);
             let seasonNum: number = this.app.get('pvpSeasonNum');
-            let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum });
+            let groupId = await getPVPGroupIdOfServer(serverId);
+            let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum, groupId });
             let rank = await r.getMyRank({ roleId: oppoRoleId });//去redis中获取排名
 
             result = new PlayerDetail(oppoRoleId, heroes, rank);
@@ -657,7 +664,8 @@ export class PvpHandler {
 
         // 加入排行榜
         let seasonNum: number = this.app.get('pvpSeasonNum');
-        let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum });
+        let groupId = await getPVPGroupIdOfServer(serverId);
+        let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum, groupId });
         await r.setRankWithRoleInfo(roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), role);
 
         // 任务

game-server/app/servers/battle/remote/battleRemote.ts

@@ -4,8 +4,10 @@ import { reloadResources } from '../../../pubUtils/data';
 import { setApiIsClose } from '../../../services/chatService';
 import { setHiddenData } from '../../../services/dataService';
 import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
+import { setServerGroup } from '../../../services/serverService';
 import { savePvpSeasonMemory } from '../../../services/log/memoryLogService';
 import { setKvToMemory } from '../../../services/pushService';
+import { getPvpTime } from '../../../services/pvpService';
 import { taflush } from '../../../services/sdkService';
 import { setPvpSeasonNum, setPvpSettleSeasonNum } from '../../../services/timeTaskService';
 import { errlogger } from '../../../util/logger';
@@ -109,6 +111,13 @@ export class BattleRemote {
         }
     }
 
+    public async getPvpTime() {
+        try {
+            return getPvpTime();
+        } catch(e) {
+            errlogger.error(`remote ${__filename} \n ${e.stack}`);
+        }
+    }
 
     public setServerMainten(serverIds: number[], startTime: number, endTime: number) {
         try {
@@ -173,4 +182,12 @@ export class BattleRemote {
             errlogger.error(`remote ${__filename} \n ${e.stack}`);
         }
     }
+
+    public async setServerGroup() {
+        try {
+            return setServerGroup();
+        } catch(e) {
+            errlogger.error(`remote ${__filename} \n ${e.stack}`);
+        }
+    }
 }