Commit 91c0f53c authored by nanahira's avatar nanahira

fix

parent 437c65fb
...@@ -166,6 +166,14 @@ ...@@ -166,6 +166,14 @@
"欢迎来到本服务器", "欢迎来到本服务器",
"本服务器使用萌卡代码搭建" "本服务器使用萌卡代码搭建"
], ],
"words": {
"test1": [
"test_word_1"
],
"test2": [
"test_word_2"
]
},
"dialogues": { "dialogues": {
"46986414": [ "46986414": [
"出来吧,我最强的仆人,黑魔导!" "出来吧,我最强的仆人,黑魔导!"
...@@ -174,12 +182,4 @@ ...@@ -174,12 +182,4 @@
"我们来做朋友吧!" "我们来做朋友吧!"
] ]
} }
"words": {
"test1": [
"test_word_2"
],
"test2": [
"test_word_2"
]
}
} }
\ No newline at end of file
...@@ -1480,44 +1480,44 @@ ...@@ -1480,44 +1480,44 @@
} }
}); });
load_dialogues = function() { var load_words = function() {
request({ request({
url: settings.modules.dialogues.get, url: settings.modules.words.get,
json: true json: true
}, function(error, response, body) { }, function(error, response, body) {
if (_.isString(body)) { if (_.isString(body)) {
log.warn("dialogues bad json", body); log.warn("words bad json", body);
} else if (error || !body) { } else if (error || !body) {
log.warn('dialogues error', error, response); log.warn('words error', error, response);
} else { } else {
nconf.myset(settings, "dialogues", body); nconf.myset(settings, "words", body);
log.info("dialogues loaded", _.size(body)); log.info("words loaded", _.size(body));
} }
}); });
}; };
if (settings.modules.dialogues.get) { if (settings.modules.words.get) {
load_dialogues(); load_words();
} }
var load_words = function() { load_dialogues = function() {
request({ request({
url: settings.modules.words.get, url: settings.modules.dialogues.get,
json: true json: true
}, function(error, response, body) { }, function(error, response, body) {
if (_.isString(body)) { if (_.isString(body)) {
log.warn("words bad json", body); log.warn("dialogues bad json", body);
} else if (error || !body) { } else if (error || !body) {
log.warn('words error', error, response); log.warn('dialogues error', error, response);
} else { } else {
nconf.myset(settings, "words", body); nconf.myset(settings, "dialogues", body);
log.info("words loaded", _.size(body)); log.info("dialogues loaded", _.size(body));
} }
}); });
}; };
if (settings.modules.words.get) { if (settings.modules.dialogues.get) {
load_words(); load_dialogues();
} }
ygopro.stoc_follow('GAME_MSG', false, function(buffer, info, client, server) { ygopro.stoc_follow('GAME_MSG', false, function(buffer, info, client, server) {
......
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