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

public/h5/datigame/css/main.css

@@ -413,7 +413,7 @@ background-color:#009688;
 .percent-circle {
   position:absolute;
   height:100%;
-  background: #f49136;
+  background: #FFF;
   overflow: hidden;
 }
 
@@ -431,7 +431,7 @@ background-color:#009688;
   transform-origin:left center;
   transform: rotate(0deg);
   border-radius: 0 .8rem .8rem 0/0 .8rem .8rem 0;
-  background: #ffffff;
+  background: #f49136;
 }
 
 .percent-circle-left {
@@ -447,7 +447,7 @@ background-color:#009688;
   transform-origin:right center;
   transform: rotate(0deg);
   border-radius: .8rem 0 0 .8rem/.8rem 0 0 .8rem;
-  background: #ffffff;
+  background: #f49136;
 }
  
 .text-circle {
@@ -462,6 +462,43 @@ background-color:#009688;
   border-radius:100%;
   background: #2b236e;
   color:#fff;
+  text-shadow: 2px 2px 0px #820b3e;
+}
+.daoshu{
+   -webkit-animation-name: daoshu;
+    animation-name: daoshu;
+   
+}
+@keyframes daoshu
+{
+from {
+  transform: scale(1);
+ 
+    -webkit-transform:scale(1); /* Safari 和 Chrome */
+    color:#fff;
+}
+to {
+transform: scale(2);
+ 
+    -webkit-transform:scale(2); /* Safari 和 Chrome */
+    color:#820b3e;
+  }
+}
+
+@-webkit-keyframes daoshu  
+{
+from {
+  transform: scale(1);
+ 
+    -webkit-transform:scale(1); /* Safari 和 Chrome */
+    color:#fff;
+}
+to {
+transform: scale(2);
+ 
+    -webkit-transform:scale(2); /* Safari 和 Chrome */
+    color:#820b3e;
+  }
 }
  .poptis{
   display: inline-block;

public/h5/datigame/index.html

@@ -90,7 +90,7 @@
         </ul>
         <div class="page" id="Jpage"></div>
       </div>
-      <div class="result">
+      <div class="result bounceInUp animated">
         <span class="icon top-icon success" id="Jresult"></span>
         <span class="live" id="Jlastmsg">初级玩家</span>
          <span class="btn-3 btn btn1" id="Jagain"  >再来一局</span> 

public/h5/datigame/js/common.js

@@ -71,7 +71,7 @@ common={
    //          $("#py1_avatar").html('<img src="' + data.info.user.avatar+ '" class="layui-circle">');
    //          $("#py1_username").html(data.info.user.name + '（我）');
    //      }
-   	this.tips(data.info.user.name+"加入了房间")
+   //	this.tips(data.info.user.name+"加入了房间")
    	for (var i = 0; i < data.info.players.length; i++) {
    		 if(data.info.players[i].user_id!=_this.userInfo.user_id){
         	$("#py2_avatar").html('<img src="' + data.info.players[i].avatar+ '" class="layui-circle">');
@@ -123,19 +123,19 @@ common={
  		var py2_score=parseInt($("#py2_score").text());
  		if(py1_score > py2_score){
                      
-                     _this.tips('恭喜你获得胜利');
+                    // _this.tips('恭喜你获得胜利');
                     $("#Jresult").removeClass("faild");
                     $("#Jresult").addClass("success");
                     $("#Jlastmsg").html("恭喜你获得胜利")
                   }else if(py1_score == py2_score){
                      
-                    _this.tips('打成平手');
+                    //_this.tips('打成平手');
                     $("#Jlastmsg").html("打成平手")
                     $("#Jresult").removeClass("success");
                     $("#Jresult").removeClass("faild");
                     $("#Jresult").html($("#avatar").html())
                   }else{
-                    _this.tips('您输了比赛');
+                    //_this.tips('您输了比赛');
                     $("#Jlastmsg").html("您输了比赛")
                     $("#Jresult").removeClass("success");
                     $("#Jresult").addClass("faild");
@@ -294,9 +294,9 @@ common={
 	    var html="<b class=''>"+_this.data.sum+"</b>";
 	    this.data.ts = setInterval(function() {
 	    	if(_this.data.sum<4){
-	    		 html="<b class='rubberBand animated'>"+_this.data.sum+"</b>";
+	    		 html="<b class='daoshu tada animated'>"+_this.data.sum+"</b>";
 	        	setTimeout(function(){
-	        		$(".text-circle b").removeClass("rubberBand");
+	        		$(".text-circle b").removeClass("daoshu");
 	        		$(".text-circle b").removeClass("animated");
 	        	},900)
 	        }else{