update

LiveNewIM/s1.js

@@ -613,7 +613,7 @@ io.on('connection', function(socket) {
                         clientRedis.hset('LivePK_gift',pkuid,0);
 
                         var time=Math.floor( (new Date()).getTime()/1000);
-                        var phtime = time+7*60;//PK结束、开始惩罚时间
+                        var phtime = time+2*60;//PK结束、开始惩罚时间
                         var phetime = phtime+1.5*60;//惩罚结束时间
                         /* 发送连麦成功信息 */
                         /* 当前房间 */
@@ -693,7 +693,7 @@ io.on('connection', function(socket) {
                                 clearTimeout(LivePH_timer[socket.uid]);
                                 LivePH_timer[socket.uid]=null;
                             }
-                        }, 8.5*60*1000);//pk惩罚结束时间
+                        }, 3.5*60*1000);//pk惩罚结束时间
 
                         LivePKtime_timer[socket.uid]=setInterval(function() {//定时发送结果
                             var leftTime = phtime - Math.floor( (new Date()).getTime()/1000); //计算剩余的毫秒数
@@ -708,8 +708,8 @@ io.on('connection', function(socket) {
                                 LivePKtime_timer[socket.uid] = null;
                                 PKTimer = {'status':'end','min':'00','sec':'00'};
                             }
-                            // io.sockets.in(socket.roomnum).emit("pktime", [PKTimer]);
-                            // io.sockets.in(pkuid).emit("pktime", [PKTimer]);
+                            io.sockets.in(socket.roomnum).emit("pktime", [PKTimer]);
+                            io.sockets.in(pkuid).emit("pktime", [PKTimer]);
 
                             //process_msg(io,socket.roomnum,JSON.stringify(PKTimer));
                             //process_msg(io,pkuid,JSON.stringify(PKTimer));
@@ -729,8 +729,8 @@ io.on('connection', function(socket) {
                                     LivePHtime_timer[socket.uid] = null;
                                     PHTimer = {'status':'end','min':'00','sec':'00'};
                                 }
-                                // io.sockets.in(socket.roomnum).emit("phtime", [PHTimer]);
-                                // io.sockets.in(pkuid).emit("phtime", [PHTimer]);
+                                io.sockets.in(socket.roomnum).emit("phtime", [PHTimer]);
+                                io.sockets.in(pkuid).emit("phtime", [PHTimer]);
 
                                 //io.sockets.in(data['roomnum']).emit("broadcastingListen", ['stopplay']);
                                 //process_msg(io,socket.roomnum,JSON.stringify(PHTimer));
@@ -1226,7 +1226,7 @@ function endLivePk(io,uid,type){
     // clientRedis.hset('LivePK_gift',uid,0);
     // clientRedis.hset('LivePK_gift',pkuid,0);
     var time=Math.floor( (new Date()).getTime()/1000);
-    var phetime = time+1.5*60;//惩罚结束时间
+    var phetime = time+2.5*60;//惩罚结束时间
     //var phetime = phtime+0.5*60;//惩罚结束时间
     var data_obj={
         "msg":[