Commit 2de62c08 by 刘海龙

Merge branch 'master' of http://132.232.91.252:9999/ice/quxiu

parents cd07d917 0aec7c9c
...@@ -632,7 +632,7 @@ io.on('connection', function(socket) { ...@@ -632,7 +632,7 @@ io.on('connection', function(socket) {
LivePK_timer[socket.uid]=setTimeout(function() {//定时发送结果 LivePK_timer[socket.uid]=setTimeout(function() {//定时发送结果
endLivePk(io,socket.uid,0); endLivePk(io,socket.uid,0);
}, 5*60*1000); }, 30*1000);
//5*60*1000 //5*60*1000
}else if(action=='5'){ }else if(action=='5'){
......
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