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

✨ feat(服务器): 修改服务器自动开服策略

Browse Source
This commit is contained in:
luying
2023-04-25 13:04:47 +08:00
parent af1f6b9d8c
commit 906449be60
14 changed files with 121 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app.ts
+1 -1
View File
@@ -235,7 +235,7 @@ async function treatStartLogic(app: _pinus.Application) {
async function treatStartMainten(app: _pinus.Application) {
if(app.getServerType() == 'systimer') {
// 维护信息
await timeTaskService.initMaintenance(null, true);
await timeTaskService.initMaintenance(undefined, true);
} else {
await timeTaskService.initMaintenanaceInOtherServers();
}
game-server/app/servers/connector/handler/entryHandler.ts
+4
View File
@@ -25,6 +25,7 @@ import { checkServerIsOpen, getIpLocation } from '../../../services/roleService'
import { leaveRaceActivityToRemote } from '../../../services/guildActivity/guildActivityService';
import { getHiddenData } from '../../../services/dataService';
import { leaveCity } from '../../../services/gvg/gvgBattleService';
import { autoCreateServerWhenRoleInit } from '../../../services/serverService';
export default function (app: Application) {
new HandlerService(app, {});
@@ -73,6 +74,7 @@ export class EntryHandler {
if (!role) {
return resResult(STATUS.ROLE_NOT_FOUND);
}
console.log('#### needCount 0', role.needCount)
let serverName = this.app.getServerId();
await roleLogin(role.roleId, user.userCode, serverName, role.createTime, role.serverId, role.lv, role.topLineupCe); // 保存在线用户
@@ -91,6 +93,8 @@ export class EntryHandler {
}
let todayZeroPoint = getZeroPoint();
console.log('####### needCount', role.needCount)
if(role.needCount) autoCreateServerWhenRoleInit(serverId);
// console.log('****** entry after', Date.now());
return resResult(STATUS.SUCCESS, { roleId: role.roleId, todayZeroPoint });
game-server/app/servers/gm/handler/gmServerHandler.ts
+2 -2
View File
@@ -6,7 +6,7 @@ import { RegionModel, RegionType } from '../../../db/Region';
import { getDicServerName } from '../../../pubUtils/data';
import { Maintenance, ServerlistModel, ServerlistUpdate } from '../../../db/Serverlist';
import { nowSeconds, getFutureTime, getPastTime } from '../../../pubUtils/timeUtil';
import { calHiddenData, createNewServer } from '../../../services/gmService';
import { calHiddenData } from '../../../services/gmService';
import { isNumber } from 'util';
import { MarqueeModel } from '../../../db/Marquee';
import { setApiIsCloseToRemote } from '../../../services/chatService';
@@ -16,6 +16,7 @@ import { HiddenDataByIdModel, HiddenDataByIdModelTypeParam } from '../../../db/H
import { isDevelopEnv } from '../../../services/utilService';
import { redisClient } from "../../../services/redisService";
import { REDIS_KEY } from "../../../consts";
import { createNewServer } from '../../../services/serverService';
export default function (app: Application) {
return new GmHandler(app);
@@ -40,7 +41,6 @@ export class GmHandler {
let update = params.getUpdateParam(oldRegion);
region = await RegionModel.updateRegion(params.id, update, uid);
}
await pinus.app.rpc.systimer.systimerRemote.initAutoCreateServer.broadcast(region);
return resResult(STATUS.SUCCESS);
}
game-server/app/servers/systimer/remote/systimerRemote.ts
+1 -9
View File
@@ -1,5 +1,5 @@
import { Application, ChannelService } from 'pinus';
import { guildActivityStart, gateActivityEnd, cityActivityEnd, raceActivityEnd, guildActivitySchedule, auctionSchedule, initMaintenance, stopMaintenance, initAutoCreateServer, addMailsToSchedule, updateTimeLimitRank, setLadderCountDown, cancelLadderCountDown, initSumSchedule, setPvpSeasonSchedule, initGVGConfigSchedule, gvgBattleStartSchedule, gvgBattleEndSchedule } from '../../../services/timeTaskService';
import { guildActivityStart, gateActivityEnd, cityActivityEnd, raceActivityEnd, guildActivitySchedule, auctionSchedule, initMaintenance, stopMaintenance, addMailsToSchedule, updateTimeLimitRank, setLadderCountDown, cancelLadderCountDown, initSumSchedule, setPvpSeasonSchedule, initGVGConfigSchedule, gvgBattleStartSchedule, gvgBattleEndSchedule } from '../../../services/timeTaskService';
import PvpDefenseType from '../../../db/PvpDefense';
import { DicGuildActivity } from '../../../pubUtils/dictionary/DicGuildActivity';
import { reloadResources } from '../../../pubUtils/data';
@@ -172,14 +172,6 @@ export class SystimerRemote {
}
}
public initAutoCreateServer(region: RegionType) {
try {
return initAutoCreateServer(region);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
}
public async addMailsToSchedule(mails: MailType[], groupMails: GroupMailType[], serverMails: ServerMailType[]) {
try {
await addMailsToSchedule(mails, groupMails, serverMails);
game-server/app/services/gmService.ts
-22
View File
@@ -188,28 +188,6 @@ export function getServerMainten(serverId: number) {
return maintenServers.get(serverId);
}
export async function createNewServer(region: RegionType ,serverId: number, params: CreateServerParam, uid?: number) {
let newServer = await ServerlistModel.newServer(params, region, serverId, uid);
if(params.openMail) await sendOpenServerMail('openMail', params.openMail, newServer, uid);
if(params.circleMail) await sendOpenServerMail('circleMail', params.circleMail, newServer, uid);
if(params.activityGroupId && params.activityGroupId.length > 0) {
await ActivityGroupModel.addServerToGroupData(newServer.id, params.activityGroupId);
let activityGroups = await ActivityGroupModel.findByServerId(newServer.id);
await pinus.app.rpc.activity.activityRemote.addServerToGroup.broadcast(params.activityGroupId, [newServer.id]);
let aids = activityGroups.reduce((pre, cur) => [...pre, ...cur.activities], []);
let activities = await ActivityModel.findActivityByIds(aids);
let timeLimitRanks = activities.filter(cur => cur.type == ACTIVITY_TYPE.TIME_LIMIT_RANK);
if(timeLimitRanks.length > 0) {
pinus.app.rpc.systimer.systimerRemote.updateTimeLimitRank.broadcast(timeLimitRanks);
}
}
await RegionModel.newServer(region.id, newServer);
await redisClient().hsetAsync(REDIS_KEY.SERVER, `${newServer.id}`, `${newServer.name}`);
await redisClient().hsetAsync(REDIS_KEY.SERVER_OPEN_TIME, `${newServer.id}`, `${newServer.openTime}`);
}
function getDicRMB(productID: string) {
let dic = dicRMB.get(productID);
if(!dic) return null
game-server/app/services/serverService.ts
+70 -2
View File
@@ -1,11 +1,18 @@
import { pinus } from "pinus";
import { uniq } from "underscore";
import { GVG_SERVER_TYPE, SERVER_GROUP_FUN_TYPE } from "../consts";
import { ACTIVITY_TYPE, GVG_SERVER_TYPE, REDIS_KEY, SERVER_GROUP_FUN_TYPE } from "../consts";
import { ServerGroupModel } from "../db/ServerGroup";
import { ServerlistModel } from "../db/Serverlist";
import { nowSeconds } from "../pubUtils/timeUtil";
import { getServerTypeByTime } from "./gvg/gvgService";
import { getAllServerCreateTime } from "./redisService";
import { getAllServerCreateTime, redisClient } from "./redisService";
import moment = require("moment");
import { RegionModel, RegionType } from "../db/Region";
import { errlogger } from "../util/logger";
import { CreateServerParam } from "../domain/backEndField/params";
import { sendOpenServerMail } from "./gmService";
import { ActivityGroupModel } from "../db/ActivityGroup";
import { ActivityModel } from "../db/Activity";
export async function setServerGroup() {
const servers = await ServerlistModel.findByEnv(pinus.app.get('env'));
@@ -100,4 +107,65 @@ export async function getPVPServerGroup() {
map.get(groupId).push(serverId);
}
return map
}
export async function autoCreateServerSchedule() {
console.log('******* autoCreateServerSchedule *******')
let region = await RegionModel.findRegionByEnv(pinus.app.get('env'));
if(!region) {
return errlogger.error('create new server region not found');
}
let time = moment().format('HH:mm');
console.log('#### time', time)
if(region.stategy && region.stategy.type == 1 && region.stategy.timers.indexOf(time) != -1) {
let latestServer = await ServerlistModel.findByServerId(region.latestServerUniqId);
if(!latestServer || latestServer.playerCnt >= region.stategy.maxPlayerCnt) {
let params = new CreateServerParam();
params.setByRegionStategy(region, nowSeconds())
await createNewServer(region, (latestServer?.serverId||0) + 1, params);
}
}
}
export async function autoCreateServerWhenRoleInit(serverId: number) {
console.log('******* autoCreateServerWhenRoleInit *******')
let server = await ServerlistModel.incRoleCnt(serverId);
if(!server) {
return errlogger.error('server not found');
}
let region = await RegionModel.findRegionByEnv(pinus.app.get('env'));
if(!region) {
return errlogger.error('create new server region not found');
}
if(region.stategy && region.stategy.type == 2 && region.latestServerUniqId == server.id && server.playerCnt >= region.stategy.maxPlayerCnt) {
let params = new CreateServerParam();
params.setByRegionStategy(region, nowSeconds())
await createNewServer(region, server.serverId + 1, params);
}
}
export async function createNewServer(region: RegionType ,serverId: number, params: CreateServerParam, uid?: number) {
console.log('******* createNewServer *******')
let newServer = await ServerlistModel.newServer(params, region, serverId, uid);
if(!newServer) return;
if(params.openMail) await sendOpenServerMail('openMail', params.openMail, newServer, uid);
// if(params.circleMail) await sendOpenServerMail('circleMail', params.circleMail, newServer, uid);
if(params.activityGroupId && params.activityGroupId.length > 0) {
await ActivityGroupModel.addServerToGroupData(newServer.id, params.activityGroupId);
let activityGroups = await ActivityGroupModel.findByServerId(newServer.id);
await pinus.app.rpc.activity.activityRemote.addServerToGroup.broadcast(params.activityGroupId, [newServer.id]);
let aids = activityGroups.reduce((pre, cur) => [...pre, ...cur.activities], []);
let activities = await ActivityModel.findActivityByIds(aids);
let timeLimitRanks = activities.filter(cur => cur.type == ACTIVITY_TYPE.TIME_LIMIT_RANK);
if(timeLimitRanks.length > 0) {
pinus.app.rpc.systimer.systimerRemote.updateTimeLimitRank.broadcast(timeLimitRanks);
}
}
await RegionModel.newServer(region.id, newServer);
await redisClient().hsetAsync(REDIS_KEY.SERVER, `${newServer.id}`, `${newServer.name}`);
await redisClient().hsetAsync(REDIS_KEY.SERVER_OPEN_TIME, `${newServer.id}`, `${newServer.openTime}`);
}
game-server/app/services/timeTaskService.ts
+7 -45
View File
@@ -13,7 +13,7 @@ import { sendEndMsgToAllServer, sendGuildActivityStatus, setPreDayActiveData, in
import { sendUngotDividendJob, startGuildAuction, startWorldAuction, stopAuction } from './auctionService';
import { DicGuildActivity } from '../pubUtils/dictionary/DicGuildActivity';
import { dispatch } from '../util/dispatcher';
import { createNewServer, initMarquee, setServerMainten } from './gmService';
import { initMarquee, setServerMainten } from './gmService';
import moment = require('moment');
import { reportOneOnline } from './authenticateService';
import { GVG, LADDER, PVP } from '../pubUtils/dicParam';
@@ -23,7 +23,7 @@ import { Maintenance, ServerlistModel, ServerlistType } from '../db/Serverlist';
import { createMarqueeMsg, pushMarqueeMsg } from './sysChatService';
import { RegionModel, RegionType } from '../db/Region';
import { CreateServerParam } from '../domain/backEndField/params';
import { infologger } from '../util/logger';
import { infologger, errlogger } from '../util/logger';
import { MailModel, MailType } from '../db/Mail';
import { GroupMailModel, GroupMailType } from '../db/GroupMail';
import { ServerMailModel, ServerMailType } from '../db/ServerMail';
@@ -51,6 +51,7 @@ import { getActivityById } from './activity/activityService';
import { MonthlyFundData } from "../domain/activityField/monthlyFundField";
import { RewardInter } from '../pubUtils/interface';
import { stringToRewardInter } from './activity/giftPackageService';
import { autoCreateServerSchedule } from './serverService';
const PER_SECOND = 1 * 1000;
const PER_DAY = 24 * 60 * 60;
@@ -684,49 +685,10 @@ export async function stopMaintenance(batchCode: string, serverIds: number[]) {
// —————————————— 维护 end —————————————— //
// —————————————— 自动开服 —————————————— //
export async function initAutoCreateServer(region?: RegionType) {
if(!region) region = await RegionModel.findRegionByEnv(pinus.app.get('env'));
if(region && region.stategy && region.stategy.isOpen) {
for(let timer of region.stategy.timers) {
setStategyTimer(timer, region)
}
} else {
if(scheduledJobs[`autoServer${SERVER_TIMER.FIVE_HALF}`]) scheduledJobs[`autoServer${SERVER_TIMER.FIVE_HALF}`].cancel();
if(scheduledJobs[`autoServer${SERVER_TIMER.TEN_HALF}`]) scheduledJobs[`autoServer${SERVER_TIMER.FIVE_HALF}`].cancel();
if(scheduledJobs[`autoServer${SERVER_TIMER.FIFTEEN_HALF}`]) scheduledJobs[`autoServer${SERVER_TIMER.FIVE_HALF}`].cancel();
if(scheduledJobs[`autoServer${SERVER_TIMER.NINETEEN_HALF}`]) scheduledJobs[`autoServer${SERVER_TIMER.FIVE_HALF}`].cancel();
}
export async function initAutoCreateServer() {
scheduleJob('autoServer', '0 0 */1 * * ?', autoCreateServerSchedule)
}
function setStategyTimer(timerId: number, region: RegionType) {
if(scheduledJobs[`autoServer${timerId}`]) scheduledJobs[`autoServer${timerId}`].cancel();
let cron = '';
switch(timerId) {
case SERVER_TIMER.FIVE_HALF:
cron = '0 30 5 * * *'; break;
case SERVER_TIMER.TEN_HALF:
cron = '0 30 10 * * *'; break;
case SERVER_TIMER.FIFTEEN_HALF:
cron = '0 30 15 * * *'; break;
case SERVER_TIMER.NINETEEN_HALF:
cron = '0 30 19 * * *'; break;
}
if(cron) {
scheduleJob(`autoServer${timerId}`, cron, () => {
autoCreateServerSchedule(region);
})
}
}
async function autoCreateServerSchedule(region: RegionType) {
console.log('******* createNewServer *******')
let latestServer = await ServerlistModel.findByServerId(region.latestServerUniqId);
if(!latestServer || latestServer.playerCnt >= region.stategy.maxPlayerCnt) {
let params = new CreateServerParam();
params.setByRegionStategy(region, nowSeconds())
await createNewServer(region, (latestServer?.serverId||0) + 1, params);
}
}
// —————————————— 自动开服 end —————————————— //
// —————————————— 活动 start —————————————— //
@@ -1012,11 +974,11 @@ export async function gvgBattleEndSchedule() {
// —————————————— gvg end —————————————— //
async function initPushMsgSchedule() {
scheduleJob('sendAfkPlayers', '0 0 19 * * ?', async () => {
scheduleJob('sendDinner', '0 0 19 * * ?', async () => {
// pushClientMsg(SDK_PUSH_MSG_TYPE.AFK_ATTENTION);
pushClientMsg(SDK_PUSH_MSG_TYPE.AP_DINNER);
});
scheduleJob('sendAfkPlayers', '0 0 12 * * ?', async () => {
scheduleJob('sendLunch', '0 0 12 * * ?', async () => {
pushClientMsg(SDK_PUSH_MSG_TYPE.AP_LUNCH);
});
}