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

名将擂台：刷新对手

Browse Source
This commit is contained in:
luying
2022-07-19 17:14:11 +08:00
parent 4ee1f25876
commit 7394f14e9d
17 changed files with 48281 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/consts/constModules/sysConst.ts
+7 -1
View File
@@ -244,6 +244,7 @@ export enum REDIS_KEY {
SURVEY_CHANNEL = 'survey', // 文件频道
USER_CHANNEL = 'userChannel', // 玩家登录频道
USER_CODE = 'userCode', // 玩家userCode对应roleId
LADDER = 'ladder', // 名将擂台
}
// 各排行榜对应hash的key
@@ -536,6 +537,10 @@ export const FILENAME = {
DIC_TOWER_PVP_SUB_ATTR: 'dic_tower_pvp_subattr',
DIC_SYSTEM_OPEN_TIME: 'dic_zyz_systemOpenTime',
DIC_MAIN_WAR_REWARD: 'dic_zyz_mainCity_reward',
DIC_LADDER_DIFFICULTRATIO: 'dic_zyz_ladder_difficultRatio',
DIC_LADDER_RANKREWARD: 'dic_zyz_ladder_rankReward',
DIC_GK_LADDER: 'dic_zyz_gk_ladder',
DIC_LADDER_MATCH: 'dic_zyz_ladderMatch',
}
export const WAR_RELATE_TABLES = [
@@ -556,7 +561,8 @@ export const WAR_RELATE_TABLES = [
FILENAME.DIC_GK_NEWHERO,
FILENAME.DIC_GK_PROBATION,
FILENAME.DIC_GK_ARMY_TRAIN,
FILENAME.DIC_GK_ARMY_BOSS
FILENAME.DIC_GK_ARMY_BOSS,
FILENAME.DIC_GK_LADDER,
]
// 装备栏强化类型
shared/db/LadderMatch.ts
+17 -1
View File
@@ -1,6 +1,6 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType, mongoose, Ref } from '@typegoose/typegoose';
import { LadderDefense, } from '../domain/battleField/ladder';
import { LadderDefense, LadderOppPlayerInDB } from '../domain/battleField/ladder';
import Role from './Role';
@index({ roleId: 1 })
@@ -19,6 +19,9 @@ export default class LadderMatch extends BaseModel {
@prop({ required: true, default: null, _id: false })
defense: LadderDefense;
@prop({ required: true, type: LadderOppPlayerInDB, default: [], _id: false })
oppPlayers: LadderOppPlayerInDB[];
@prop({ required: true, default: () => { return new Date() } })
refDaily: Date; // 每日刷新，控制refOppCnt和setAttackCnt
@prop({ required: true, default: 0 })
@@ -46,6 +49,19 @@ export default class LadderMatch extends BaseModel {
const defense: LadderMatchType = await LadderMatchModel.findOneAndUpdate({ roleId }, { $set: params}, { new: true }).lean();
return defense;
}
public static async findAll(serverId: number) {
let result: LadderMatchType[] = [], latestTime = new Date();
while(latestTime) {
let ladderMatch = await LadderMatchModel.find({ serverId, rank: { $gt: 0 }, createdAt: { $lt: latestTime } })
.sort({ createdAt: -1 })
.populate('role', 'roleId roleName head frame spine heads frames spines title lv updatedAt')
.limit(1000);
result.push(...ladderMatch);
latestTime = ladderMatch[ladderMatch.length - 1]?.createdAt;
}
return result
}
}
export const LadderMatchModel = getModelForClass(LadderMatch);
shared/domain/battleField/ladder.ts
+40 -2
View File
@@ -4,7 +4,9 @@ import Hero from '../../db/Hero';
import { LadderMatchType } from "../../db/LadderMatch";
import { LadderMatchRecType } from "../../db/LadderMatchRec";
import { RoleType } from "../../db/Role";
import { EXTERIOR } from "../../pubUtils/dicParam";
import { EXTERIOR, LADDER } from "../../pubUtils/dicParam";
import { DicLadderDifficultRatio } from "../../pubUtils/dictionary/DicLadderDifficultRatio";
import { RoleRankInfo } from "../rank";
// ladderMatch表
export class LadderDefenseHero {
@@ -134,7 +136,7 @@ export class LadderDefenseReturn {
}
export class LadderOppPlayerReturn {
rank: number; // 对手拍名
rank: number; // 对手排名
roleId: string; // 对手玩家id
roleName: string; // 对手玩家名
head: number; // 头像
@@ -144,6 +146,33 @@ export class LadderOppPlayerReturn {
title: number; // 对手爵位
defCe: number; // 对手防守阵容战力
isRobot: boolean; // 是否是机器人
constructor(rank: number, isRobot: boolean) {
this.rank = rank;
this.isRobot = isRobot;
}
setByRedis(param: RoleRankInfo, defCe: number) {
this.roleId = param.roleId;
this.roleName = param.roleName;
this.head = param.head;
this.frame = param.frame;
this.spine = param.spine;
this.lv = param.lv;
this.title = param.title;
this.defCe = defCe;
}
setByRobot(ladderDifficultRatio: DicLadderDifficultRatio) {
this.roleId = `robot${this.rank}`;
this.roleName = LADDER.LADDER_ROBOT_NAME;
this.frame = EXTERIOR.EXTERIOR_FACECASE;
this.head = ladderDifficultRatio.head;
this.spine = ladderDifficultRatio.spine;
this.lv = ladderDifficultRatio.level;
this.title = 1;
this.defCe = ladderDifficultRatio.ce;
}
}
export class LadderDataReturn {
@@ -180,4 +209,13 @@ export class LadderDataReturn {
this.oppPlayers = oppPlayers;
}
}
export class LadderOppPlayerInDB {
@prop({ required: true })
rank: number;
@prop({ required: true })
roleId: string;
@prop({ required: true })
isRobot: boolean;
}
shared/domain/rank.ts
+1
View File
@@ -306,6 +306,7 @@ export class KeyName {
case REDIS_KEY.GATE_ACTIVITY:
case REDIS_KEY.RACE_ACTIVITY:
case REDIS_KEY.TOWER_RANK:
case REDIS_KEY.LADDER:
return `${this.key}:${this.serverId}`;
case REDIS_KEY.HERO_RANK:
return `${this.key}:${this.serverId}:${this.hid}`;
shared/pubUtils/data.ts
+19
View File
@@ -107,6 +107,9 @@ import { dicTowerPvpSubAttr, loadTowerPvpSubAttr } from './dictionary/DicTowerPv
import { dicSystemOpenTime, loadSystemOpenTime } from "./dictionary/DicSystemOpenTime";
import { dicRandomEffectPoolPlan, loadRandomEffectPoolPlan } from './dictionary/DicRandomEffectPoolPlan';
import { dicMainWarRewardByChapter, loadMainWarReward } from './dictionary/DicMainWarReward';
import { dicLadderMatch, loadLadderMatch } from "./dictionary/DicLadderMatch";
import { dicLadderDifficultRatio, loadLadderDifficultRatio } from "./dictionary/DicLadderDifficultRatio";
import { dicLadderRankReward, loadLadderRankReward } from "./dictionary/DicLadderRankReward";
export const gameData = {
daily: dicDaily,
@@ -270,6 +273,9 @@ export const gameData = {
sysOpenTime: dicSystemOpenTime,
randomEffectPoolPlan: dicRandomEffectPoolPlan,
ladderConsume: new Array<{id: number, count: number, times: number}>(),
ladderMatch: dicLadderMatch,
ladderDifficultRatio: dicLadderDifficultRatio,
ladderRankReward: dicLadderRankReward
};
// 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -981,6 +987,16 @@ export function decodeLadderBuyCost() {
}
}
export function getDicLadderMatchByMyRank(myRank: number) {
for(let dic of gameData.ladderMatch) {
let { rankMin, rankMax } = dic;
if(rankMin < myRank && (rankMax >= myRank || rankMax == -1) ) {
return dic;
}
}
return null
}
// 初始加载
function initDatas() {
parseDicParam();
@@ -1154,6 +1170,9 @@ function loadDatas() {
loadSystemOpenTime();
loadRandomEffectPoolPlan();
loadMainWarReward();
loadLadderMatch();
loadLadderDifficultRatio();
loadLadderRankReward();
}
// 重载dicParam
shared/pubUtils/dictionary/DicLadderDifficultRatio.ts
+59
View File
@@ -0,0 +1,59 @@
// 邮件内容
import {decodeArrayListStr, parseGoodStr, readFileAndParse} from '../util'
import { FILENAME } from '../../consts'
import { RewardInter } from '../interface';
export interface DicLadderDifficultRatio {
// id
readonly id: number;
// 排名
readonly rank: number;
// 强度倍率
readonly value: number;
// 次级属性
readonly secondAttrLevel: number;
// 等级
readonly level: number;
// 关卡id
readonly gkId: number;
// 头像
readonly head: number;
// 形象
readonly spine: number;
// 胜利奖励
readonly randomWinReward: { id: number, count: number, weight: number }[];
// 失败奖励
readonly randomFailReward: { id: number, count: number, weight: number }[];
// 突破奖励
readonly onceReward: RewardInter[];
// 战力
readonly ce: number;
}
export const dicLadderDifficultRatio = new Map<number, DicLadderDifficultRatio>();
export function loadLadderDifficultRatio() {
dicLadderDifficultRatio.clear();
let arr = readFileAndParse(FILENAME.DIC_LADDER_DIFFICULTRATIO);
arr.forEach(o => {
o.gkId = parseInt(o.gkId);
o.randomWinReward = parseRewardWithWeight(o.randomWinReward);
o.randomFailReward = parseRewardWithWeight(o.randomFailReward);
o.onceReward = parseGoodStr(o.onceReward)
dicLadderDifficultRatio.set(o.id, o);
});
arr = undefined;
}
function parseRewardWithWeight(str: string) {
let result = new Array<{ id: number, count: number, weight: number }>();
if (!str) return result;
let decodeArr = decodeArrayListStr(str);
for (let [id, count, weight] of decodeArr) {
if (isNaN(parseInt(id)) || isNaN(parseInt(count)) || isNaN(parseInt(weight))) {
throw new Error('data table format wrong');
}
result.push({ id: parseInt(id), count: parseInt(count), weight: parseInt(weight) });
}
return result
}
shared/pubUtils/dictionary/DicLadderMatch.ts
+41
View File
@@ -0,0 +1,41 @@
// 名将擂台匹配范围
import { parseNumberList, readFileAndParse} from '../util'
import { FILENAME } from '../../consts'
export interface DicLadderMatch {
// id
readonly id: number;
// 最低排名
readonly rankMin: number;
// 最高排名
readonly rankMax: number;
// 玩家随机范围往前数最多多少人
readonly rangeBeforeMax: number;
// 玩家随机范围往后数最多多少人
readonly rangeAfterMax: number;
// 玩家随机范围往前随多少人
readonly rangeBeforeNum: number;
// 玩家随机范围往后随多少人
readonly rangeAfterNum: number;
// 玩家随机间隔
readonly gap: { min: number, max: number };
// 是否可以挑战前十
readonly topChallenge: number;
}
export const dicLadderMatch: DicLadderMatch[] = [];
export function loadLadderMatch() {
dicLadderMatch.splice(0, dicLadderMatch.length);
let arr = readFileAndParse(FILENAME.DIC_LADDER_MATCH);
arr.forEach(o => {
o.gap = parseGap(o.interval);
dicLadderMatch.push(o);
});
arr = undefined;
}
function parseGap(str: string) {
let arr = parseNumberList(str);
return { min: arr[0], max: arr[1] }
}
shared/pubUtils/dictionary/DicLadderRankReward.ts
+27
View File
@@ -0,0 +1,27 @@
// 名将擂台每天22点排名奖励
import {parseGoodStr, readFileAndParse} from '../util'
import { FILENAME } from '../../consts'
import { RewardInter } from '../interface';
export interface DicLadderRankReward {
// id
readonly id: number;
// 最低排名
readonly rankMin: number;
// 最高排名
readonly rankMax: number;
// 突破奖励
readonly reward: RewardInter[];
}
export const dicLadderRankReward: DicLadderRankReward[] = [];
export function loadLadderRankReward() {
dicLadderRankReward.splice(0, dicLadderRankReward.length);
let arr = readFileAndParse(FILENAME.DIC_LADDER_DIFFICULTRATIO);
arr.forEach(o => {
o.reward = parseGoodStr(o.reward)
dicLadderRankReward.push(o);
});
arr = undefined;
}
shared/pubUtils/redis.ts
+2
View File
@@ -48,6 +48,8 @@ declare module 'redis' {
zaddAsync(key: string, score: number, member: string): Promise<number>;
// 返回有序集中指定分数区间内的成员，分数从高到低排序
zrevrangebyscoreAsync(key: string, max: (string|number), min: (string|number), withscores?: string, limit?:string, offset?: number, count?:number): Promise<string[]>;
// 返回有序集中指定分数区间内的成员，分数从高到低排序
zrangebyscoreAsync(key: string, max: (string|number), min: (string|number), withscores?: string, limit?:string, offset?: number, count?:number): Promise<string[]>;
// 获取有序集合的成员数
zcardAsync(key: string): Promise<number>;
// 移除有序集合中给定的排名区间的所有成员
shared/resource/jsons/dic_zyz_gk_ladder.json
+112
View File
@@ -0,0 +1,112 @@
[
{
"war_id": 4601,
"dispatchJsonId": 4601,
"bg_img": 9965,
"mapid": 9965,
"script_id": 0,
"warType": 21,
"gk_name": "天梯模板1",
"lvLimted": 1,
"turnLimted": 10,
"forcedCharactor": "&",
"fobiddenCharactor": "&",
"heroInUI": "1&307",
"victoryInfoInUI": "消灭所有敌军\n10回合内造成伤害更高",
"loseInfoInUI": "我方全部阵亡 \n10回合内造成伤害不敌敌军",
"starInfoInUI": "无",
"cost": 0,
"recommendedPower": 0,
"previousGk": 0,
"needPrepare": 1,
"HeroNum": "6&6"
},
{
"war_id": 4602,
"dispatchJsonId": 4602,
"bg_img": 9965,
"mapid": 9965,
"script_id": 0,
"warType": 21,
"gk_name": "天梯模板2",
"lvLimted": 1,
"turnLimted": 10,
"forcedCharactor": "&",
"fobiddenCharactor": "&",
"heroInUI": "1&307",
"victoryInfoInUI": "消灭所有敌军\n10回合内造成伤害更高",
"loseInfoInUI": "我方全部阵亡 \n10回合内造成伤害不敌敌军",
"starInfoInUI": "无",
"cost": 0,
"recommendedPower": 0,
"previousGk": 0,
"needPrepare": 1,
"HeroNum": "6&6"
},
{
"war_id": 4603,
"dispatchJsonId": 4603,
"bg_img": 9965,
"mapid": 9965,
"script_id": 0,
"warType": 21,
"gk_name": "天梯模板3",
"lvLimted": 1,
"turnLimted": 10,
"forcedCharactor": "&",
"fobiddenCharactor": "&",
"heroInUI": "1&307",
"victoryInfoInUI": "消灭所有敌军\n10回合内造成伤害更高",
"loseInfoInUI": "我方全部阵亡 \n10回合内造成伤害不敌敌军",
"starInfoInUI": "无",
"cost": 0,
"recommendedPower": 0,
"previousGk": 0,
"needPrepare": 1,
"HeroNum": "6&6"
},
{
"war_id": 4604,
"dispatchJsonId": 4604,
"bg_img": 9965,
"mapid": 9965,
"script_id": 0,
"warType": 21,
"gk_name": "天梯模板4",
"lvLimted": 1,
"turnLimted": 10,
"forcedCharactor": "&",
"fobiddenCharactor": "&",
"heroInUI": "1&307",
"victoryInfoInUI": "消灭所有敌军\n10回合内造成伤害更高",
"loseInfoInUI": "我方全部阵亡 \n10回合内造成伤害不敌敌军",
"starInfoInUI": "无",
"cost": 0,
"recommendedPower": 0,
"previousGk": 0,
"needPrepare": 1,
"HeroNum": "6&6"
},
{
"war_id": 4605,
"dispatchJsonId": 4605,
"bg_img": 9965,
"mapid": 9965,
"script_id": 0,
"warType": 21,
"gk_name": "天梯模板5",
"lvLimted": 1,
"turnLimted": 10,
"forcedCharactor": "&",
"fobiddenCharactor": "&",
"heroInUI": "1&307",
"victoryInfoInUI": "消灭所有敌军\n10回合内造成伤害更高",
"loseInfoInUI": "我方全部阵亡 \n10回合内造成伤害不敌敌军",
"starInfoInUI": "无",
"cost": 0,
"recommendedPower": 0,
"previousGk": 0,
"needPrepare": 1,
"HeroNum": "6&6"
}
]
shared/resource/jsons/dic_zyz_ladderMatch.json
+112
View File
@@ -0,0 +1,112 @@
[
{
"id": 1,
"rankMin": 0,
"rankMax": 1,
"rangeBeforeMax": 0,
"rangeAfterMax": 0,
"rangeBeforeNum": 0,
"rangeAfterNum": 0,
"interval": "0&0",
"topChallenge": 1
},
{
"id": 2,
"rankMin": 1,
"rankMax": 10,
"rangeBeforeMax": 0,
"rangeAfterMax": 0,
"rangeBeforeNum": 0,
"rangeAfterNum": 1,
"interval": "0&0",
"topChallenge": 1
},
{
"id": 3,
"rankMin": 10,
"rankMax": 20,
"rangeBeforeMax": 5,
"rangeAfterMax": 1,
"rangeBeforeNum": 3,
"rangeAfterNum": 1,
"interval": "0&5",
"topChallenge": 1
},
{
"id": 4,
"rankMin": 20,
"rankMax": 50,
"rangeBeforeMax": 10,
"rangeAfterMax": 1,
"rangeBeforeNum": 5,
"rangeAfterNum": 1,
"interval": "0&5",
"topChallenge": 0
},
{
"id": 5,
"rankMin": 50,
"rankMax": 100,
"rangeBeforeMax": 30,
"rangeAfterMax": 5,
"rangeBeforeNum": 5,
"rangeAfterNum": 1,
"interval": "3&6",
"topChallenge": 0
},
{
"id": 6,
"rankMin": 100,
"rankMax": 200,
"rangeBeforeMax": 50,
"rangeAfterMax": 10,
"rangeBeforeNum": 5,
"rangeAfterNum": 1,
"interval": "5&10",
"topChallenge": 0
},
{
"id": 7,
"rankMin": 200,
"rankMax": 500,
"rangeBeforeMax": 100,
"rangeAfterMax": 50,
"rangeBeforeNum": 5,
"rangeAfterNum": 1,
"interval": "10&20",
"topChallenge": 0
},
{
"id": 8,
"rankMin": 500,
"rankMax": 1000,
"rangeBeforeMax": 200,
"rangeAfterMax": 100,
"rangeBeforeNum": 5,
"rangeAfterNum": 1,
"interval": "20&40",
"topChallenge": 0
},
{
"id": 9,
"rankMin": 1000,
"rankMax": 2000,
"rangeBeforeMax": 300,
"rangeAfterMax": 100,
"rangeBeforeNum": 5,
"rangeAfterNum": 1,
"interval": "30&60",
"topChallenge": 0
},
{
"id": 10,
"rankMin": 2000,
"rankMax": -1,
"rangeBeforeMax": 500,
"rangeAfterMax": 100,
"rangeBeforeNum": 5,
"rangeAfterNum": 1,
"interval": "50&100",
"topChallenge": 0
}
]
shared/resource/jsons/dic_zyz_ladder_difficultRatio.json
+47602
View File
File diff suppressed because it is too large Load Diff
shared/resource/jsons/dic_zyz_ladder_rankReward.json
+56
View File
@@ -0,0 +1,56 @@
[
{
"id": 1,
"rankMin": 0,
"rankMax": 1,
"reward": "31002&1000"
},
{
"id": 2,
"rankMin": 1,
"rankMax": 10,
"reward": "31002&1000"
},
{
"id": 3,
"rankMin": 10,
"rankMax": 50,
"reward": "31002&1000"
},
{
"id": 4,
"rankMin": 50,
"rankMax": 100,
"reward": "31002&1000"
},
{
"id": 5,
"rankMin": 100,
"rankMax": 200,
"reward": "31002&1000"
},
{
"id": 6,
"rankMin": 200,
"rankMax": 500,
"reward": "31002&1000"
},
{
"id": 7,
"rankMin": 500,
"rankMax": 1000,
"reward": "31002&1000"
},
{
"id": 8,
"rankMin": 1000,
"rankMax": 2000,
"reward": "31002&1000"
},
{
"id": 9,
"rankMin": 2000,
"rankMax": -1,
"reward": "31002&1000"
}
]
shared/resource/jsons/dic_zyz_rankingType.json
+8 -1
View File
@@ -43,7 +43,7 @@
},
{
"id": 7,
"name": "主线推进 ",
"name": "主线推进",
"group": 2,
"groupName": "玩法",
"general": 0
@@ -61,5 +61,12 @@
"group": 2,
"groupName": "玩法",
"general": 0
},
{
"id": 10,
"name": "名将擂台",
"group": 2,
"groupName": "玩法",
"general": 0
}
]