排行榜： 获取排行榜

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

@@ -74,7 +74,7 @@ export class GuildHandler {
         // 加入排行
         let r = new Rank(REDIS_KEY.GUILD_ACTIVE_RANK, {serverId});
         await r.setRankWithGuildInfo(guild.code, 0, Date.now(), guild);
-        let rank = await r.getMyRank(guild.code);
+        let rank = await r.getMyRank({ guildCode: guild.code });
 
         // 加入channel
         session.set('guildCode', guild.code);
@@ -280,7 +280,7 @@ export class GuildHandler {
 
         // 获取排行榜
         let r = new Rank(REDIS_KEY.GUILD_ACTIVE_RANK, { serverId });
-        const rank = await r.getMyRank(guild.code);
+        const rank = await r.getMyRank({ guildCode: guild.code });
 
         // 返回
         const result = { hasGuild: true, ...guild, leader: { ...leader, isOnline: leaderIsOnline }, rank, myInfo: {...userGuild }};
@@ -606,7 +606,7 @@ export class GuildHandler {
         this.app.rpc.chat.guildRemote.dismiss.toServer(chatSid,code);
 
         let r = new Rank(REDIS_KEY.GUILD_ACTIVE_RANK, {serverId});
-        await r.removeFromRank(code);
+        await r.removeFromRank({ guildCode: code });
         return resResult(STATUS.SUCCESS, { code, status: guild.status });
     }
 
@@ -790,6 +790,11 @@ export class GuildHandler {
         if(!result) {
             return resResult(STATUS.GUILD_FUND_NOT_ENOUGH);
         }
+        if(id == GUILD_STRUCTURE.ARMY_CENTER) {
+            let r = new Rank(REDIS_KEY.GUILD_LV_RANK, { serverId });
+            await r.setRankWithGuildInfo(code, guild.lv, guild.lvUpdateTime, guild);        
+        }
+        
         const resultStructure = result.structure.find(cur => cur.id == id);
 
         // 修改信息
@@ -919,7 +924,7 @@ export class GuildHandler {
         if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
                 
         let r = new Rank(REDIS_KEY.GUILD_ACTIVE_RANK, { serverId });
-        let { ranks, myRank } = await r.getRankListWithMyRank(myUserGuild.guildCode);
+        let { ranks, myRank } = await r.getRankListWithMyRank({ guildCode: myUserGuild.guildCode });
         if(!myRank) {
             let guild = await GuildModel.findByCode(myUserGuild.guildCode, serverId, 'code icon name lv leader activeWeekly');
             myRank = await r.generMyRankWithGuild(myUserGuild.guildCode, guild.activeWeekly, guild.activeUpdateTime, guild);

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

@@ -3,7 +3,7 @@ import { BattleRecordModel } from '../../../db/BattleRecord';
 import { BattleSweepRecordModel } from '../../../db/BattleSweepRecord';
 import { getWarById,  } from '../../../pubUtils/gamedata';
 import { genCode } from '../../../pubUtils/util';
-import { WAR_TYPE, EVENT_STATUS, FUNC_OPT_TYPE, MSG_SOURCE } from '../../../consts';
+import { WAR_TYPE, EVENT_STATUS, FUNC_OPT_TYPE, MSG_SOURCE, REDIS_KEY } from '../../../consts';
 import { checkDaily, checkDailyAndIncrease } from '../../../services/dailyBattleService';
 import { checkTowerWar, towerBattleEnd  } from '../../../services/battleService';
 import { WarReward } from '../../../services/warRewardService';
@@ -18,6 +18,8 @@ import { checkDungeonNum, checkDungeonAndIncrease } from '../../../services/dung
 import { switchOnFunc } from '../../../services/funcSwitchService';
 import { gameData } from '../../../pubUtils/data';
 import { pushMysteryFirstMsg, pushTowerMsg, pushVestigeFirstMsg } from '../../../services/chatService';
+import { nowSeconds } from '../../../pubUtils/timeUtil';
+import { Rank } from '../../../services/rankService';
 
 export default function(app: Application) {
     return new NormalBattleHandler(app);
@@ -215,11 +217,22 @@ export class NormalBattleHandler {
             }
         } else if (warInfo.warType == WAR_TYPE.MYSTERY || warInfo.warType == WAR_TYPE.MYSTERY_ELITE) {
             let checkResult = await checkDungeonAndIncrease(roleId, 1, false);
-            await RoleModel.saveDungeonHero(roleId, battleId, heroes, isSuccess);
+            let role = await RoleModel.saveDungeonHero(roleId, battleId, heroes, isSuccess);
+            let r = new Rank(REDIS_KEY.DUNGEON_RANK, { serverId });
+            await r.setRankWithRoleInfo(roleId, role.dungeonWarId, role.dungeonUpdatedAt, role);
+
             if(checkResult.status == -1) {
                 return checkResult.resResult;
             }
             dungeonNum = Object.assign(dungeonNum, checkResult.data)
+        } else if (warInfo.warType == WAR_TYPE.NORMAL) {
+            let role = await RoleModel.updateMainWarId(roleId, battleId, nowSeconds());
+            let r = new Rank(REDIS_KEY.MAIN_RANK, { serverId });
+            await r.setRankWithRoleInfo(roleId, role.mainWarId, role.mainUpdatedAt, role);
+        } else if (warInfo.warType == WAR_TYPE.MAIN_ELITE) {
+            let role = await RoleModel.updateMainEliteWarId(roleId, battleId, nowSeconds());
+            let r = new Rank(REDIS_KEY.MAIN_ELITE_RANK, { serverId });
+            await r.setRankWithRoleInfo(roleId, role.mainEliteWarId, role.mainEliteUpdatedAt, role);
         }
 
         if(isSuccess) { // 挑战胜利

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

@@ -442,7 +442,7 @@ export class PvpHandler {
             }
             heroes.sort((a, b) => b.score - a.score);
             let r = new Rank(REDIS_KEY.PVP_RANK, {});
-            let rank = await r.getMyRank(oppoRoleId);//去redis中获取排名
+            let rank = await r.getMyRank({ roleId: oppoRoleId });//去redis中获取排名
 
             result = new PlayerDetail({...role, ...pvpDefense, heroes, rank});
         }