Merge branch 'ce'

# Conflicts:
#	game-server/app.ts
This commit is contained in:
luying
2021-09-02 20:37:02 +08:00
19 changed files with 816 additions and 218 deletions
-5
View File
@@ -25,7 +25,6 @@ import * as redLockService from './app/services/redLockService';
// TODO 需要整理。
import _pinus = require('pinus');
import { updateTeamStatus } from './app/services/comBattleService';
import { init } from './app/pubUtils/gmData/gmDataUtil';
import { resResult, genCode } from './app/pubUtils/util';
import { errlogger, infologger } from './app/util/logger';
@@ -118,10 +117,6 @@ app.configure(ALL_ENVS, 'gate', function () {
});
});
app.configure(ALL_ENVS, 'gm', function () {
init();//将gm后台数据加载到gate服
});
app.configure(ALL_ENVS, 'guild', function () {
app.filter(guildAuthFilter(app));
})