Merge branch 'mc'

ygopro-server.coffee

@@ -1816,6 +1816,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
         client.write buffer
     else
       ygopro.stoc_send_chat(client, '${loading_user_info}', ygopro.constants.COLORS.BABYBLUE)
+      client.setTimeout(300000) #连接后超时5分钟
       challonge.participants._index({
         id: settings.modules.challonge.tournament_id,
         callback: (err, data) ->
@@ -1867,7 +1868,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
                 ygopro.stoc_die(client, room.error)
               else if room.started
                 if settings.modules.cloud_replay.enable_halfway_watch and !room.no_watch
-                  client.setTimeout(300000) #连接后超时5分钟
+                  #client.setTimeout(300000) #连接后超时5分钟
                   client.rid = _.indexOf(ROOM_all, room)
                   client.is_post_watcher = true
                   ygopro.stoc_send_chat_to_room(room, "#{client.name} ${watch_join}")
@@ -1884,7 +1885,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
                   ygopro.stoc_die(client, "${challonge_player_already_in}")
                   return
                 #client.room = room
-                client.setTimeout(300000) #连接后超时5分钟
+                #client.setTimeout(300000) #连接后超时5分钟
                 client.rid = _.indexOf(ROOM_all, room)
                 room.connect(client)
               return

ygopro-server.js

@@ -2241,6 +2241,7 @@
         }
       } else {
         ygopro.stoc_send_chat(client, '${loading_user_info}', ygopro.constants.COLORS.BABYBLUE);
+        client.setTimeout(300000);
         challonge.participants._index({
           id: settings.modules.challonge.tournament_id,
           callback: function(err, data) {
@@ -2305,7 +2306,6 @@
                   ygopro.stoc_die(client, room.error);
                 } else if (room.started) {
                   if (settings.modules.cloud_replay.enable_halfway_watch && !room.no_watch) {
-                    client.setTimeout(300000);
                     client.rid = _.indexOf(ROOM_all, room);
                     client.is_post_watcher = true;
                     ygopro.stoc_send_chat_to_room(room, client.name + " ${watch_join}");
@@ -2331,7 +2331,6 @@
                     ygopro.stoc_die(client, "${challonge_player_already_in}");
                     return;
                   }
-                  client.setTimeout(300000);
                   client.rid = _.indexOf(ROOM_all, room);
                   room.connect(client);
                 }