Merge branch 'master' of http://git.scdxtc.com/chen/squareDancing

css/style.css

@@ -330,6 +330,7 @@ body{
 	position: relative;
 	filter:drop-shadow(10px 30px 10px rgba(0,0,0,.4));
 }
+/**/
 .dance-people .people-img01{
 	background-image: url(../image/img_05.png);
 }
@@ -355,6 +356,47 @@ body{
      -webkit-text-stroke: 0.5px black;
 	 text-align: center;
 }
+
+/*圣诞帽子*/
+.dance-people .people-hat::after{
+	background: url(../image/icon_05.png) no-repeat;
+	background-size: 65px 33px;
+	width: 65px;
+	height: 33px;
+	content: "";
+	left:12px;
+	top: 0px;
+	z-index: 2;
+	position: absolute;
+}
+.dance-people .people-img01.people-hat::after{
+	left:19px;
+	top: -14px;
+}
+.dance-people .people-img02.people-hat::after{
+	left:19px;
+	top: 0px;
+}
+.dance-people .people-img03.people-hat::after{
+	left:11px;
+	top: 0px;
+}
+.dance-people .people-img03.people-hat::after{
+	left:11px;
+	top: 0px;
+}
+.dance-people .people-img04.people-hat::after{
+	left:2px;
+	top: 0px;
+}
+.dance-people .people-img05.people-hat::after{
+	left:18px;
+	top: 0px;
+}
+.dance-people .people-img06.people-hat::after{
+	left:15px;
+	top: 0px;
+}
 /*荧光棒*/
 .stick{
 	background-size: 57px 81px;
@@ -362,6 +404,7 @@ body{
 	position: absolute;
 	height:81px;
 	width:57px;
+	z-index: 3;
 }
 
 .stick-swing{
@@ -370,7 +413,7 @@ body{
 .stick-swing-big{
 	animation: Wobble-big 2s linear infinite;
 }
-.stick-swing-big-tow {
+.stick-swing-big-tow,.stick-christmas{
 	animation: Wobble-big-tow 2s linear infinite;
 }
 .stick-go{
@@ -394,6 +437,10 @@ body{
 .stick.stick-06{
 	background-image: url(../image/img_16.png);
 }
+/*圣诞树*/
+.stick.stick-christmas{
+	background-image: url(../image/img_17.png);
+}
 /*荧光棒定位*/
 .dance-people .people-img01 .stick{
 	top: 14px;
@@ -420,7 +467,7 @@ body{
 	right: -15px;
 }
 /*大荧光棒*/
-.stick.stick-swing-big,.stick.stick-swing-big-tow{
+.stick.stick-swing-big,.stick.stick-swing-big-tow,.stick.stick-christmas{
 	background-size: 114px 162px;
 	background-repeat: no-repeat;
 	width: 114px ;
@@ -430,27 +477,33 @@ body{
 	top: -70px;
 	right: -70px;
 }
-.dance-people .people-img01 .stick.stick-swing-big-tow{
+.dance-people .people-img01 .stick.stick-swing-big-tow
+,.dance-people .people-img01 .stick.stick-christmas{
     top: -43px;
     right: -40px;
 }
-.dance-people .people-img02 .stick.stick-swing-big-tow{
+.dance-people .people-img02 .stick.stick-swing-big-tow
+,.dance-people .people-img02 .stick.stick-christmas{
     top: -61px;
     right: 0px;
 }
-.dance-people .people-img03 .stick.stick-swing-big-tow{
+.dance-people .people-img03 .stick.stick-swing-big-tow
+,.dance-people .people-img03 .stick.stick-christmas{
     top: -67px;
     right: -57px;
 }
-.dance-people .people-img04 .stick.stick-swing-big-tow{    
+.dance-people .people-img04 .stick.stick-swing-big-tow
+,.dance-people .people-img04 .stick.stick-christmas{    
 	top: -57px;
     right: -50px;
 }
-.dance-people .people-img05 .stick.stick-swing-big-tow{
+.dance-people .people-img05 .stick.stick-swing-big-tow
+,.dance-people .people-img05 .stick.stick-christmas{
     top: -68px;
     right: -55px;
 }
-.dance-people .people-img06 .stick.stick-swing-big-tow{    
+.dance-people .people-img06 .stick.stick-swing-big-tow
+,.dance-people .people-img06 .stick.stick-christmas{    
 	top: -55px;
     right: -10px;
 }

js/custom.js

@@ -137,12 +137,13 @@ function peopleObj(name,uid,say,action,active_time, is_admin){
 			yspHtml += `
 			<div id="${comment.uid}" data-time="${comment.active_time}" class="dance-people data${peopleId}" style="top: ${comment.top}; left: ${comment.left};">
 				<div class="speak ">${comment.say}</div>
-				<div class="people-img ${comment.peopleImg} ${comment.dancin}">
-					<div class="stick stick-swing ${bigStick} ${comment.ying_guang}"></div>
+				<div class="people-img ${comment.peopleImg} ${comment.dancin} ">
+					<div class="stick stick-swing   ${bigStick} ${comment.ying_guang}"></div>
 					<div class="people-name ">${comment.name}</div>
 				</div>
 			</div>`
-	});//如果是舰长需要加上stick-swing-big-tow
+	});//如果是舰长需要加上stick-swing-big-tow，充值用户加上stick-christmas，同时去掉stick-swing-big-tow
+	//增加圣诞帽子，在people-img那层增加people-hat。
 	$('.dance-floor').prepend(yspHtml);
 	moveEv(uid);
 	// 随机舞
@@ -184,7 +185,7 @@ function dancerRandom(){
 $(function(){
 	dancerRandom();
 	// 自动切歌
-	changeMusic();
+	//changeMusic();
 	var audio=document.getElementById('music');
 	if(audio){
 		audio.loop = false;

js/handle.js

@@ -421,7 +421,7 @@ function createVirtual() {
     }
 }
 
-music();
+// music();
 // 清理缓存
 sessionStorage.clear()