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-02-17 10:58:05 +08:00
parent 6cc38053e7
commit 0530f931bc
17 changed files with 301 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app.ts
+5 -2
View File
@@ -33,7 +33,7 @@ import { loadGmDb } from './app/db';
import { loadActivities } from './app/services/activity/activityRemoteService';
import { checkAndSetApiIsClose } from './app/services/chatService';
import { initGuildActivityIndexInPinus, resetJoinWoodenHorse } from './app/services/guildActivity/guildActivityService';
import { setGVGServerGroup } from './app/services/gvg/gvgService';
import { setGVGConfig, setGVGServerGroup } from './app/services/gvg/gvgService';
const filePath = (_pinus as any).FILEPATH;
filePath.MASTER = '/config/master';
@@ -201,8 +201,11 @@ async function treatStartLogic(app: _pinus.Application) {
if(app.getServerType() != 'systimer') {
timeTaskService.initHiddenData();
}
if(app.getServerType() == 'battle'|| app.getServerType() == 'chat'|| app.getServerType() == 'connector') {
if(app.getServerType() == 'guild'|| app.getServerType() == 'chat'|| app.getServerType() == 'connector') {
setGVGServerGroup();
if(app.getServerType() == 'guild') {
setGVGConfig();
}
}
if(app.isMaster()) {
game-server/app/servers/gm/handler/gmHandler.ts
+2 -1
View File
@@ -313,7 +313,8 @@ export class GmHandler {
if(teamTime > prepareTime || prepareTime > battleTime || battleTime > scheduleTime) {
return resResult(STATUS.GM_GVG_TIME_ERR);
}
await GVGConfigModel.updateConfig(configId, teamTime, prepareTime, battleTime, scheduleTime);
const config = await GVGConfigModel.updateConfig(configId, teamTime, prepareTime, battleTime, scheduleTime);
await pinus.app.rpc.guild.guildRemote.setGVGConfig.broadcast(config);
await pinus.app.rpc.systimer.systimerRemote.initGVGConfigSchedule.broadcast();
return resResult(STATUS.SUCCESS);
}
game-server/app/servers/guild/handler/gvgHandler.ts
+109 -3
View File
@@ -1,15 +1,20 @@
import { Application, BackendSession, ChannelService, HandlerService, pinus } from "pinus";
import { GVG_PERIOD, GVG_SERVER_TYPE, STATUS } from "../../../consts";
import { GVG_PERIOD, GVG_SERVER_TYPE, LEAGUE_JOB, STATUS } from "../../../consts";
import { GVGLeagueModel } from "../../../db/GVGLeague";
import { GVGLeaguePrepareModel } from "../../../db/GVGLeaguePrepare";
import { GVGMainData } from "../../../domain/gvgField/returnData";
import { GVGMainData, LeagueDistributeInfo, LeagueMemberDistributeInfo, LeagueMemberListInfo } from "../../../domain/gvgField/returnData";
import { resResult } from "../../../pubUtils/util";
import { getGVGConfig, getGVGPeriodData, getGVGServerType } from "../../../services/gvg/gvgService";
import { autoCreateLeague, checkCanChooseJob, checkCanPrepare, getMyAuth } from "../../../services/gvg/gvgTeamService";
import { getAllServerName } from "../../../services/redisService";
import { GVGUserDataModel } from "../../../db/GVGUserData";
import { Distribute, GVGUserDataModel } from "../../../db/GVGUserData";
import { GVGUserItemModel } from "../../../db/GVGUserItem";
import { GVGUserTaskModel } from "../../../db/GVGUserTask";
import { GVG } from "../../../pubUtils/dicParam";
import { RoleModel } from "../../../db/Role";
import { calProduce } from "../../../services/gvg/gvgPrepareService";
import { nowSeconds } from "../../../pubUtils/timeUtil";
import { GVGUserDailyDistributeModel } from "../../../db/GVGUserDailyDistribute";
export default function (app: Application) {
new HandlerService(app, {});
@@ -54,6 +59,107 @@ export class GVGHandler {
return resResult(STATUS.SUCCESS, data)
}
// TODO 获取动态
async getRec(msg: {}, session: BackendSession) {
const roleId = session.get('roleId');
return resResult(STATUS.SUCCESS, { recs: [] });
}
// 选择职能
async chooseJob(msg: { job: number }, session: BackendSession) {
const roleId = session.get('roleId');
const guildCode = session.get('guildCode');
const { job } = msg;
let { configId, period } = getGVGPeriodData();
if(period != GVG_PERIOD.PREPARE) return resResult(STATUS.GVG_NOT_PREPARE_PERIOD);
let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode);
if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);
// 是否已经选过
let myUserData = await GVGUserDataModel.findByRole(configId, myLeague.leagueCode, roleId);
if(myUserData && myUserData.job) return resResult(STATUS.GVG_HAS_CHOOSE_JOB);
let leaguePrepare = await GVGLeaguePrepareModel.findByLeague(configId, myLeague.leagueCode);
if(!leaguePrepare) return resResult(STATUS.GVG_NOT_PREPARE_PERIOD);
// 是否超过人数
let limit = Math.floor(leaguePrepare.maxMemberCnt * GVG.GVG_ROLE_TOTAL_RATIO);
if(leaguePrepare.fighterCnt + leaguePrepare.producerCnt >= limit) return resResult(STATUS.GVG_JOB_LIMIT);
let cnt = job == LEAGUE_JOB.FIGHTER? leaguePrepare.fighterCnt: leaguePrepare.producerCnt;
if(cnt >= Math.floor(limit * GVG.GVG_ROLE_RATIO / 2)) return resResult(STATUS.GVG_JOB_LIMIT);
// 更新userData
myUserData = await GVGUserDataModel.chooseJob(configId, myLeague.leagueCode, roleId, job);
// 更新prepare
leaguePrepare = await GVGLeaguePrepareModel.chooseJob(configId, myLeague.leagueCode, job);
return resResult(STATUS.SUCCESS, {
leagueCode: myLeague.leagueCode,
job: myUserData.job,
producerCnt: leaguePrepare.producerCnt,
fighterCnt: leaguePrepare.fighterCnt
});
}
// 查看贡献
async getDistribute(msg: {}, session: BackendSession) {
const roleId = session.get('roleId');
const guildCode = session.get('guildCode');
let { configId, period } = getGVGPeriodData();
if(period != GVG_PERIOD.PREPARE) return resResult(STATUS.GVG_NOT_PREPARE_PERIOD);
let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode);
if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);
const members = myLeague.members||[];
const roleIds = members.map(member => member.roleId);
const roles = await RoleModel.findByRoleIds(roleIds);
const serverNames = await getAllServerName();
const myUserData = await GVGUserDataModel.findByRole(configId, myLeague.leagueCode, roleId);
const { distribute = new Distribute(), box = [] } = myUserData||{};
const userDatas = await GVGUserDataModel.findByRoles(configId, myLeague.leagueCode, roleIds);
const result: LeagueDistributeInfo[] = [];
for(let curJob of [LEAGUE_JOB.PRODUCER, LEAGUE_JOB.FIGHTER]) {
const memberResult: LeagueMemberDistributeInfo[] = [];
for(let member of members) {
let role = roles.find(role => role.roleId == member.roleId);
if(!role) continue;
let userData = userDatas.find(userData => userData.roleId == member.roleId);
let obj = new LeagueMemberDistributeInfo(role, serverNames);
obj.setByUserData(userData);
if(curJob == LEAGUE_JOB.PRODUCER && calProduce(obj) > 0) memberResult.push(obj);
if(curJob == LEAGUE_JOB.FIGHTER && obj.score > 0) memberResult.push(obj);
}
memberResult.sort((a, b) => {
return curJob == LEAGUE_JOB.PRODUCER? calProduce(b) - calProduce(a): b.score - a.score;
});
let sumDistribute = curJob == LEAGUE_JOB.FIGHTER? calProduce(distribute): distribute.score;
let curBox = box.find(cur => cur.job == curJob);
let disObj = new LeagueDistributeInfo(curJob, sumDistribute, curBox?.received||[] );
disObj.setMembers(memberResult);
result.push(disObj)
}
const myDistribute = await GVGUserDailyDistributeModel.findByRole(configId, myLeague.leagueCode, roleId);
return resResult(STATUS.SUCCESS, {
myDistribute: {
food: myDistribute?.food||0,
mineral: myDistribute?.mineral||0,
wood: myDistribute?.wood||0,
score: myDistribute?.score||0,
},
list: result
});
}
async test(msg: { }, session: BackendSession) {
const time = getGVGConfig();
return resResult(STATUS.SUCCESS, { time });
game-server/app/servers/guild/handler/gvgManageHandler.ts
+2
View File
@@ -211,6 +211,8 @@ export class GVGManageHandler {
let data = new LeagueGuildInfo(guild, serverNames);
let hasInvited = !!invitations.find(cur => cur.guildCode == guild.code);
data.setHasInvited(hasInvited);
// TODO
// data.setActive
return data
});
game-server/app/servers/guild/remote/guildRemote.ts
+1 -1
View File
@@ -97,7 +97,7 @@ export class GuildRemote {
public async setGVGConfig(config: GVGConfigType) {
try {
setGVGConfig(config);
await setGVGConfig(config);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
game-server/app/services/checkParam.ts
+7 -1
View File
@@ -1,5 +1,5 @@
import { isArray, isBoolean, isNumber, isString } from "underscore";
import { BLOCK_OPEATE, DEBUG_MAGIC_WORD, GM_MAIL_TYPE, GUILD_AUTH, GUILD_STRUCTURE, LINEUP_NUM, MSG_TYPE } from "../consts";
import { BLOCK_OPEATE, DEBUG_MAGIC_WORD, GM_MAIL_TYPE, GUILD_AUTH, GUILD_STRUCTURE, LEAGUE_JOB, LINEUP_NUM, MSG_TYPE } from "../consts";
import { pvpEndParamInter } from "../pubUtils/interface";
import { isDevelopEnv } from "./utilService";
@@ -1224,6 +1224,12 @@ export function checkRouteParam(route: string, msg: any) {
if(!checkNaturalStrings(msg.id)) return false;
break;
}
case "guild.gvgHandler.chooseJob":
{
if(msg.job != LEAGUE_JOB.FIGHTER && msg.job != LEAGUE_JOB.PRODUCER) return false;
break;
}
case "order.orderHandler.applyOrder":
{
let { productID, payType, activityId, paramStr, useVoucher } = msg;
game-server/app/services/gvg/gvgPrepareService.ts
+5
View File
@@ -0,0 +1,5 @@
export function calProduce(obj: { food: number, mineral: number, wood: number }) {
let { food = 0, mineral = 0, wood = 0 } = obj||{};
return food + mineral + wood;
}
game-server/app/services/gvg/gvgService.ts
+18 -14
View File
@@ -16,11 +16,15 @@ import { GuildType } from "../../db/Guild";
export async function createNewGVGConfig() {
let { teamTime, prepareTime, battleTime, scheduleTime } = getPeriodTime();
const config = await GVGConfigModel.createNewConfig(teamTime, prepareTime, battleTime, scheduleTime);
setGVGConfigToRemote(config);
try {
await pinus.app.rpc.guild.guildRemote.setGVGConfig.broadcast(config);
await pinus.app.rpc.guild.guildRemote.setGVGServerGroup.broadcast();
await pinus.app.rpc.chat.chatRemote.setGVGServerGroup.broadcast();
await pinus.app.rpc.connector.connectorRemote.setGVGServerGroup.broadcast();
} catch(e) {
console.log('remote未初始完');
}
// TODO 每周自动解散一些联军
await pinus.app.rpc.guild.guildRemote.setGVGServerGroup.broadcast();
await pinus.app.rpc.chat.chatRemote.setGVGServerGroup.broadcast();
await pinus.app.rpc.connector.connectorRemote.setGVGServerGroup.broadcast();
return config;
}
@@ -53,13 +57,11 @@ export async function getGVGConfigFromRemote() {
return await pinus.app.rpc.guild.guildRemote.getGVGConfig.toServer(server.id);
}
export function setGVGConfigToRemote(config: GVGConfigType) {
if(!config) return null
pinus.app.rpc.guild.guildRemote.setGVGConfig.broadcast(config);
}
export function setGVGConfig(config: GVGConfigType) {
if(!config) return null
export async function setGVGConfig(config?: GVGConfigType) {
if(!config) {
config = await GVGConfigModel.findConfig();
}
console.log('##### setGVGConfig', config)
pinus.app.set('gvgConfigId', config.configId);
pinus.app.set('gvgTeamTime', config.teamTime);
pinus.app.set('gvgPrepareTime', config.prepareTime);
@@ -100,6 +102,7 @@ export async function getGVGServerType(serverId: number) {
export function getGVGPeriodData() {
let { configId, teamTime, prepareTime, battleTime, scheduleTime } = getGVGConfig();
console.log('#### getGVGPeriodData', configId, teamTime, prepareTime, battleTime, scheduleTime)
let period = getCurPeriod();
let countdownTime = teamTime;
switch(period) {
@@ -129,11 +132,11 @@ export function getCurPeriod() {
}
export async function initLeaguePrepare() {
const { configId } = getGVGConfig();
const config = await GVGConfigModel.findConfig();
if(!config) return;
const leagues = await GVGLeagueModel.findAllLeague();
for(let { leagueCode, memberCnt } of leagues) {
await GVGLeaguePrepareModel.initData(configId, leagueCode, memberCnt);
await GVGLeaguePrepareModel.initData(config.configId, leagueCode, memberCnt);
}
}
@@ -159,6 +162,7 @@ export async function getServersOfSameGroup(type: GVG_SERVER_TYPE, id: number) {
if(type == GVG_SERVER_TYPE.SINGLE) return [id];
let groupId = await getGroupIdOfServer(id);
console.log('###### getServersOfSameGroup', type, groupId, id);
return await getServersByGroupId(groupId);
}
game-server/app/services/timeTaskService.ts
+5 -10
View File
@@ -43,7 +43,7 @@ import { getGroupShopTimers, refundGroupShop, setGroupShopToSetSum } from './act
import { HiddenDataModel, HiddenDataModelType } from '../db/HiddenData';
import { setHiddenData, setHiddenDataToMemory } from './dataService';
import { GVGConfigModel } from '../db/GVGConfig';
import { createNewGVGConfig, initLeaguePrepare, setGVGConfigToRemote } from './gvg/gvgService';
import { createNewGVGConfig, initLeaguePrepare } from './gvg/gvgService';
const PER_SECOND = 1 * 1000;
const PER_DAY = 24 * 60 * 60;
@@ -899,18 +899,13 @@ export async function initHiddenDataSchedule(isInit: boolean, data?: HiddenDataM
// —————————————— gvg start —————————————— //
export async function initGVGConfigSchedule() {
let config = await GVGConfigModel.findConfig();
if(!config) {
if(!config || nowSeconds() > config.scheduleTime) {
config = await createNewGVGConfig();
} else {
setGVGConfigToRemote(config);
}
if(nowSeconds() > config.scheduleTime) {
config = await createNewGVGConfig();
} else {
scheduleJob(`gvgConfig`, config.scheduleTime * 1000, createNewGVGConfig);
}
scheduleJob(`gvgConfig`, config.scheduleTime * 1000, createNewGVGConfig);
console.log('##### initGVGConfigSchedule', nowSeconds(), config.prepareTime)
if(nowSeconds() > config.prepareTime) {
initLeaguePrepare();
} else {