ドロンで連打や風船が表示されるバグの修正

This commit is contained in:
yuuki
2024-12-09 12:55:23 +09:00
parent 85553da9e3
commit 43185bab5f

View File

@@ -1631,6 +1631,8 @@
var drumroll = 0 var drumroll = 0
var endX = 0 var endX = 0
const doron = localStorage.getItem("doron") ?? "false";
if(!circlePos){ if(!circlePos){
circlePos = { circlePos = {
x: this.slotPos.x + this.msToPos(circleMs - ms + this.controller.videoLatency, speed), x: this.slotPos.x + this.msToPos(circleMs - ms + this.controller.videoLatency, speed),
@@ -1676,12 +1678,14 @@
}else if(ms > endTime + this.controller.audioLatency){ }else if(ms > endTime + this.controller.audioLatency){
circlePos.x = this.slotPos.x + this.msToPos(endTime - ms + this.controller.audioLatency, speed) circlePos.x = this.slotPos.x + this.msToPos(endTime - ms + this.controller.audioLatency, speed)
} }
ctx.drawImage(assets.image["balloon"], if (doron !== "true") {
circlePos.x + size - 4, ctx.drawImage(assets.image["balloon"],
circlePos.y - h / 2 + 2, circlePos.x + size - 4,
h / 61 * 115, circlePos.y - h / 2 + 2,
h h / 61 * 115,
) h
)
}
} }
}else if(type === "drumroll" || type === "daiDrumroll"){ }else if(type === "drumroll" || type === "daiDrumroll"){
fill = "#f3b500" fill = "#f3b500"
@@ -1695,19 +1699,19 @@
endX = this.msToPos(endTime - circleMs, speed) endX = this.msToPos(endTime - circleMs, speed)
drumroll = endX > 50 ? 2 : 1 drumroll = endX > 50 ? 2 : 1
ctx.fillStyle = fill if (doron !== "true") {
ctx.strokeStyle = "#000" ctx.fillStyle = fill
ctx.lineWidth = 3 ctx.strokeStyle = "#000"
ctx.beginPath() ctx.lineWidth = 3
ctx.moveTo(circlePos.x, circlePos.y - size + 1.5) ctx.beginPath()
ctx.arc(circlePos.x + endX, circlePos.y, size - 1.5, Math.PI / -2, Math.PI / 2) ctx.moveTo(circlePos.x, circlePos.y - size + 1.5)
ctx.lineTo(circlePos.x, circlePos.y + size - 1.5) ctx.arc(circlePos.x + endX, circlePos.y, size - 1.5, Math.PI / -2, Math.PI / 2)
ctx.fill() ctx.lineTo(circlePos.x, circlePos.y + size - 1.5)
ctx.stroke() ctx.fill()
ctx.stroke()
}
} }
const doron = localStorage.getItem("doron") ?? "false";
if((!fade || fade < 1) && doron !== "true"){ if((!fade || fade < 1) && doron !== "true"){
// Main circle // Main circle
ctx.fillStyle = fill ctx.fillStyle = fill