Преглед изворни кода

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

郑晓宇 пре 6 година
родитељ
комит
a389fb4534
3 измењених фајлова са 18 додато и 5 уклоњено
  1. 13 3
      public/h5/datigame/css/main.css
  2. 2 2
      public/h5/datigame/index.html
  3. 3 0
      public/h5/datigame/js/common.js

+ 13 - 3
public/h5/datigame/css/main.css

@@ -108,9 +108,19 @@ body{
 .cov1 .userface{width: 2.2rem;height: 2.2rem;margin: 0 auto;}
 .gstart .cov3{}
 .cov3{left: 50%;top: 9rem;width: 2rem;height: 1rem;line-height: 1rem;margin-left: -1rem;text-align: center;font-size: .5rem;color: #FFF;font-weight: bold;border-radius: .2rem;}
-.cov4{right: 50%;top: 8.5rem;width: 2rem;margin-right: -1rem;}
+.cov4{right: 50%;top: 8.5rem;width: 2rem;margin-right: -1rem;opacity: 0;}
+.ready .cov4{opacity:1;top:3rem;right: 1.5rem;}
+.ready .cov4 .userface{
+    width: 1.5rem;
+    height: 1.5rem;
+}
+.ready .cov4 .name{
+    width: 2.5rem;
+    height: 1.5rem;
+    top: 1.8rem;
+}
  .userface{border-radius: 50%;overflow: hidden;background-color: #000;display: block;}
-.cov4 .userface{width: 2.0rem;height: 2.0rem;float: right;opacity: 0;}
+.cov4 .userface{width: 2.0rem;height: 2.0rem;float: right;/* opacity: 0; */}
 .doing .cov1{left: -.5rem;margin: 0;top: 1rem;background: #32deec;border-radius: 1rem;width: 4.3rem;border: 0;background: url(../img/user0.png);background-size: 4.3rem;height: 1rem;}
 .num{opacity: 0;color: #FFF;FONT-SIZE: 0.6REM;position: absolute;top: 0;text-shadow: 0px 0px 6px #7f8dde;}
 .doing .num{opacity: 1;line-height: .8rem;text-align: center;text-shadow: 2px 2px 0px #820b3e;}
@@ -143,7 +153,7 @@ body{
 }
 .cov4 .name{left: 1.7rem;top: -1.2rem;}
 .gstart .name{top: 3.4rem;width: 2rem;height: .5rem;left: 50%;margin-left: -1rem;text-align: center;overflow: hidden;}
-.gstart .cov4  .name{ left: 46%;  }
+.gstart .cov4  .name{left: 46%;}
 .doing.gstart .name{top: inherit;}
 .doing.gstart .cov4  .name{left: 2.0rem;top: -1rem;}
 .doing  .qs-item{display:block;width: 5.50rem;}

+ 2 - 2
public/h5/datigame/index.html

@@ -19,7 +19,7 @@
 </script>
 <link href="./css/wapzt_base_rem.1.0.css" rel="stylesheet" type="text/css" />
 <link rel="stylesheet" href="./css/animate.min.css">
-<link rel="stylesheet" href="./css/main.css">
+<link rel="stylesheet" href="./css/main.css?v1">
 </head>
 <body>
 	<div class="g-doc">
@@ -103,7 +103,7 @@
 </body>
 <script src="./js/lib-jquery1.10.2.js"></script>
 <script src="./js/base64.js"></script>
-<script src="./js/common.js"></script>
+<script src="./js/common.js?v1"></script>
 <script type="text/javascript">
 	common.init();
 </script>

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

@@ -79,6 +79,9 @@ common={
             _this.userInfo.playerId=data.info.players[i].user_id;
      	}
    	}
+   	if(data.info.players.length>=2){
+   		$(".gstart").addClass("ready");
+   	}
         
  		 
  	},round_end:function(data){