diff --git a/bilibiliLive/blivePlus.user.js b/bilibiliLive/blivePlus.user.js index 518470f..8b8efdc 100644 --- a/bilibiliLive/blivePlus.user.js +++ b/bilibiliLive/blivePlus.user.js @@ -2,7 +2,7 @@ // @name bilibili直播间工具 // @namespace indefined // @supportURL https://github.com/indefined/UserScripts/issues -// @version 0.5.46.3 +// @version 0.5.46.4 // @author indefined // @description 可配置 直播间切换勋章/头衔、礼物包裹替换为大图标、网页全屏自动隐藏礼物栏/全屏发送弹幕(仅限HTML5)、轮播显示链接(仅限HTML5) // @include /^https?:\/\/live\.bilibili\.com\/(blanc\/)?\d/ @@ -718,7 +718,7 @@ body.fullscreen-fix #live-player div~div#gift-control-vm, platform: 'android' }); }, - async listMedal(data){ + async listMedal(data, medalWall){ this.loadingDiv.style = ''; let hasMedal = false; if (data.code!=0||!data.data||!(data.data.fansMedalList instanceof Array)) { @@ -726,15 +726,14 @@ body.fullscreen-fix #live-player div~div#gift-control-vm, throw(`查询勋章失败 code:${data.code}
${data.message}`); } const medalList = data.data.fansMedalList; - if (this.room && this.room.UID && !this.medalWall) { + if (this.room && this.room.UID && !medalWall) { const wall = await helper.xhr('//api.live.bilibili.com/xlive/web-ucenter/user/MedalWall?target_id='+this.room.UID); if (wall.code ==0 && wall.data && (wall.data.list)) { - this.medalWall = wall.data.list + medalWall = wall.data.list } - else this.medalWall = 123; } - if (this.medalWall instanceof Array) { - for (let item of this.medalWall) { + if (medalWall instanceof Array) { + for (let item of medalWall) { let medal = medalList.find(i=>i.target_name == item.target_name); if (medal) medal.live_stream_status = item.live_status; } @@ -779,7 +778,7 @@ body.fullscreen-fix #live-player div~div#gift-control-vm, },this.dialogPanel); } else if (pages && pages.curPage < pages.totalpages) { - await helper.xhr(this.strings.medal.dataUrl + '?page=' + (+pages.curPage+1)).then(async data=>this.listMedal(data)); + await helper.xhr(this.strings.medal.dataUrl + '?page=' + (+pages.curPage+1)).then(async data=>this.listMedal(data, medalWall)); } }, async listTitle(data){