From 59e8a672d6fced68d98f4ccd92f0a6597c1a1095 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Fri, 19 Nov 2021 23:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
css/style.css | 9 +++--
dancing.html | 12 +++---
js/custom.js | 104 ++++++++++++++++++++++++++++++++++++++------------
3 files changed, 89 insertions(+), 36 deletions(-)
diff --git a/css/style.css b/css/style.css
index 2d51d15..150e278 100644
--- a/css/style.css
+++ b/css/style.css
@@ -103,13 +103,13 @@ input, textarea, select {
.dancing-down{
animation:dancing-down 2s linear infinite forwards;
}
-.dancing-Wobble{
+.dancing-wobble{
animation:dancing-Wobble 1s linear infinite forwards;
}
-.dancing-Wobble-right{
+.dancing-wobble-right{
animation:dancing-Wobble-right 1s linear infinite forwards;
}
-.dancing-UP{
+.dancing-up{
animation:dancing-UP 1s linear infinite forwards;
}
/*人物行走*/
@@ -258,7 +258,7 @@ body{
padding: 0 10px;
border: 2px solid #000000;
z-index: 9;
- min-width:80px;
+ min-width:160px;
}
.speak::after{
background: url(../image/icon_04.png) no-repeat;
@@ -279,6 +279,7 @@ body{
background: #ff0084;
color: #FFFFFF;
margin: -78px auto 0;
+ display: none;
}
.speak.speak-pink::after{
background: url(../image/icon_03.png) no-repeat;
diff --git a/dancing.html b/dancing.html
index d5fdcc8..5f0038e 100644
--- a/dancing.html
+++ b/dancing.html
@@ -39,14 +39,12 @@
-
- 一起：起来嗨！
-
-
+
+
-
当前领舞：9527
+
当前领舞：
送任意电池可获得荧光棒！
大航海排名前三可成为领舞!
领舞特权：切歌，镜头，统一动作”跳跃，旋转，向左，向右，向左抖腿，向右抖腿”，
一起喊“任意文字”
-->
-
+
diff --git a/js/custom.js b/js/custom.js
index 98fa246..e1acb62 100644
--- a/js/custom.js
+++ b/js/custom.js
@@ -8,7 +8,7 @@ var nameArr = ['鹅鹅鹅鹅鹅鹅','打嗝','旋风腿儿','霹雳腿儿','老
// 粉丝说的话
var sayArr = ['没人','内容','空空风','美女姐姐','小阔爱','老阔爱'];
// 动作
-var actionArr = ['dancing-left','dancing-right','dancing-down','dancing-UP','dancing-Wobble','dancing-Wobble-right'];
+var actionArr = ['dancing-left','dancing-right','dancing-down','dancing-up','dancing-wobble','dancing-wobble-right'];
// 人物位移动画
var moveArr = ['run-right','run-left','run-right-top','run-left-top','run-right-bottom','run-left-bottom'];
var peopleId = 0;
@@ -18,20 +18,39 @@ var winWidth = $(window).width();
var winheight = $(window).height();
//控制速度1px
var speed = 1;
+var upTimer = null,downTimer = null,leftTimer = null,rightTimer = null;
+var suiDanTimer = null;
+var startIndex = 0;
// 集体舞
-function allDancing(){
- actionArr.forEach((item,index)=>{
- var chooseIdex = Math.floor(Math.random()*num);
- var haveDan = $(`.people-img`).is(`.${item}`);
- if(haveDan){
- $(`.people-img`).removeClass(item);
- $(`.people-img`).addClass(actionArr[Math.floor(Math.random()*actionArr.length)]);
- }
- })
- setTimeout(()=>{
- console.log('关闭集体舞');
- clearInterval(actionTimer);
- },3000)
+function allDancing(dangcing){
+ if(dangcing!=''){
+ clearInterval(upTimer);
+ clearInterval(downTimer);
+ clearInterval(leftTimer);
+ clearInterval(rightTimer);
+ actionArr.forEach((item,index)=>{
+ var haveDan = $(`.people-img`).is(`.${item}`);
+ if(haveDan){
+ $(`.people-img`).removeClass(item);
+ // $(`.people-img`).addClass(actionArr[Math.floor(Math.random()*actionArr.length)]);
+ $(`.people-img`).addClass(dangcing);
+ }
+ })
+ setTimeout(()=>{
+ console.log('关闭集体舞');
+ clearInterval(actionTimer);
+ startIndex = 0;
+ var allPeople = $('.dance-floor').find('.people-img').length;
+ suiDanTimer = setInterval(()=>{
+ if(startIndex==allPeople){
+ clearInterval(suiDanTimer);
+ } else {
+ startIndex++;
+ $(`.data${startIndex} .people-img`).addClass(actionArr[Math.floor(Math.random()*actionArr.length)]);
+ }
+ },3000)
+ },3000)
+ }
}
// 随机舞
function randomDancing(id){
@@ -68,7 +87,7 @@ function moveEv(id){
}
// 上
function upMove(obj){
- var upTimer = setInterval(()=>{
+ upTimer = setInterval(()=>{
if(obj.offsetTop < 100){
clearInterval(upTimer);
downMove(obj);
@@ -79,7 +98,7 @@ function upMove(obj){
}
// 下
function downMove(obj){
- var downTimer = setInterval(()=>{
+ downTimer = setInterval(()=>{
if(obj.offsetTop > 500){
clearInterval(downTimer);
upMove(obj);
@@ -90,7 +109,7 @@ function downMove(obj){
}
// 左
function leftMove(obj){
- var leftTimer = setInterval(()=>{
+ leftTimer = setInterval(()=>{
if(obj.offsetLeft > 1500){
clearInterval(leftTimer);
rightMove(obj);
@@ -101,7 +120,7 @@ function leftMove(obj){
}
// 左
function rightMove(obj){
- var rightTimer = setInterval(()=>{
+ rightTimer = setInterval(()=>{
if(obj.offsetLeft < 150){
clearInterval(rightTimer);
leftMove(obj);
@@ -121,6 +140,11 @@ function sayIng(index){
closeSay(index);
},6000)
}
+// 退出广场
+function exitEv(id){
+ $(`${id}`).remove();
+}
+// 进入广场
function peopleObj(name,say,action,move){
// 开始说话
sayIng(peopleId);
@@ -142,7 +166,7 @@ function peopleObj(name,say,action,move){
$.each(yspData, function (commentIndex, comment) {
yspHtml += `