Skip to content

S
srvpro
Commit a865ad8b authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'mc'

parents 87dece5b 55afc8da
Pipeline #4748 passed with stages
      in 10 minutes and 20 seconds
      Expand all Hide whitespace changes
      Inline Side-by-side
      Showing with 201 additions and 174 deletions
      .gitignore
      View file @ a865ad8b
      ...@@ -32,6 +32,7 @@ test* ...@@ -32,6 +32,7 @@ test*
      *.tmp *.tmp
      *.bak *.bak
      *.log *.log
      log.*
      *.map *.map
      ......
      data/default_config.json
      View file @ a865ad8b
      ...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
      }, },
      "modules": { "modules": {
      "welcome": "MyCard YGOPro Server", "welcome": "MyCard YGOPro Server",
      "update": "请更新游戏版本", "update": "请更新你的客户端版本",
      "wait_update": "你的客户端版本高于服务器版本，请等待服务器更新",
      "stop": false, "stop": false,
      "side_timeout": false, "side_timeout": false,
      "tag_duel_surrender": true, "tag_duel_surrender": true,
      ......
      ygopro-server.coffee
      View file @ a865ad8b
      This diff is collapsed.
      ygopro-server.js
      View file @ a865ad8b
      This diff is collapsed.
      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