x15904151985/ArtPlayer
1
0 Fork 0
mirror of https://github.com/zhw2590582/ArtPlayer.git synced 2026-10-23 22:01:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Harvey Zack committed 2022-05-01 15:02:30 +08:00
1 parent 13e56aed01
commit bd9d0a436c
4 files changed
+29 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/uncompiled/artplayer-plugin-danmuku/index.js
+14 -15
View File
@@ -579,12 +579,12 @@ function getData(ins, clientLeft, clientWidth, item) {
distance
};
}
function getDanmuTop(ins, danmu) {
function getDanmuTop(ins, danmu1) {
const clientLeft = ins.getLeft(ins.$player);
const { clientWidth , clientHeight } = ins.$player;
const { antiOverlap } = ins.option;
const { marginBottom , marginTop } = ins;
const target = getData(ins, clientLeft, clientWidth, danmu);
const target = getData(ins, clientLeft, clientWidth, danmu1);
const danmus = ins.queue.filter((item)=>{
return item.$ref && item.$state === 'emit' && item.mode === target.mode && item.$ref.offsetTop <= clientHeight - marginBottom;
}).map((item)=>getData(ins, clientLeft, clientWidth, item)
@@ -629,21 +629,20 @@ function getDanmuTop(ins, danmu) {
item
]);
}
const test = topMap.map((list)=>{
return list.map((item)=>{
return target.speed * item.time;
});
});
console.log(test);
// topMap.sort((prev, next) => {
// const nextMinRight = Math.min(...next.map((item) => target.speed * item.time));
// const prevMinRight = Math.min(...prev.map((item) => target.speed * item.time));
// return prevMinRight - nextMinRight;
// });
// console.log(JSON.parse(JSON.stringify(topMap)));
if (antiOverlap) switch(target.mode){
case 0:
break;
{
const result = topMap.find((list)=>{
return list.every((danmu)=>{
if (clientWidth < danmu.distance) return false;
if (target.speed < danmu.speed) return true;
const overlapTime = danmu.right / (target.speed - danmu.speed);
if (overlapTime > danmu.time) return true;
return false;
});
});
return result && result[0] ? result[0].top : undefined;
}
case 1:
return undefined;
default: