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

✨ feat(gvg): 修改战力相关读取方案

Browse Source
This commit is contained in:
luying
2023-01-09 20:00:59 +08:00
parent 2b96f6be6a
commit 54837f24b6
8 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
game-server/app/servers/guild/handler/gvgHandler.ts
View File

@@ -4,7 +4,7 @@ import { GVGLeagueModel } from "../../../db/GVGLeague";
import { GVGLeaguePrepareModel } from "../../../db/GVGLeaguePrepare";
import { GVGMainData, LeagueDistributeInfo, LeagueMemberDistributeInfo, LeagueMemberListInfo } from "../../../domain/gvgField/returnData";
import { resResult } from "../../../pubUtils/util";
import { getGVGConfig, getGVGPeriodData, getGVGServerType } from "../../../services/gvg/gvgService";
import { calLeagueCe, getGVGConfig, getGVGPeriodData, getGVGServerType } from "../../../services/gvg/gvgService";
import { autoCreateLeague, checkCanChooseJob, checkCanPrepare, checkLeagueAuth, getMyAuth } from "../../../services/gvg/gvgTeamService";
import { getAllServerName } from "../../../services/redisService";
import { Distribute, GVGUserDataModel } from "../../../db/GVGUserData";
@@ -18,6 +18,7 @@ import { gameData } from "../../../pubUtils/data";
import { lockLeagueData } from "../../../services/redLockService";
import { addGVGReward, handleGVGCost } from "../../../services/gvg/gvgItemService";
import { RewardInter } from "../../../pubUtils/interface";
import { GuildModel } from "../../../db/Guild";
export default function (app: Application) {
new HandlerService(app, {});
@@ -62,6 +63,8 @@ export class GVGHandler {
let { reward: dailyReward } = await getDailyLoginReward(roleId, roleName, sid, league.leagueCode, userData?.job);
if(dailyReward) data.setFistLogin(dailyReward);
data.setLeagueCe(await calLeagueCe(league));
}
return resResult(STATUS.SUCCESS, data)

14
game-server/app/servers/guild/handler/gvgManageHandler.ts
View File

@@ -5,7 +5,7 @@ import { GuildModel, GuildType } from "../../../db/Guild";
import { UserGuildModel } from "../../../db/UserGuild";
import { GVGLeagueModel, GVGLeagueType } from "../../../db/GVGLeague";
import { GVGLeagueApplyModel } from "../../../db/GVGLeagueApply";
import { getGroupIdOfServer, getGVGPeriodData, getGVGServerType, getServersOfSameGroup } from "../../../services/gvg/gvgService";
import { calLeagueCe, getGroupIdOfServer, getGVGPeriodData, getGVGServerType, getServersOfSameGroup } from "../../../services/gvg/gvgService";
import { checkCanManage, checkGuildLeader, checkLeagueAuth, createLeague, getLeagueApplyData, getLeagueInviteData, getMyAuth, joinGuildToLeague } from "../../../services/gvg/gvgTeamService";
import { LeagueGuildInfo, LeagueListInfo, LeagueMemberListInfo, LeagueSimpleInfo } from "../../../domain/gvgField/returnData";
import { getAllServerName, getServerName } from "../../../services/redisService";
@@ -74,6 +74,7 @@ export class GVGManageHandler {
let data = new LeagueListInfo(league, serverNames);
let hasApply = !!applies.find(cur => cur.leagueCode == league.leagueCode);
data.setHasApply(hasApply);
data.setLeagueCe(await calLeagueCe(league));
result.push(data);
}
return resResult(STATUS.SUCCESS, {
@@ -126,6 +127,7 @@ export class GVGManageHandler {
await GVGLeagueApplyModel.createApply(league, guild, GVG_APPLY_TYPE.APPLY);
let data = new LeagueListInfo(league, serverNames);
data.setHasApply(true);
data.setLeagueCe(await calLeagueCe(league));
result.push(data);
}
@@ -185,7 +187,7 @@ export class GVGManageHandler {
return resResult(STATUS.SUCCESS, {
guildCnt: myLeague.guildCnt,
memberCnt: myLeague.memberCnt,
leagueCe: myLeague.leagueCe
leagueCe: await calLeagueCe(myLeague),
});
}
@@ -261,7 +263,11 @@ export class GVGManageHandler {
const invitations = await GVGLeagueApplyModel.findInviteFromGuild(guildCode);
const applies = await GVGLeagueApplyModel.findApplyFromGuild(guildCode);
let result: LeagueListInfo[] = invitations.map(apply => getLeagueInviteData(apply, serverNames, applies));
let result: LeagueListInfo[] = [];
for(let invitation of invitations) {
let obj = await getLeagueInviteData(invitation, serverNames, applies);
result.push(obj);
}
// 返回
return resResult(STATUS.SUCCESS, { leagues: result });
@@ -404,7 +410,7 @@ export class GVGManageHandler {
return resResult(STATUS.SUCCESS, {
guildCnt: myLeague.guildCnt,
memberCnt: myLeague.memberCnt,
leagueCe: myLeague.leagueCe,
leagueCe: await calLeagueCe(myLeague),
});
}