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

🐞 fix(gvg): 修复联军组建期相关的一些问题

Browse Source
This commit is contained in:
luying
2023-02-06 16:48:19 +08:00
parent d2267413d1
commit 4434ef5008
7 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
game-server/app/services/gvg/gvgFightService.ts
View File

@@ -1,13 +1,13 @@
// 征战中原相关
import moment = require("moment");
import { GVG_PERIOD, REDIS_KEY, VESTIGE_OPP_STATUS, VESTIGE_STATUS } from "../../consts";
import { GVG_PERIOD, GVG_RETURN_ITEM_TYPE, REDIS_KEY, VESTIGE_OPP_STATUS, VESTIGE_STATUS } from "../../consts";
import { ArtifactModel } from "../../db/Artifact";
import { GVGConfigModel } from "../../db/GVGConfig";
import { GVGLeagueModel, GVGLeagueType } from "../../db/GVGLeague";
import { GVGUserDataModel } from "../../db/GVGUserData";
import { GVGVestigeModel } from "../../db/GVGVestige";
import { GVGVestigeLeagueRankModel } from "../../db/GVGVestigeLeagueRank";
import { GVGVestigeLeagueRankModel, GVGVestigeLeagueRankType } from "../../db/GVGVestigeLeagueRank";
import { GVGVestigeLockModel } from "../../db/GVGVestigeLock";
import { GVGVestigeRankModel, GVGVestigeRankType, GVGVestigeRankUpdate } from "../../db/GVGVestigeRank";
import { GVGVestigeRecType } from "../../db/GVGVestigeRec";
@@ -17,7 +17,7 @@ import { RoleModel } from "../../db/Role";
import { OppDetailData, OppPlayerHeroInfo, OppPlayerInfo } from "../../domain/gvgField/gvgDb";
import { GVGVestigeOppPlayer } from "../../domain/gvgField/returnData";
import { KeyNameParam, LeagueRankInfo, myIdInter, RoleRankInfo } from "../../domain/rank";
import { gameData, getGVGVestigeRange } from "../../pubUtils/data";
import { gameData, getGVGVestigeLeagueRank, getGVGVestigeRange } from "../../pubUtils/data";
import { GVG } from "../../pubUtils/dicParam";
import { RewardInter } from "../../pubUtils/interface";
import { getTimeFun } from "../../pubUtils/timeUtil";
@@ -379,4 +379,20 @@ export async function saveVestigeRankSchedule() {
let playerSumRanks = await GVGVestigeSumRankModel.findAllScores();
await GVGUserDataModel.addVestigeScores(config.configId, playerSumRanks);
}
export function calVestigeLeagueBoxRewards(canReceiveRanks: GVGVestigeLeagueRankType[]) {
let rewards: RewardInter[] = [], leagueReward: RewardInter[] = [];
for(let { rank } of canReceiveRanks) {
let dicRank = getGVGVestigeLeagueRank(rank);
if(!dicRank) { console.error('dic_zyz_GVGVestigeLeagueRank error'); continue; }
combinePushItem(rewards, dicRank.rankReward);
combinePushItem(leagueReward, dicRank.rankLeagueReward);
}
let boxPreview: { id: number, count: number, itemType: number }[] = [];
for(let { id, count } of rewards) boxPreview.push({ id, count, itemType: GVG_RETURN_ITEM_TYPE.NORMAL_ITEM });
for(let { id, count } of leagueReward) boxPreview.push({ id, count, itemType: GVG_RETURN_ITEM_TYPE.GVG_ITEM });
return {
leagueReward, rewards, boxPreview, canReceiveBox: canReceiveRanks.length > 0
}
}

10
game-server/app/services/gvg/gvgService.ts
View File

@@ -80,11 +80,11 @@ export async function setGVGConfig(config?: GVGConfigType) {
* @returns
*/
export function getGVGConfig() {
let configId = pinus.app.get('gvgConfigId');
let teamTime = pinus.app.get('gvgTeamTime');
let prepareTime = pinus.app.get('gvgPrepareTime');
let battleTime = pinus.app.get('gvgBattleTime');
let scheduleTime = pinus.app.get('gvgScheduleTime');
let configId: number = pinus.app.get('gvgConfigId');
let teamTime: number = pinus.app.get('gvgTeamTime');
let prepareTime: number = pinus.app.get('gvgPrepareTime');
let battleTime: number = pinus.app.get('gvgBattleTime');
let scheduleTime: number = pinus.app.get('gvgScheduleTime');
return { configId, teamTime, prepareTime, battleTime, scheduleTime }
}