mgsv

.gitignore

@@ -5,6 +5,7 @@ coffeelint.json
 
 password.json
 config.*.json
+config.user.bak
 
 /bak
 /config

config.deckstats.json

+{ "deckpath": "./decks_save", "dbfile": "./ygopro/cards.cdb" }
\ No newline at end of file

data/default_config.json

@@ -100,7 +100,6 @@
       "replay_archive_tool": "7z",
       "show_ip": false,
       "show_info": true,
-      "duel_log": [],
       "password": "123456",
       "port": 7933
     },

data/default_data.json

@@ -34,5 +34,9 @@
         "我们来做朋友吧！"
       ]
     }
+  },
+  "duel_log": {
+    "file": "./config/duel_log.json",
+    "duel_log": []
   }
 }
\ No newline at end of file

ygopro-server.coffee

@@ -62,6 +62,12 @@ try
     olddialogues.dialogues = oldconfig.dialogues
     fs.writeFileSync(olddialogues.file, JSON.stringify(olddialogues, null, 2))
     delete oldconfig.dialogues
+  if oldconfig.modules.tournament_mode and oldconfig.modules.tournament_mode.duel_log
+    oldduellog = {}
+    oldduellog.file = './config/duel_log.json'
+    oldduellog.duel_log = oldconfig.modules.tournament_mode.duel_log
+    fs.writeFileSync(oldduellog.file, JSON.stringify(oldduellog, null, 2))
+    delete oldconfig.oldduellog
   oldbadwords={}
   if oldconfig.ban.badword_level0
     oldbadwords.level0 = oldconfig.ban.badword_level0
@@ -131,6 +137,11 @@ try
 catch
   badwords = default_data.badwords
   setting_save(badwords)
+try
+  duel_log = require('./config/duel_log.json')
+catch
+  duel_log = default_data.duel_log
+  setting_save(duel_log)
 
 try
   cppversion = parseInt(fs.readFileSync('ygopro/gframe/game.cpp', 'utf8').match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16')
@@ -156,16 +167,6 @@ if settings.modules.cloud_replay.enabled
 if settings.modules.windbot.enabled
   windbots = require(settings.modules.windbot.botlist).windbots
 
-if settings.modules.tournament_mode.enabled
-  duel_log = {}
-  clearlog = () ->
-    duel_log = {}
-    duel_log.file = 'duel_log.' + moment().format('YYYY-MM-DD HH-mm-ss') + '.json'
-    duel_log.duel_log = []
-    setting_save(duel_log)
-    return
-  clearlog()
-
 # 组件
 ygopro = require './ygopro.js'
 roomlist = require './roomlist.js' if settings.modules.http.websocket_roomlist
@@ -2069,7 +2070,8 @@ if settings.modules.http
         return
       else
         response.writeHead(200)
-        clearlog()
+        duel_log.duel_log = []
+        setting_save(duel_log)
         response.end(addCallback(u.query.callback, "[{name:'Success'}]"))
 
     else if _.startsWith(u.pathname, '/api/replay') and settings.modules.tournament_mode.enabled

ygopro-server.js

 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Cloud_replay_ids, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_players_banned, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, Room, _, addCallback, badwords, ban_user, bunyan, clearlog, config, cppversion, crypto, date, default_config, default_data, dialogues, duel_log, e, exec, execFile, fs, geoip, get_memory_usage, http, http_server, https, https_server, lflists, list, load_dialogues, load_tips, log, memory_usage, merge, moment, net, oldbadwords, oldconfig, olddialogues, oldtips, options, os, path, pgClient, pg_client, pg_query, redis, redisdb, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, tips, url, users_cache, wait_room_start, wait_room_start_arena, windbot_bin, windbot_parameters, windbot_process, windbots, ygopro, zlib;
+  var Cloud_replay_ids, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_players_banned, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, Room, _, addCallback, badwords, ban_user, bunyan, config, cppversion, crypto, date, default_config, default_data, dialogues, duel_log, e, exec, execFile, fs, geoip, get_memory_usage, http, http_server, https, https_server, lflists, list, load_dialogues, load_tips, log, memory_usage, merge, moment, net, oldbadwords, oldconfig, olddialogues, oldduellog, oldtips, options, os, path, pgClient, pg_client, pg_query, redis, redisdb, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, tips, url, users_cache, wait_room_start, wait_room_start_arena, windbot_bin, windbot_parameters, windbot_process, windbots, ygopro, zlib;
 
   var words, oldwords;
   
@@ -89,6 +89,13 @@
       fs.writeFileSync(olddialogues.file, JSON.stringify(olddialogues, null, 2));
       delete oldconfig.dialogues;
     }
+    if (oldconfig.modules.tournament_mode && oldconfig.modules.tournament_mode.duel_log) {
+      oldduellog = {};
+      oldduellog.file = './config/duel_log.json';
+      oldduellog.duel_log = oldconfig.modules.tournament_mode.duel_log;
+      fs.writeFileSync(oldduellog.file, JSON.stringify(oldduellog, null, 2));
+      delete oldconfig.oldduellog;
+    }
     oldbadwords = {};
     if (oldconfig.ban.badword_level0) {
       oldbadwords.level0 = oldconfig.ban.badword_level0;
@@ -190,6 +197,13 @@
     setting_save(badwords);
   }
 
+  try {
+    duel_log = require('./config/duel_log.json');
+  } catch (error1) {
+    duel_log = default_data.duel_log;
+    setting_save(duel_log);
+  }
+
   try {
     cppversion = parseInt(fs.readFileSync('ygopro/gframe/game.cpp', 'utf8').match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16');
     setting_change(settings, "version", cppversion);
@@ -248,17 +262,6 @@
     windbots = require(settings.modules.windbot.botlist).windbots;
   }
 
-  if (settings.modules.tournament_mode.enabled) {
-    duel_log = {};
-    clearlog = function() {
-      duel_log = {};
-      duel_log.file = 'duel_log.' + moment().format('YYYY-MM-DD HH-mm-ss') + '.json';
-      duel_log.duel_log = [];
-      setting_save(duel_log);
-    };
-    clearlog();
-  }
-
   ygopro = require('./ygopro.js');
 
   if (settings.modules.http.websocket_roomlist) {
@@ -2777,7 +2780,8 @@
           return;
         } else {
           response.writeHead(200);
-          clearlog();
+          duel_log.duel_log = [];
+          setting_save(duel_log);
           response.end(addCallback(u.query.callback, "[{name:'Success'}]"));
         }
       } else if (_.startsWith(u.pathname, '/api/replay') && settings.modules.tournament_mode.enabled) {