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

后台：接口修改

Browse Source
This commit is contained in:
luying
2021-12-27 18:16:56 +08:00
parent 602cc68693
commit 32be4af818
8 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
game-server/app/servers/activity/handler/activityHandler.ts
View File

@@ -1,4 +1,4 @@
import { Application, BackendSession, HandlerService, } from 'pinus';
import { Application, BackendSession, HandlerService, pinus, } from 'pinus';
import { aesEncrypt, aesEncryptcfb, resResult } from '../../../pubUtils/util';
import { ENCRYPT_IV, ENCRYPT_KEY, STATUS, TASK_TYPE } from '../../../consts';
import { checkActivityTask } from '../../../services/taskService';
@@ -99,13 +99,20 @@ export class ActivityHandler {
}
async debugActivityByType(msg: { type: number }, session: BackendSession) {
const { type } = msg;
async debugActivityMemory(msg: {}, session: BackendSession) {
const { } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid: string = session.get('sid');
let activityData = await ActivityModel.debugFindActivityByType(type);
return resResult(STATUS.SUCCESS, activityData);
let activities = pinus.app.get('activities');
let activityByType = pinus.app.get('activityByType');
let activityByServer = pinus.app.get('activityByServer');
let groupToServer = pinus.app.get('groupToServer');
console.log('****** activities', activities);
console.log('****** activityByType', activityByType);
console.log('****** activityByServer', activityByServer);
console.log('****** groupToServer', groupToServer);
return resResult(STATUS.SUCCESS, { activities: [...activities], activityByType: [...activityByType], activityByServer: [...activityByServer], groupToServer: [...groupToServer] });
}
}

6
game-server/app/servers/activity/remote/activityRemote.ts
View File

@@ -54,6 +54,7 @@ export class ActivityRemote {
this.app.set('activityByServer', this.activityByServer);
this.app.set('activityByType', this.activityByType);
this.app.set('activities', this.activities);
this.app.set('groupToServer', this.groupToServer);
console.log('****** loadActivities')
}
@@ -82,9 +83,11 @@ export class ActivityRemote {
this.app.set('activityByServer', this.activityByServer);
this.app.set('activityByType', this.activityByType);
this.app.set('activities', this.activities);
this.app.set('groupToServer', this.groupToServer);
}
public async updateActivities(activities: ActivityInRemote[]) {
console.log('******* activities', activities)
let activityIds: number[] = [];
for(let activity of activities) {
this.activities.set(activity.activityId, activity);
@@ -95,6 +98,7 @@ export class ActivityRemote {
this.app.set('activityByServer', this.activityByServer);
this.app.set('activityByType', this.activityByType);
this.app.set('activities', this.activities);
this.app.set('groupToServer', this.groupToServer);
}
public async deleteActivities(activityIds: number[]) {
@@ -106,6 +110,7 @@ export class ActivityRemote {
this.app.set('activityByServer', this.activityByServer);
this.app.set('activityByType', this.activityByType);
this.app.set('activities', this.activities);
this.app.set('groupToServer', this.groupToServer);
}
public async saveGroupToServer(groupId: number, serverIds: number[]) {
@@ -115,6 +120,7 @@ export class ActivityRemote {
this.app.set('activityByServer', this.activityByServer);
this.app.set('activityByType', this.activityByType);
this.app.set('activities', this.activities);
this.app.set('groupToServer', this.groupToServer);
}
public async saveActivitiesToGroup(groupId: number, activities: number[]) {

2
game-server/app/servers/gm/handler/gmServerHandler.ts
View File

@@ -37,7 +37,7 @@ export class GmHandler {
let update = params.getUpdateParam(oldRegion);
region = await RegionModel.updateRegion(params.id, update, uid);
}
await initAutoCreateServer(region);
await pinus.app.rpc.systimer.systimerRemote.initAutoCreateServer.broadcast(region);
return resResult(STATUS.SUCCESS);
}

7
game-server/app/servers/systimer/remote/systimerRemote.ts
View File

@@ -1,5 +1,5 @@
import { Application, ChannelService } from 'pinus';
import { resetPvpSeasonTime, guildActivityStart, gateActivityEnd, cityActivityEnd, raceActivityEnd, guildActivitySchedule, auctionSchedule, initMaintenance, stopMaintenance } from '../../../services/timeTaskService';
import { resetPvpSeasonTime, guildActivityStart, gateActivityEnd, cityActivityEnd, raceActivityEnd, guildActivitySchedule, auctionSchedule, initMaintenance, stopMaintenance, initAutoCreateServer } from '../../../services/timeTaskService';
import PvpDefenseType from '../../../db/PvpDefense';
import { DicGuildActivity } from '../../../pubUtils/dictionary/DicGuildActivity';
import { reloadResources } from '../../../pubUtils/data';
@@ -9,6 +9,7 @@ import { setWeek } from '../../../pubUtils/timeUtil';
import { ServerlistType } from '../../../db/Serverlist';
import { MarqueeType } from '../../../db/Marquee';
import { taflush } from '../../../services/sdkService';
import { RegionType } from '../../../db/Region';
export default function (app: Application) {
return new SystimerRemote(app);
@@ -104,4 +105,8 @@ export class SystimerRemote {
public taflush() {
return taflush();
}
public initAutoCreateServer(region: RegionType) {
return initAutoCreateServer(region);
}
}

1
game-server/app/services/activity/signInService.ts
View File

@@ -128,7 +128,6 @@ export async function getPlayerSignInData(activityId: number, serverId: number,
playerData.setPlayerRecords(playerRecords);
if (playerData.type === ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN) {
let { createTime } = await RoleModel.findByRoleId(roleId);
let betinTime = null;
let endTime = null
let curDate = moment(createTime * 1000);

2
gm-server/config/config.local.ts
View File

@@ -24,7 +24,7 @@ export default (appInfo: EggAppInfo) => {
};
let regions = [ // 大区数据
{ id: 1, env: 'test', name: "测试", domain: 'http://127.0.0.1:7002' },
{ id: 1, env: 'dev', name: "测试", domain: 'http://127.0.0.1:7002' },
];
config.regions = regions;

2
shared/consts/constModules/sysConst.ts
View File

@@ -758,7 +758,7 @@ export enum THINKING_DATA_MODE_LIST {
BATCH = 'batch',
LOGGING = 'logging',
}
export let THINKING_DATA_MODE = THINKING_DATA_MODE_LIST.LOGGING;
export let THINKING_DATA_MODE = THINKING_DATA_MODE_LIST.BATCH;
export enum BLOCK_TYPE {

2
shared/db/Activity.ts
View File

@@ -81,7 +81,7 @@ export default class Activity extends BaseModel {
for (let activityId of aids) {
if (!activityId) activityId = await CounterModel.getNewCounter(COUNTER.ACTIVITY);
newAids.push(activityId);
let update = { type, data, timeType, days, delayDay, interval }
let update = { type, data, timeType, days, delayDay, interval, groupId }
if (beginTime != undefined) {
update["beginTime"] = beginTime;
}