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-03-14 14:55:10 +08:00
parent 522c4fd121
commit 6e3a82ddea
5 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/gvg/gvgFightService.ts
+7 -2
View File
@@ -1,7 +1,7 @@
// 征战中原相关
import moment = require("moment");
import { GVG_PERIOD, GVG_RETURN_ITEM_TYPE, ITEM_CHANGE_REASON, MAIL_TYPE, REDIS_KEY, VESTIGE_OPP_STATUS, VESTIGE_STATUS } from "../../consts";
import { GVG_PERIOD, GVG_RETURN_ITEM_TYPE, ITEM_CHANGE_REASON, LEAGUE_JOB, MAIL_TYPE, PUSH_ROUTE, 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";
@@ -25,10 +25,12 @@ import { getRandEelm } from "../../pubUtils/util";
import { getNumberArr, uniqueArr } from "../ladderService";
import { sendMailByContent } from "../mailService";
import { getHeroesAttributes } from "../playerCeService";
import { sendMessageToUserWithSuc } from "../pushService";
import { Rank } from "../rankService";
import { findKeys, getAllServerName, redisClient } from "../redisService";
import { isDevelopEnv } from "../utilService";
import { addGVGReward, combinePushItem } from "./gvgItemService";
import { calFighterContribute } from "./gvgPrepareService";
import { addVestigeLeagueRankRec, addVestigeRankMessage } from "./gvgRecService";
import { getGroupIdOfServer, getGroupKey, getGVGServerType, getPeriodByTime } from "./gvgService";
@@ -434,7 +436,10 @@ export async function saveVestigeRankSchedule() {
await GVGVestigeSumRankModel.saveRank(groupKey, ranks);
}
let playerSumRanks = await GVGVestigeSumRankModel.findAllScores();
await GVGUserDataModel.addVestigeScores(config.configId, playerSumRanks);
let userDatas = await GVGUserDataModel.addVestigeScores(config.configId, playerSumRanks);
for(let userData of userDatas) {
await sendMessageToUserWithSuc(userData.roleId, PUSH_ROUTE.GVG_CONTRIBUTE_UPDATE, { leagueCode: userData.leagueCode, job: LEAGUE_JOB.FIGHTER, sumContribute: calFighterContribute(userData.contribute) });
}
}
// systimer 服，每周六5点
game-server/app/services/gvg/gvgPrepareService.ts
+3 -2
View File
@@ -16,7 +16,7 @@ import { getGVGConfig, getGVGPeriodData } from "./gvgService";
import { GVGVestigeRankModel } from "../../db/GVGVestigeRank";
import { addLeagueLvUpMessage, addResourceRecord } from "./gvgRecService";
import { GVGLeagueType } from "../../db/GVGLeague";
import { sendMessageToGuildWithSuc } from "../pushService";
import { sendMessageToGuildWithSuc, sendMessageToUserWithSuc } from "../pushService";
import { sendMailByContent } from "../mailService";
export function checkPreTech(techId: number, activeQueue: number[], techQueue: Tech[]) {
@@ -118,7 +118,7 @@ export function getMyContribute(userDailyData: GVGUserDailyDataType, myRanks: {v
* @param count 数量
* @returns
*/
export async function addResource(myLeague: GVGLeagueType, roleId: string, roleName: string, resourceType: GVG_RESOURCE_TYPE, count: number) {
export async function addResource(myLeague: GVGLeagueType, roleId: string, roleName: string, resourceType: GVG_RESOURCE_TYPE, count: number, sid?: string) {
let { leagueCode } = myLeague;
let { configId } = getGVGConfig();
let resources = getResourceCnt(resourceType, count);
@@ -140,6 +140,7 @@ export async function addResource(myLeague: GVGLeagueType, roleId: string, roleN
let myContribute = getMyContribute(userDailyData, myRanks);
addResourceRecord(roleId, roleName, leagueCode, resourceType, count);
if(lv > originLv) addLeagueLvUpMessage(roleId, roleName, myLeague, lv);
await sendMessageToUserWithSuc(roleId, PUSH_ROUTE.GVG_CONTRIBUTE_UPDATE, { leagueCode, job: LEAGUE_JOB.PRODUCER, sumContribute: calProducerContribute(myContribute) }, sid);
return { resources: league.resources, leagueLv: league.lv, myContribute }
}