Commit fe9cadff authored by mercury233's avatar mercury233

fix

parent c768c431
...@@ -22,9 +22,6 @@ moment = require 'moment' ...@@ -22,9 +22,6 @@ moment = require 'moment'
#redis = require 'redis' #redis = require 'redis'
#redisdb = redis.createClient host: "127.0.0.1", port: settings.modules.redis_port #redisdb = redis.createClient host: "127.0.0.1", port: settings.modules.redis_port
if settings.modules.enable_windbot
settings.modules.windbots = require('./windbot/bots.json').windbots
#heapdump = require 'heapdump' #heapdump = require 'heapdump'
#配置文件 #配置文件
...@@ -35,6 +32,8 @@ settings.modules.hang_timeout = 90 ...@@ -35,6 +32,8 @@ settings.modules.hang_timeout = 90
settings.version = parseInt(fs.readFileSync('ygopro/gframe/game.cpp', 'utf8').match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16') settings.version = parseInt(fs.readFileSync('ygopro/gframe/game.cpp', 'utf8').match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16')
settings.lflist = (for list in fs.readFileSync('ygopro/lflist.conf', 'utf8').match(/!.*/g) settings.lflist = (for list in fs.readFileSync('ygopro/lflist.conf', 'utf8').match(/!.*/g)
{date: moment(list.match(/!([\d\.]+)/)[1], 'YYYY.MM.DD').utcOffset("-08:00"), tcg: list.indexOf('TCG') != -1}) {date: moment(list.match(/!([\d\.]+)/)[1], 'YYYY.MM.DD').utcOffset("-08:00"), tcg: list.indexOf('TCG') != -1})
if settings.modules.enable_windbot
settings.modules.windbots = require('./windbot/bots.json').windbots
#组件 #组件
ygopro = require './ygopro.js' ygopro = require './ygopro.js'
......
...@@ -30,10 +30,6 @@ ...@@ -30,10 +30,6 @@
moment = require('moment'); moment = require('moment');
if (settings.modules.enable_windbot) {
settings.modules.windbots = require('./windbot/bots.json').windbots;
}
settings = require('./config.json'); settings = require('./config.json');
settings.BANNED_user = []; settings.BANNED_user = [];
...@@ -58,6 +54,10 @@ ...@@ -58,6 +54,10 @@
return results; return results;
})(); })();
if (settings.modules.enable_windbot) {
settings.modules.windbots = require('./windbot/bots.json').windbots;
}
ygopro = require('./ygopro.js'); ygopro = require('./ygopro.js');
Room = require('./room.js'); Room = require('./room.js');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment