后台：接口修改

game-server/app/servers/activity/handler/activityHandler.ts

@@ -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) {
+    async debugActivityMemory(msg: {}, session: BackendSession) {
-        const { type } = msg;
+        const {  } = msg;
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
         const sid: string = session.get('sid');
         
-        let activityData = await ActivityModel.debugFindActivityByType(type);
+        let activities = pinus.app.get('activities');
-        return resResult(STATUS.SUCCESS, activityData);
+        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] });
     }
 }

game-server/app/servers/activity/remote/activityRemote.ts

@@ -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[]) {

game-server/app/servers/gm/handler/gmServerHandler.ts

@@ -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);
     }

game-server/app/servers/systimer/remote/systimerRemote.ts

@@ -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);
+    }
 }

game-server/app/services/activity/signInService.ts

@@ -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);

gm-server/config/config.local.ts

@@ -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;
 

shared/consts/constModules/sysConst.ts

@@ -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 {

shared/db/Activity.ts

@@ -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;
             }