Compare commits

..

No commits in common. "fe4c972d3c58c43a3c21fbda24be03fd92c7ed0f" and "b00bf353b90d3288813b80179329b89862d2b371" have entirely different histories.

2 changed files with 11 additions and 10 deletions

View File

@ -152,8 +152,8 @@ function peopleObj(name,uid,say,action,active_time, is_admin, decoration){
}
// 添加翅膀
if (decoration.indexOf('people-block') != -1) {
decorationWing = 'people-block'
if (decoration.indexOf('people-wing') != -1) {
decorationWing = 'people-wing'
// console.log(decorationWing, '我的翅膀')
}
}
@ -171,7 +171,7 @@ function peopleObj(name,uid,say,action,active_time, is_admin, decoration){
<div class="stick stick-swing ${decorationStick} ${bigStick} ${comment.ying_guang}"></div>
<div class="people-name ">${comment.name}</div>
</div>
<div class="people-wing ${decorationWing}">&nbsp;</div>
<div class="people-wing ">&nbsp;</div>
</div>
</div>`
});//如果是舰长需要加上stick-swing-big-tow充值用户加上stick-christmas同时去掉stick-swing-big-tow

View File

@ -210,9 +210,8 @@ function delExpireDiv() {
}
let timestamp = parseInt(new Date().getTime()/1000)
let delTime = timestamp - speakExpireTime
let delList = $(".dance-people").filter(function() {
return $(this).attr("data-time") < delTime
return $(this).attr("data-time") < timestamp - speakExpireTime;
})
// console.log(delList.length, speakExpireTime+'秒未说话人数')
delList.remove();
@ -239,12 +238,15 @@ function receiveMessage(event)
// 送礼物列表
let giftList = dataList.gift
// console.log(giftList, '获取的礼物列表')
console.log(giftList, '获取的礼物列表')
if (giftList.length > 0) {
updateUserCell(giftList)
console.log(userCell, '用户电池记录')
}
// console.log(adminList, '舰长列表')
// console.log(highList, '高能榜列表')
if (data.length <= 0) {
return false
}
@ -301,7 +303,7 @@ function receiveMessage(event)
let decoration = []
let userCellNum = userCell[dm.uname]
userCell['yin5th'] = 99
// userCell['yin5th'] = 99
// userCell['未来狗头耀武扬威什么'] = 1
if (userCellNum != undefined) {
// 1个电池送圣诞帽
@ -353,8 +355,7 @@ function receiveMessage(event)
}
}
setTimeout(()=>{
//关闭当前说话
setTimeout(()=>{//关闭当前说话
$(`#${dm.uid} .speak`).addClass("dn");
},3000)
// 舞者喊舞---动作舞
@ -468,7 +469,7 @@ function receiveMessage(event)
// -------------------- 每条弹幕处理 end -----------------------
}
// 创建随机人物
// 创建随机任务
function createVirtual() {
for (let i = 0; i < virtualNum; i++) {
let eventName = eventTextList[Math.floor(Math.random()*(eventTextList.length-1))]