소스 검색

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

郑晓宇 6 년 전
부모
커밋
3e4656bc67
3개의 변경된 파일15개의 추가작업 그리고 0개의 파일을 삭제
  1. 8 0
      public/h5/datigame/css/main.css
  2. 3 0
      public/h5/datigame/index.html
  3. 4 0
      public/h5/datigame/js/common.js

+ 8 - 0
public/h5/datigame/css/main.css

@@ -397,6 +397,14 @@ background-color:#009688;
   top: 3rem;
   background:url(../img/vs.png) no-repeat bottom;
   background-size: 100%;
+   -webkit-animation-name: flip;
+    animation-name:flip;
+    -webkit-animation-duration: 1s;
+    animation-duration: 1s;
+    -webkit-animation-fill-mode:both;
+    animation-fill-mode:both;
+    -webkit-animation-iteration-count: 1;
+    animation-iteration-count:1;
 }
 .vsmov .cov1{
      -webkit-animation-name: bounceInLeft;

+ 3 - 0
public/h5/datigame/index.html

@@ -59,6 +59,8 @@
 
       <div class="cov cov1 amt"><span class="userface" id="py1_avatar"></span>
         <b id="py1_username" class="name"></b>
+        
+        <span class="num amt win_rate" id="win_rate1">0</span>
         <span class="num amt" id="py1_score">0</span>
       </div>
       <div class="cov cov2 amt">
@@ -82,6 +84,7 @@
       <div class="cov cov4 amt">
         <span class="userface" id="py2_avatar" ></span>
         <b id="py2_username" class="name"></b>
+        <span class="num amt win_rate" id="win_rate2">0</span>
         <span class="num amt"  id="py2_score">0</span>
       </div>
       <div class="qs-item" >

+ 4 - 0
public/h5/datigame/js/common.js

@@ -77,8 +77,12 @@ common={
         	$("#py2_avatar").html('<img src="' + data.info.players[i].avatar+ '" class="layui-circle">');
             $("#py2_username").html(data.info.players[i].name);
             _this.userInfo.playerId=data.info.players[i].user_id;
+            $("#win_rate1").html(data.info.players[i].win_rate*100);
+     	}else{
+     		$("#win_rate2").html(data.info.players[i].win_rate*100);
      	}
    	}
+   	
    	if(data.info.players.length>=2){
    		$(".gstart").addClass("ready");
    		$(".g-doc .g-inner").addClass("doing");