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-13 10:56:22 +08:00
parent 4197295dd2
commit c182733066
6 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
game-server/app/services/gvg/gvgPrepareService.ts
View File

@@ -38,12 +38,12 @@ export function checkTechIsIng(techId: number, activeQueue: number[], techQueue:
return techQueue.findIndex(cur => cur.id == techId) != -1 || activeQueue.indexOf(techId) != -1
}
export function calProducerDistribute(obj: { food: number, mineral: number, wood: number }) {
export function calProducerContribute(obj: { food: number, mineral: number, wood: number }) {
let { food = 0, mineral = 0, wood = 0 } = obj||{};
return food + mineral + wood;
}
export function calFighterDistribute(obj: { score: number }) {
export function calFighterContribute(obj: { score: number }) {
return obj?.score||0
}
@@ -90,7 +90,7 @@ export async function getDailyLoginReward(roleId: string, roleName: string, sid:
return null;
}
export function getMyDistribute(userDailyData: GVGUserDailyDataType, myRanks: {vestigeId: number, rank: number}[]) {
export function getMyContribute(userDailyData: GVGUserDailyDataType, myRanks: {vestigeId: number, rank: number}[]) {
let score = 0;
for(let { vestigeId, rank} of myRanks) {
let dicRankMap = gameData.gvgVestige.get(vestigeId);
@@ -129,10 +129,10 @@ export async function addResource(leagueCode: string, roleId: string, roleName:
let userDailyData = await GVGUserDailyDataModel.addResource(configId, leagueCode, roleId, food, mineral, wood);
let myRanks = await GVGVestigeRankModel.findAllByRole(roleId);
let myDistribute = getMyDistribute(userDailyData, myRanks);
let myContribute = getMyContribute(userDailyData, myRanks);
addResourceRecord(roleId, roleName, leagueCode, resourceType, count);
return { resource: league.resources, leagueLv: league.lv, myDistribute }
return { resource: league.resources, leagueLv: league.lv, myContribute }
}
function getResourceCnt(resourceType: GVG_RESOURCE_TYPE, count: number) {
@@ -284,12 +284,12 @@ export async function getLockFieldCnt(leagueCode: string, roleId: string) {
return items.reduce((pre, cur) => pre + cur.count, 0);
}
export async function getmyDistributeRank(leagueCode: string, members: { roleId: string }[], targetRoleId: string) {
export async function getmyContributeRank(leagueCode: string, members: { roleId: string }[], targetRoleId: string) {
let { configId } = getGVGConfig();
const roleIds = members.map(member => member.roleId);
const userDatas = await GVGUserDataModel.findByRoles(configId, leagueCode, roleIds);
userDatas.sort((a, b) => calProducerDistribute(b.distribute) - calProducerDistribute(a.distribute));
userDatas.sort((a, b) => calProducerContribute(b.contribute) - calProducerContribute(a.contribute));
for(let i = 0; i < userDatas.length; i++) {
if(userDatas[i].roleId == targetRoleId) return i + 1;
}