Merge branch 'mc'

a865ad8b · nanahira · 87dece5b · 55afc8da · a865ad8b · a865ad8b
Commit a865ad8b authored Aug 18, 2021 by nanahira
Showing with 201 additions and 174 deletions

.gitignore .gitignore +1 -0

data/default_config.json data/default_config.json +2 -1

ygopro-server.coffee ygopro-server.coffee +97 -85

ygopro-server.js ygopro-server.js +101 -88

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ test*
 *.tmp
 *.bak
 *.log
+log.*

 *.map


--- a/data/default_config.json
+++ b/data/default_config.json
@@ -20,7 +20,8 @@
  },
  "modules": {
    "welcome": "MyCard YGOPro Server",
-    "update": "请更新游戏版本",
+    "update": "请更新你的客户端版本",
+    "wait_update": "你的客户端版本高于服务器版本，请等待服务器更新",
    "stop": false,
    "side_timeout": false,
    "tag_duel_surrender": true,

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