Merge branch 'master' into tcg_random

76075ee7 · nanahira · 986f33a7 · 9c6b6df1 · 76075ee7 · 76075ee7
Commit 76075ee7 authored Jan 02, 2019 by nanahira
Showing with 105 additions and 101 deletions

config_build/config.json config_build/config.json +1 -0

config_tourney/config.json config_tourney/config.json +1 -0

ygopro-server.coffee ygopro-server.coffee +50 -41

ygopro-server.js ygopro-server.js +53 -60

No files found.
--- a/config_build/config.json
+++ b/config_build/config.json
@@ -21,6 +21,7 @@
    "stop": false,
    "side_timeout": 3,
    "tag_duel_surrender": true,
+    "replay_delay": true,
    "i18n": {
      "auto_pick": true,
      "default": "zh-cn",

--- a/config_tourney/config.json
+++ b/config_tourney/config.json
@@ -21,6 +21,7 @@
    "stop": false,
    "side_timeout": 3,
    "tag_duel_surrender": true,
+    "replay_delay": true,
    "i18n": {
      "auto_pick": true,
      "default": "zh-cn",

--- a/ygopro-server.coffee
+++ b/ygopro-server.coffee
--- a/ygopro-server.js
+++ b/ygopro-server.js