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-17 10:59:38 +08:00
parent be8d6d576c
commit 4197295dd2
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/guild/handler/gvgHandler.ts
+3 -1
View File
@@ -23,6 +23,7 @@ import { GVGRecModel } from "../../../db/GVGRec";
import { checkGVGTask } from "../../../services/task/taskService"; import { checkGVGTask } from "../../../services/task/taskService";
import { getFightTimeByPeriod, getMyVestiges, getVestiges } from "../../../services/gvg/gvgFightService"; import { getFightTimeByPeriod, getMyVestiges, getVestiges } from "../../../services/gvg/gvgFightService";
import { getSeconds } from "../../../pubUtils/timeUtil"; import { getSeconds } from "../../../pubUtils/timeUtil";
import { GVGVestigeRankModel } from "../../../db/GVGVestigeRank";
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -202,9 +203,10 @@ export class GVGHandler {
} }
const userDailyData = await GVGUserDailyDataModel.findByRole(configId, myLeague.leagueCode, roleId); const userDailyData = await GVGUserDailyDataModel.findByRole(configId, myLeague.leagueCode, roleId);
const myRanks = await GVGVestigeRankModel.findAllByRole(roleId);
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
myDistribute: getMyDistribute(userDailyData), myDistribute: getMyDistribute(userDailyData, myRanks),
list: result list: result
}); });
} }
game-server/app/services/gvg/gvgPrepareService.ts
+10 -4
View File
@@ -14,7 +14,7 @@ import { arrToMap, getArrayOfNumber, getRandEelm, getRandValueByMinMax, parseGoo
import { addGVGReward } from "./gvgItemService"; import { addGVGReward } from "./gvgItemService";
import { getGVGConfig } from "./gvgService"; import { getGVGConfig } from "./gvgService";
import { getProduceCoinCnt } from "./gvgItemService"; import { getProduceCoinCnt } from "./gvgItemService";
import { GVGLeagueFarmRecModel } from "../../db/GVGLeagueFarmRec"; import { GVGVestigeRankModel } from "../../db/GVGVestigeRank";
import { addResourceRecord } from "./gvgRecService"; import { addResourceRecord } from "./gvgRecService";
export function checkPreTech(techId: number, activeQueue: number[], techQueue: Tech[]) { export function checkPreTech(techId: number, activeQueue: number[], techQueue: Tech[]) {
@@ -90,12 +90,17 @@ export async function getDailyLoginReward(roleId: string, roleName: string, sid:
return null; return null;
} }
export function getMyDistribute(userDailyData: GVGUserDailyDataType) { export function getMyDistribute(userDailyData: GVGUserDailyDataType, myRanks: {vestigeId: number, rank: number}[]) {
let score = 0;
for(let { vestigeId, rank} of myRanks) {
let dicRankMap = gameData.gvgVestige.get(vestigeId);
if(dicRankMap && dicRankMap.get(rank)) score += dicRankMap.get(rank).score;
}
return { return {
food: userDailyData?.food||0, food: userDailyData?.food||0,
mineral: userDailyData?.mineral||0, mineral: userDailyData?.mineral||0,
wood: userDailyData?.wood||0, wood: userDailyData?.wood||0,
score: userDailyData?.score||0, score: userDailyData?.score||score,
} }
} }
@@ -122,8 +127,9 @@ export async function addResource(leagueCode: string, roleId: string, roleName:
await GVGUserDataModel.addResource(configId, leagueCode, roleId, food, mineral, wood); await GVGUserDataModel.addResource(configId, leagueCode, roleId, food, mineral, wood);
// 个人今日贡献更新 // 个人今日贡献更新
let userDailyData = await GVGUserDailyDataModel.addResource(configId, leagueCode, roleId, food, mineral, wood); let userDailyData = await GVGUserDailyDataModel.addResource(configId, leagueCode, roleId, food, mineral, wood);
let myRanks = await GVGVestigeRankModel.findAllByRole(roleId);
let myDistribute = getMyDistribute(userDailyData); let myDistribute = getMyDistribute(userDailyData, myRanks);
addResourceRecord(roleId, roleName, leagueCode, resourceType, count); addResourceRecord(roleId, roleName, leagueCode, resourceType, count);
return { resource: league.resources, leagueLv: league.lv, myDistribute } return { resource: league.resources, leagueLv: league.lv, myDistribute }