Merge branch 'master' of https://github.com/moecube/srvpro

data/default_config.json

@@ -19,7 +19,7 @@
     "welcome": "MyCard YGOPro Server",
     "update": "请更新游戏版本",
     "stop": false,
-    "side_timeout": 3,
+    "side_timeout": false,
     "i18n": {
       "auto_pick": false,
       "default": "zh-cn",

data/i18n.json

@@ -217,7 +217,8 @@
     "death_finish_part2": " 获得本次决斗的胜利。",
     "side_timeout_part1": "你现在有",
     "side_timeout_part2": "分钟来更换副卡组。",
-    "side_overtime": "更换副卡组超时，本次比赛判负。",
+    "side_overtime": "你因为更换副卡组超时，本次比赛已被判负。",
+    "side_overtime_room": " 因为更换副卡组超时，本次比赛已被判负。",
     "side_remain_part1": "更换副卡组时间还剩",
     "side_remain_part2": "分钟。",
     "athletic_arena_tip": "在竞技匹配中，比赛开始前退出游戏也会视为投降。"

ygopro-server.coffee

@@ -1890,12 +1890,13 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)->
         clearInterval sinterval
         return
       if client.side_tcount == 1
-        ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED) 
+        ygopro.stoc_send_chat_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BLUE)
+        ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED)
         client.destroy()
         clearInterval sinterval        
       else
         client.side_tcount = client.side_tcount - 1
-        ygopro.stoc_send_chat(client, "${side_remain_part1}#{settings.modules.side_timeout}${side_remain_part2}", ygopro.constants.COLORS.BABYBLUE)        
+        ygopro.stoc_send_chat(client, "${side_remain_part1}#{client.side_tcount}${side_remain_part2}", ygopro.constants.COLORS.BABYBLUE)        
     , 60000
     client.side_interval = sinterval
   if room.random_type or room.arena

ygopro-server.js

@@ -2520,12 +2520,13 @@
           return;
         }
         if (client.side_tcount === 1) {
+          ygopro.stoc_send_chat_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BLUE);
           ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED);
           client.destroy();
           return clearInterval(sinterval);
         } else {
           client.side_tcount = client.side_tcount - 1;
-          return ygopro.stoc_send_chat(client, "${side_remain_part1}" + settings.modules.side_timeout + "${side_remain_part2}", ygopro.constants.COLORS.BABYBLUE);
+          return ygopro.stoc_send_chat(client, "${side_remain_part1}" + client.side_tcount + "${side_remain_part2}", ygopro.constants.COLORS.BABYBLUE);
         }
       }, 60000);
       client.side_interval = sinterval;