Compare commits

...

2 Commits

Author SHA1 Message Date
chen 33f7cb39d1 Merge branch 'master' of http://git.scdxtc.com/chen/squareDancing 2021-11-23 15:09:00 +08:00
chen f735950295 老人说话 2021-11-23 15:08:37 +08:00
1 changed files with 8 additions and 10 deletions

View File

@ -163,7 +163,8 @@ function receiveMessage(event)
// TODO 测试后 删除领舞随机
let leaderRandomEvent = getEvent(getFirstEventKeyword(data.danmaku+randomEvent))
let leader = {
uid: 0, uname: leaderInfo, text: getEvent(getFirstEventKeyword(data.danmaku+randomEvent)), event: leaderRandomEvent
// uid: 0, uname: leaderInfo, text: getEvent(getFirstEventKeyword(data.danmaku+randomEvent)), event: leaderRandomEvent
uid: 0, uname: leaderInfo, text: '', event: ''
}
if (isLeader) {
leader.uid = dm.uid
@ -179,15 +180,12 @@ function receiveMessage(event)
if(dm.is_new==1){
peopleObj(dm.uname,dm.uid,dm.text,actionArr[actionIndex]);
} else {
var userId = $('.dance-people').attr('id');
if(dm.uid==userId){
$(`#${userId} .speak`).html(dm.text);
$(`#${userId} .speak`).removeClass("dn");
setTimeout(()=>{
$(`#${userId} .speak`).addClass("dn");
},3000)
peopleAction(`${userId}`,dm.event);
}
$(`#${dm.uid} .speak`).html(dm.text);
$(`#${dm.uid} .speak`).removeClass("dn");
setTimeout(()=>{
$(`#${dm.uid} .speak`).addClass("dn");
},3000)
peopleAction(`${dm.uid}`,dm.event);
}
num++;