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

🎈 perf(排行榜): 武将排行榜修改为读数据库

Browse Source
This commit is contained in:
luying
2023-05-06 20:24:16 +08:00
parent 95b3c0a880
commit d30abf287f
5 changed files with 120 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
game-server/app/servers/role/handler/rankHandler.ts
View File

@@ -1,6 +1,6 @@
import { Application, BackendSession, HandlerService, pinus, } from "pinus"; import { Application, BackendSession, HandlerService, pinus, } from "pinus";
import { resResult } from "../../../pubUtils/util"; import { resResult } from "../../../pubUtils/util";
import { STATUS, getRedisKeyByRankType, ROLE_SELECT, RANK_TYPE, HERO_SELECT, GUILD_SELECT, RANK_FIRST_REWARD_STATUS, ITEM_CHANGE_REASON } from "../../../consts"; import { STATUS, getRedisKeyByRankType, ROLE_SELECT, RANK_TYPE, HERO_SELECT, GUILD_SELECT, RANK_FIRST_REWARD_STATUS, ITEM_CHANGE_REASON, REDIS_KEY } from "../../../consts";
import Role from "../../../db/Role"; import Role from "../../../db/Role";
import { UserGuildModel } from "../../../db/UserGuild"; import { UserGuildModel } from "../../../db/UserGuild";
import { GuildModel } from "../../../db/Guild"; import { GuildModel } from "../../../db/Guild";
@@ -9,6 +9,8 @@ import { gameData } from "../../../pubUtils/data";
import { addItems } from "../../../services/role/rewardService"; import { addItems } from "../../../services/role/rewardService";
import { RewardInter } from "../../../pubUtils/interface"; import { RewardInter } from "../../../pubUtils/interface";
import { RankFirstType } from "../../../db/RankFirst"; import { RankFirstType } from "../../../db/RankFirst";
import Hero from "../../../db/Hero";
import { LineupParam, RoleAndGuildRankInfo, RoleRankInfo } from "../../../domain/rank";
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -49,13 +51,52 @@ export class RoleHandler {
async getRank(msg: { type: number }, session: BackendSession) { async getRank(msg: { type: number }, session: BackendSession) {
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let serverId = session.get('serverId'); let serverId = session.get('serverId');
let guildCode = session.get('guildCode');
let { type } = msg; let { type } = msg;
let redisKey = getRedisKeyByRankType(type); let redisKey = getRedisKeyByRankType(type);
if (!redisKey) return resResult(STATUS.WRONG_PARMS); if (!redisKey) return resResult(STATUS.WRONG_PARMS);
let result = await getRankInHandler(redisKey, type, { serverId }, session);
return resResult(STATUS.SUCCESS, { type, ...result }); if(redisKey == REDIS_KEY.TOP_HERO_RANK) {
let heroRanks = await Hero.findByServerIdAndSortByCe(serverId);
let r = new Rank(REDIS_KEY.TOP_HERO_RANK, { serverId });
let ranks: RoleAndGuildRankInfo[] = [], myRank: RoleAndGuildRankInfo;
for(let rank = 1; rank <= heroRanks.length; rank++) {
let hero = heroRanks[rank - 1];
let result = new RoleAndGuildRankInfo(rank, hero.ce);
let param = <RoleRankInfo>await r.getParam(rank, hero.roleId, [hero.ce]);
if(!param) {
let role = await Role.findByRoleId(hero.roleId, ROLE_SELECT.RANK);
await r.generParamAndSet(REDIS_KEY.USER_INFO, { roleId: hero.roleId }, { role });
param = <RoleRankInfo>await r.getParam(rank, hero.roleId, [hero.ce]);
}
param.setTopLine([new LineupParam(hero)]);
result.setUserInfo(param);
ranks.push(result);
if(!myRank && param.roleId == roleId) myRank = result;
}
if(!myRank) {
let myHeroes = await Hero.findAndSortByCe(roleId);
let myHero = myHeroes[0];
let result = new RoleAndGuildRankInfo(0, myHero.ce);
let param = <RoleRankInfo>await r.getParam(0, roleId, [myHero.ce]);
if(!param) {
let role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK);
await r.generParamAndSet(REDIS_KEY.USER_INFO, { roleId }, { role });
param = <RoleRankInfo>await r.getParam(0, roleId, [myHero.ce]);
}
param.setTopLine([new LineupParam(myHero)]);
result.setUserInfo(param);
myRank = result;
}
return resResult(STATUS.SUCCESS, { type, myRank, ranks });
} else {
let result = await getRankInHandler(redisKey, type, { serverId }, session);
return resResult(STATUS.SUCCESS, { type, ...result });
}
} }
// 查看活跃排行榜 // 查看活跃排行榜
@@ -87,18 +128,45 @@ export class RoleHandler {
// 查看单个武将排行榜 // 查看单个武将排行榜
async getHeroRank(msg: { type: number, hid: number }, session: BackendSession) { async getHeroRank(msg: { type: number, hid: number }, session: BackendSession) {
let serverId = session.get('serverId') let serverId = session.get('serverId');
let roleId = session.get('roleId');
let { type, hid } = msg; let { type, hid } = msg;
let redisKey = getRedisKeyByRankType(type); let redisKey = getRedisKeyByRankType(type);
if (!redisKey) return resResult(STATUS.WRONG_PARMS); if (!redisKey) return resResult(STATUS.WRONG_PARMS);
let r = new Rank(redisKey, { serverId, hid }); let heroRanks = await Hero.findByServerIdAndHidAndSortByCe(serverId, hid);
let ranks = await r.getRankByRange(200, 0);
return resResult(STATUS.SUCCESS, { let r = new Rank(redisKey, { serverId });
type, hid, ranks let ranks: RoleRankInfo[] = [], myRank: RoleRankInfo;
}); for(let rank = 1; rank <= heroRanks.length; rank++) {
let hero = heroRanks[rank - 1];
let param = <RoleRankInfo>await r.getParam(rank, hero.roleId, [hero.ce]);
if(!param) {
let role = await Role.findByRoleId(hero.roleId, ROLE_SELECT.RANK);
await r.generParamAndSet(REDIS_KEY.USER_INFO, { roleId: hero.roleId }, { role });
param = <RoleRankInfo>await r.getParam(rank, hero.roleId, [hero.ce]);
}
param.setSingleHero([new LineupParam(hero)]);
ranks.push(param);
if(!myRank && param.roleId == roleId) myRank = param;
}
if(!myRank) {
let myHero = await Hero.findByHidAndRole(hid, roleId);
let param = <RoleRankInfo>await r.getParam(0, roleId, [myHero?.ce||0]);
if(!param) {
let role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK);
await r.generParamAndSet(REDIS_KEY.USER_INFO, { roleId }, { role });
param = <RoleRankInfo>await r.getParam(0, roleId, [myHero?.ce||0]);
}
if(myHero) {
param.setSingleHero([new LineupParam(myHero)]);
}
myRank = param;
}
return resResult(STATUS.SUCCESS, { type, hid, myRank, ranks });
} }
async receiveReward(msg: { type: number, id: number }, session: BackendSession) { async receiveReward(msg: { type: number, id: number }, session: BackendSession) {

12
game-server/app/services/playerCeService.ts
View File

@@ -495,13 +495,13 @@ async function updateRank(roleId: string, serverId: number, topLineupCe: number,
await r.setRankWithRoleInfo(roleId, topLineupCe, 0, role); await r.setRankWithRoleInfo(roleId, topLineupCe, 0, role);
// 最强武将 // 最强武将
for(let { hid, ce } of pushHeros) { // for(let { hid, ce } of pushHeros) {
let r2 = new Rank(REDIS_KEY.TOP_HERO_RANK, { serverId }); // let r2 = new Rank(REDIS_KEY.TOP_HERO_RANK, { serverId });
await r2.setRankWithHeroInfo(roleId, hid, ce, 0); // await r2.setRankWithHeroInfo(roleId, hid, ce, 0);
let r4 = new Rank(REDIS_KEY.HERO_RANK, { serverId, hid }); // let r4 = new Rank(REDIS_KEY.HERO_RANK, { serverId, hid });
await r4.setRankWithHeroInfo(roleId, hid, ce, 0); // await r4.setRankWithHeroInfo(roleId, hid, ce, 0);
} // }
// 总战力 // 总战力
let r3 = new Rank(REDIS_KEY.SUM_CE_RANK, { serverId }); let r3 = new Rank(REDIS_KEY.SUM_CE_RANK, { serverId });

36
game-server/app/services/rankService.ts
View File

@@ -1119,14 +1119,14 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
// console.log(roleId); // console.log(roleId);
await r.setRankWithRoleInfo(role.roleId, role.topLineupCe, role.updatedAt.getTime(), role); await r.setRankWithRoleInfo(role.roleId, role.topLineupCe, role.updatedAt.getTime(), role);
} }
} else if (type == REDIS_KEY.TOP_HERO_RANK) { // } else if (type == REDIS_KEY.TOP_HERO_RANK) {
let serverId = args.serverId; // let serverId = args.serverId;
let ranks = await Hero.getAllRank(serverId, HERO_SELECT.RANK_LINEUP); // let ranks = await Hero.getAllRank(serverId, HERO_SELECT.RANK_LINEUP);
let r = new Rank(type, { serverId }); // let r = new Rank(type, { serverId });
r.setIsInit(true); // r.setIsInit(true);
for (let hero of ranks) { // for (let hero of ranks) {
await r.setRankWithHeroInfo(hero.roleId, hero.hid, hero.ce, hero.updatedAt.getTime(), hero); // await r.setRankWithHeroInfo(hero.roleId, hero.hid, hero.ce, hero.updatedAt.getTime(), hero);
} // }
} else if (type == REDIS_KEY.HERO_NUM_RANK) { } else if (type == REDIS_KEY.HERO_NUM_RANK) {
let serverId = args.serverId; let serverId = args.serverId;
let ranks = await Role.getRank('heroNum', serverId, ROLE_SELECT.RANK); let ranks = await Role.getRank('heroNum', serverId, ROLE_SELECT.RANK);
@@ -1175,17 +1175,17 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
for (let role of ranks) { for (let role of ranks) {
await r.setRankWithRoleInfo(role.roleId, role.mainEliteWarId, role.mainEliteUpdatedAt, role); await r.setRankWithRoleInfo(role.roleId, role.mainEliteWarId, role.mainEliteUpdatedAt, role);
} }
} else if (type == REDIS_KEY.HERO_RANK) { // } else if (type == REDIS_KEY.HERO_RANK) {
let serverId = args.serverId; // let serverId = args.serverId;
for (let [hid] of gameData.recruit) { // for (let [hid] of gameData.recruit) {
let ranks = await Hero.getRank(hid, serverId, HERO_SELECT.RANK_LINEUP); // let ranks = await Hero.getRank(hid, serverId, HERO_SELECT.RANK_LINEUP);
let r = new Rank(type, { serverId, hid }); // let r = new Rank(type, { serverId, hid });
r.setIsInit(true); // r.setIsInit(true);
for (let hero of ranks) { // for (let hero of ranks) {
await r.setRankWithHeroInfo(hero.roleId, hid, hero.ce, hero.updatedAt.getTime(), hero); // await r.setRankWithHeroInfo(hero.roleId, hid, hero.ce, hero.updatedAt.getTime(), hero);
} // }
} // }
} else if (type == REDIS_KEY.LADDER) { } else if (type == REDIS_KEY.LADDER) {
let serverId = args.serverId; let serverId = args.serverId;
let ranks = await LadderMatchModel.findAll(serverId); let ranks = await LadderMatchModel.findAll(serverId);

8
shared/consts/constModules/sysConst.ts
View File

@@ -281,8 +281,10 @@ export function getInfoKeyByRedisKey(redisKey: REDIS_KEY) {
return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] }; return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] };
case REDIS_KEY.TOP_LINEUP_RANK: // 最强阵容排行 case REDIS_KEY.TOP_LINEUP_RANK: // 最强阵容排行
return { infoKey: REDIS_KEY.USER_INFO, extraKey: [REDIS_KEY.TOP_LINEUP_INFO] }; return { infoKey: REDIS_KEY.USER_INFO, extraKey: [REDIS_KEY.TOP_LINEUP_INFO] };
// case REDIS_KEY.TOP_HERO_RANK: // 最强武将排行
// return { infoKey: REDIS_KEY.USER_INFO, extraKey: [REDIS_KEY.HERO_INFO] };
case REDIS_KEY.TOP_HERO_RANK: // 最强武将排行 case REDIS_KEY.TOP_HERO_RANK: // 最强武将排行
return { infoKey: REDIS_KEY.USER_INFO, extraKey: [REDIS_KEY.HERO_INFO] }; return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] };
case REDIS_KEY.HERO_NUM_RANK: // 武将数量排行 case REDIS_KEY.HERO_NUM_RANK: // 武将数量排行
return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] }; return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] };
case REDIS_KEY.USER_LV: // 主公等级排行榜 case REDIS_KEY.USER_LV: // 主公等级排行榜
@@ -295,8 +297,10 @@ export function getInfoKeyByRedisKey(redisKey: REDIS_KEY) {
return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] }; return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] };
case REDIS_KEY.MAIN_ELITE_RANK: // 精英通关排名 case REDIS_KEY.MAIN_ELITE_RANK: // 精英通关排名
return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] }; return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] };
// case REDIS_KEY.HERO_RANK: // 武将排行榜
// return { infoKey: REDIS_KEY.USER_INFO, extraKey: [REDIS_KEY.HERO_INFO] };
case REDIS_KEY.HERO_RANK: // 武将排行榜 case REDIS_KEY.HERO_RANK: // 武将排行榜
return { infoKey: REDIS_KEY.USER_INFO, extraKey: [REDIS_KEY.HERO_INFO] }; return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] };
case REDIS_KEY.GUILD_ACTIVE_RANK: // 公会周活跃排行榜 case REDIS_KEY.GUILD_ACTIVE_RANK: // 公会周活跃排行榜
return { infoKey: REDIS_KEY.GUILD_INFO, extraKey: [] }; return { infoKey: REDIS_KEY.GUILD_INFO, extraKey: [] };

12
shared/db/Hero.ts
View File

@@ -101,6 +101,8 @@ export class EPlace {
@index({ seqId: 1 }) @index({ seqId: 1 })
@index({ roleId: 1, hid: 1 }) @index({ roleId: 1, hid: 1 })
@index({ roleId: 1, ce: -1 }) @index({ roleId: 1, ce: -1 })
@index({ serverId: 1, ce: -1 })
@index({ serverId: 1, hid: 1, ce: -1 })
export default class Hero extends BaseModel { export default class Hero extends BaseModel {
@prop({ required: true }) @prop({ required: true })
@@ -188,6 +190,16 @@ export default class Hero extends BaseModel {
return heroes return heroes
} }
public static async findByServerIdAndSortByCe(serverId: number) {
const heroes: HeroType[] = await HeroROModel.find({ serverId }).sort({ ce: -1 }).select('hid skinId star colorStar lv quality job roleId ce').limit(200).lean();
return heroes
}
public static async findByServerIdAndHidAndSortByCe(serverId: number, hid: number) {
const heroes: HeroType[] = await HeroROModel.find({ serverId, hid }).sort({ ce: -1 }).select('hid skinId star colorStar lv quality job roleId ce').limit(200).lean();
return heroes
}
public static async findBySeqIdRange(seqIds: Array<number>, roleId: string, lean = true) { public static async findBySeqIdRange(seqIds: Array<number>, roleId: string, lean = true) {
const hero: HeroType[] = await HeroROModel.find({ seqId: { $in: seqIds }, roleId }).lean(lean); const hero: HeroType[] = await HeroROModel.find({ seqId: { $in: seqIds }, roleId }).lean(lean);
return hero; return hero;