chen
/
squareDancing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: chen:41a44859b9fcbc567c4e2c148584eb120ba9900e
Branches Tags
chen:master
..
compare: chen:c5fcb3d64edf80504ff6eccb40845e6e67a9b71e
Branches Tags
chen:master

No commits in common. "41a44859b9fcbc567c4e2c148584eb120ba9900e" and "c5fcb3d64edf80504ff6eccb40845e6e67a9b71e" have entirely different histories.
41a44859b9 ... c5fcb3d64e

1 changed files with 0 additions and 17 deletions
Show Stats Expand all files Collapse all files

17
js/handle.js
View File

@ -162,10 +162,6 @@ function receiveMessage(event)
leaderInfo = highList[0] leaderInfo = highList[0]
} }
// leaderInfo = '内有猛犬小心' // leaderInfo = '内有猛犬小心'
<<<<<<< HEAD
leaderInfo = '饺子吃肉肉'
=======
>>>>>>> c5fcb3d64edf80504ff6eccb40845e6e67a9b71e
// uid是否存在 不存在则存入uidObj // uid是否存在 不存在则存入uidObj
let isNew = 0 let isNew = 0
@ -315,19 +311,6 @@ function receiveMessage(event)
if(dancer(leader.text)){ if(dancer(leader.text)){
allDancing(leader.event); allDancing(leader.event);
} }
<<<<<<< HEAD
// 领舞喊荧光棒事件
// if(getLeaderFluoEvent(leader.text)!=''){
// if(firTimes==0){//防多次说话
// firTimes++;
// console.log(getLeaderFluoEvent(leader.text));
// setTimeout(()=>{
// firTimes = 0;
// },5000)
// }
// }
=======
>>>>>>> c5fcb3d64edf80504ff6eccb40845e6e67a9b71e
} }
// -------------------- 每条弹幕处理 end ----------------------- // -------------------- 每条弹幕处理 end -----------------------
} }