Merge branch 'master' of http://120.78.169.79:3000/zhengxiaoyu/datiGame

public/plugins/layui/css/main.css

@@ -229,8 +229,8 @@ body{
 .result{width: 6.12rem;height: 9rem;margin: 4.8rem 0.7rem 0;background-color: #FFF;display: none;position: relative;}
 .end .result{display: block;background: url(../img/item.png) no-repeat center top;background-size: 100%;}
 .top-icon{width: 2.33rem;height: 3rem;background-size: 100%;display: block;position: absolute;top: -0.86rem;left: 50%;margin-left: -1.165rem;text-align: center;}
-.top-icon.success{background-image: url(../img/success.png) no-repeat;  }
-.top-icon.faild{background-image: url(../img/fail.png)  no-repeat;}
+.top-icon.success{background: url(../img/success.png) no-repeat;background-size: 100%;}
+.top-icon.faild{background: url(../img/fail.png)  no-repeat;background-size: 100%;}
 .result .live{color: #FFF;text-align: center;display: block;margin-top: 1.2rem;float: left;width: 100%;margin-bottom: 1rem;/* display: none; */text-indent: -33em;overflow: hidden;}
 .result .btn{
     display: block;

resources/views/home/user.blade.php

@@ -29,7 +29,7 @@
         <p>1.随机匹配对手<br />
           2.在50秒内完成5道题目<br />
           3.10秒内完成答题，答对加分，答错不扣分<br />
-          4.每题满分100分，慢一秒答题扣10分<br />
+          4.每题满分300分，慢一秒答题扣10分<br />
           5.最终得分高为胜者，获得奖励</p>
           
         </div>
@@ -61,7 +61,8 @@
         <input type="hidden" id="user_id" name="user_id">
         <input type="hidden" id="duishou" name="duishou">
       </div>
-      <div class="cov cov3 amt" id="Jvs">匹配中
+      <div class="cov cov3 amt" id="Jvs">
+        <span class="tit">匹配中</span>
         <div class="con" style="display: none;">
           <div class="percent-circle percent-circle-left">
             <div class="left-content "></div>
@@ -108,7 +109,7 @@ layui.use(['form','jquery'], function(){
   var is_end = 0;
   var question_id=0;
   var ts;
-  var sum=5;
+  var sum=9;
   var angle = 0 ;
   $.ajaxSetup({
       headers: {
@@ -157,6 +158,7 @@ function daoshu(argument) {
         if (sum >= 0) textCircle.innerHTML = sum;
         sum = sum - 1;
         $("#Jvs .con").show();
+        $("#Jvs .tit").html("抢答中");
         angle += 36;
         if (angle <= 360) {
             if (angle > 180) {
@@ -228,10 +230,11 @@ function daoshu(argument) {
               break;
           case 'answer':
               console.log(data);
+              
               if(data.user_id == $("#user_id").val()){
                 var score = parseInt($("#py1_score").html());
                 if(data.is_true == 1){
-                  $("#py1_score").html(score+300);
+                  $("#py1_score").html(score+300*(sum/10));
                   $(".cur_answer").addClass("cur_true");
                 }else{
                   $(".cur_answer").addClass("cur_error");
@@ -239,14 +242,16 @@ function daoshu(argument) {
               }else{
                 if(data.is_true == 1){
                   var score = parseInt($("#py2_score").html());
-                  $("#py2_score").html(score+300);
+                  $("#py2_score").html(score+300*(sum/10));
                 }
               }
               var py1_score = parseInt($("#py1_score").html());
                 var py2_score = parseInt($("#py2_score").html());
                 if(data.is_end == 1){
                   //结算
-                   clearInterval(ts)
+                  clearInterval(ts)
+                  setTimeout(function (argument) {
+                    
                    $(".g-doc .g-inner").addClass("end");
                    $("#Jvs").hide();
                   
@@ -277,6 +282,8 @@ function daoshu(argument) {
                   cur_question = 1;
                   room_id = 0;
                    
+                  },1000)
+                   
                   
                  
                   return false;
@@ -295,7 +302,10 @@ function daoshu(argument) {
               break;
           // 当mvc框架调用GatewayClient发消息时直接alert出来
           case "question":
-            loadQuestion(data);
+          setTimeout(function(argument) {
+           loadQuestion(data);
+          },1000);
+            
           default :
              // alert(e.data);
       }
@@ -369,7 +379,7 @@ function daoshu(argument) {
    })}
     var answer=function(answerId) {
       
-      answerId= answerId?answerId:$("#question .answer").eq(0).attr("data-id");//默认第一题为答案
+      answerId= answerId?answerId:0;//默认第一题为答案
       var url = '/Home/Game/Answer';
       
       $.post(url, {option_id:answerId,cur_question:cur_question,client_id:client_id,is_end:is_end,question_id:question_id}, function(responsedata){