Merge branch 'mc'

data/default_config.json

@@ -65,7 +65,7 @@
       "get_zh": false
     },
     "dialogues": {
-      "enabled": true,
+      "enabled": false,
       "get_custom": "http://purerosefallen.github.io/ygopro-tips/dialogues-222.json",
       "get": "http://mercury233.me/ygosrv233/dialogues.json"
     },

ygopro-server.coffee

@@ -2711,10 +2711,10 @@ load_dialogues_custom = global.load_dialogues_custom = (callback) ->
     return
   return
 
-if settings.modules.dialogues.get
+if settings.modules.dialogues.enabled and settings.modules.dialogues.get
   load_dialogues()
 
-if settings.modules.dialogues.get_custom
+if settings.modules.dialogues.enabled and settings.modules.dialogues.get_custom
   load_dialogues_custom()
 
 ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)->
@@ -3226,9 +3226,9 @@ load_tips_zh = global.load_tips_zh = (callback)->
     return
   return
 
-if settings.modules.tips.get
+if settings.modules.tips.enabled and settings.modules.tips.get
   load_tips()
-if settings.modules.tips.get_zh
+if settings.modules.tips.enabled and settings.modules.tips.get_zh
   load_tips_zh()
 if settings.modules.tips.enabled
   setInterval ()->

ygopro-server.js

@@ -3560,11 +3560,11 @@
     });
   };
 
-  if (settings.modules.dialogues.get) {
+  if (settings.modules.dialogues.enabled && settings.modules.dialogues.get) {
     load_dialogues();
   }
 
-  if (settings.modules.dialogues.get_custom) {
+  if (settings.modules.dialogues.enabled && settings.modules.dialogues.get_custom) {
     load_dialogues_custom();
   }
 
@@ -4312,11 +4312,11 @@
     });
   };
 
-  if (settings.modules.tips.get) {
+  if (settings.modules.tips.enabled && settings.modules.tips.get) {
     load_tips();
   }
 
-  if (settings.modules.tips.get_zh) {
+  if (settings.modules.tips.enabled && settings.modules.tips.get_zh) {
     load_tips_zh();
   }