diff --git a/css/style.css b/css/style.css
index f7bb084..773b811 100644
--- a/css/style.css
+++ b/css/style.css
@@ -321,6 +321,11 @@ body{
position: absolute;
/* display: inline-flex; */
}
+.dance-people .people-dancins{
+ width: 90px;
+ height: 90px;
+ position: relative;
+}
.dance-people .people-img{
width: 90px;
height: 90px;
@@ -404,11 +409,15 @@ body{
width: 200px;
height: 128px;
content: "";
- left:-50%;
- top: 0px;
+ left:-55%;
+ top: -10px;
position: absolute;
+ display: none;
z-index: -8;
}
+.dance-people .people-wing.people-block{
+ display: block;
+}
/*荧光棒*/
.stick{
background-size: 57px 81px;
diff --git a/dancing.html b/dancing.html
index 64c1821..745c65c 100644
--- a/dancing.html
+++ b/dancing.html
@@ -61,7 +61,7 @@
-
+
diff --git a/image/icon_01.png b/image/icon_01.png
index 820d21c..0841e7e 100644
Binary files a/image/icon_01.png and b/image/icon_01.png differ
diff --git a/image/icon_02.png b/image/icon_02.png
index 988ffcc..4ecbae3 100644
Binary files a/image/icon_02.png and b/image/icon_02.png differ
diff --git a/image/icon_03.png b/image/icon_03.png
index 861611b..1c833b8 100644
Binary files a/image/icon_03.png and b/image/icon_03.png differ
diff --git a/image/icon_04.png b/image/icon_04.png
index 3109e16..e813cbb 100644
Binary files a/image/icon_04.png and b/image/icon_04.png differ
diff --git a/image/icon_05.png b/image/icon_05.png
index 246e5bf..0912f2a 100644
Binary files a/image/icon_05.png and b/image/icon_05.png differ
diff --git a/image/icon_06.png b/image/icon_06.png
index d4dab09..d47bf55 100644
Binary files a/image/icon_06.png and b/image/icon_06.png differ
diff --git a/image/img_01.png b/image/img_01.png
index b94616e..5780034 100644
Binary files a/image/img_01.png and b/image/img_01.png differ
diff --git a/image/img_02.png b/image/img_02.png
index b713e89..7d3eb66 100644
Binary files a/image/img_02.png and b/image/img_02.png differ
diff --git a/image/img_04.png b/image/img_04.png
index fff64af..03736c8 100644
Binary files a/image/img_04.png and b/image/img_04.png differ
diff --git a/image/img_05.png b/image/img_05.png
index cc94dce..37ec75b 100644
Binary files a/image/img_05.png and b/image/img_05.png differ
diff --git a/image/img_06.png b/image/img_06.png
index 2bb9810..0aa9c1b 100644
Binary files a/image/img_06.png and b/image/img_06.png differ
diff --git a/image/img_07.png b/image/img_07.png
index bbdd2aa..b174d2a 100644
Binary files a/image/img_07.png and b/image/img_07.png differ
diff --git a/image/img_08.png b/image/img_08.png
index 316914d..ed79913 100644
Binary files a/image/img_08.png and b/image/img_08.png differ
diff --git a/image/img_09.png b/image/img_09.png
index ad72f96..300f2ee 100644
Binary files a/image/img_09.png and b/image/img_09.png differ
diff --git a/image/img_0x.png b/image/img_0x.png
index 1f966db..6c00666 100644
Binary files a/image/img_0x.png and b/image/img_0x.png differ
diff --git a/image/img_10.png b/image/img_10.png
index d5a82e7..a82d9f9 100644
Binary files a/image/img_10.png and b/image/img_10.png differ
diff --git a/image/img_11.png b/image/img_11.png
index 2d92783..8c844cc 100644
Binary files a/image/img_11.png and b/image/img_11.png differ
diff --git a/image/img_12.png b/image/img_12.png
index c71f81b..d575db5 100644
Binary files a/image/img_12.png and b/image/img_12.png differ
diff --git a/image/img_13.png b/image/img_13.png
index 773d1bb..ebdb46a 100644
Binary files a/image/img_13.png and b/image/img_13.png differ
diff --git a/image/img_14.png b/image/img_14.png
index ec5856e..667dfc5 100644
Binary files a/image/img_14.png and b/image/img_14.png differ
diff --git a/image/img_15.png b/image/img_15.png
index fd8cdba..cd32dc5 100644
Binary files a/image/img_15.png and b/image/img_15.png differ
diff --git a/image/img_16.png b/image/img_16.png
index f8a72fb..10da099 100644
Binary files a/image/img_16.png and b/image/img_16.png differ
diff --git a/image/img_17.png b/image/img_17.png
index b1c8da0..acb785e 100644
Binary files a/image/img_17.png and b/image/img_17.png differ
diff --git a/js/custom.js b/js/custom.js
index a259364..4cb9cf2 100644
--- a/js/custom.js
+++ b/js/custom.js
@@ -32,25 +32,25 @@ var fluoTime = 6000//默认6秒关闭
function allDancing(dangcing){
if(dangcing!=''){
actionArr.forEach((item,index)=>{
- var haveDan = $(`.people-img`).is(`.${item}`);
+ var haveDan = $(`.people-dancins`).is(`.${item}`);
if(haveDan){
- $(`.people-img`).removeClass(item);
+ $(`.people-dancins`).removeClass(item);
// $(`.people-img`).addClass(actionArr[Math.floor(Math.random()*actionArr.length)]);
- $(`.people-img`).addClass(dangcing);
+ $(`.people-dancins`).addClass(dangcing);
$(`.leading-dancer`).removeClass(item);
$(`.leading-dancer`).addClass(dangcing);
}
})
setTimeout(()=>{
startIndex = 0;
- var allPeople = $('.dance-floor').find('.people-img').length;
- $(`.people-img`).removeClass(dangcing);
+ var allPeople = $('.dance-floor').find('.people-dancins').length;
+ $(`.people-dancins`).removeClass(dangcing);
var suiDanTimer = setInterval(()=>{
if(startIndex==allPeople){
clearInterval(suiDanTimer);
} else {
startIndex++;
- $(`.data${startIndex} .people-img`).addClass(actionArr[Math.floor(Math.random()*actionArr.length)]);
+ $(`.data${startIndex} .people-dancins`).addClass(actionArr[Math.floor(Math.random()*actionArr.length)]);
}
},3000)
},10000)
@@ -58,7 +58,7 @@ function allDancing(dangcing){
}
// 创建人物时随机分配舞蹈
function randomDancing(id){
- $(`.data${id} .people-img`).addClass(actionArr[Math.floor(Math.random()*actionArr.length)]);
+ $(`.data${id} .people-dancins`).addClass(actionArr[Math.floor(Math.random()*actionArr.length)]);
}
// 荧光棒动画事件
function fluoEv(id,fluoEvent){
@@ -70,12 +70,12 @@ function fluoEv(id,fluoEvent){
// 个人动作舞
function peopleAction(id,aevent){
actionArr.forEach((item,index)=>{
- var haveDan = $(`#${id} .people-img`).is(`.${item}`);
+ var haveDan = $(`#${id} .people-dancins`).is(`.${item}`);
if(haveDan){
- $(`#${id} .people-img`).removeClass(item);
- $(`#${id} .people-img`).addClass(aevent);
+ $(`#${id} .people-dancins`).removeClass(item);
+ $(`#${id} .people-dancins`).addClass(aevent);
} else {
- $(`#${id} .people-img`).addClass(aevent);
+ $(`#${id} .people-dancins`).addClass(aevent);
}
})
}
@@ -152,8 +152,8 @@ function peopleObj(name,uid,say,action,active_time, is_admin, decoration){
}
// 添加翅膀
- if (decoration.indexOf('big-wing') != -1) {
- decorationWing = 'big-wing'
+ if (decoration.indexOf('people-wing') != -1) {
+ decorationWing = 'people-wing'
// console.log(decorationWing, '我的翅膀')
}
}
@@ -166,13 +166,17 @@ function peopleObj(name,uid,say,action,active_time, is_admin, decoration){
yspHtml += `