diff --git a/src/lib/components/lyrics/lyricLine.svelte b/src/lib/components/lyrics/lyricLine.svelte
index dedc193..62d1296 100644
--- a/src/lib/components/lyrics/lyricLine.svelte
+++ b/src/lib/components/lyrics/lyricLine.svelte
@@ -5,7 +5,7 @@
import type { Spring } from '$lib/graphics/spring/spring';
const viewportWidth = document.documentElement.clientWidth;
- const scaleCurrentLine = viewportWidth > 640 ? 1.02 : 1.045 ;
+ const scaleCurrentLine = viewportWidth > 640 ? 1.02 : 1.045;
export let line: ScriptItem;
export let index: number;
@@ -112,8 +112,8 @@
lastPosY = pos.y;
positionX = pos.x;
positionY = pos.y;
- springX = createSpring(pos.x, pos.x, 0.126, 0.8);
- springY = createSpring(pos.y, pos.y, 0.126, 0.8);
+ springX = createSpring(pos.x, pos.x, 0.1, 0.67);
+ springY = createSpring(pos.y, pos.y, 0.1, 0.67);
};
export const stop = () => {
@@ -127,30 +127,35 @@
{
- clickMask.style.backgroundColor = "rgba(255,255,255,.3)";
+ clickMask.style.backgroundColor = 'rgba(255,255,255,.3)';
}}
on:touchend={() => {
- clickMask.style.backgroundColor = "transparent";
+ clickMask.style.backgroundColor = 'transparent';
}}
on:click={() => {
lyricClick(index);
}}
>
-
-
+
{#if debugMode}
{index}: duration: {(line.end - line.start).toFixed(3)}, {line.start.toFixed(3)}~{line.end.toFixed(3)}
{/if}
-
+
{line.text}
{#if line.translation}
@@ -160,3 +165,13 @@
{/if}
+
+
diff --git a/src/lib/components/lyrics/newLyrics.svelte b/src/lib/components/lyrics/newLyrics.svelte
index 086fa44..eb69787 100644
--- a/src/lib/components/lyrics/newLyrics.svelte
+++ b/src/lib/components/lyrics/newLyrics.svelte
@@ -8,7 +8,7 @@
// constants
const viewportHeight = document.documentElement.clientHeight;
const viewportWidth = document.documentElement.clientWidth;
- const marginY = viewportWidth > 640 ? 36 : 0 ;
+ const marginY = viewportWidth > 640 ? 12 : 0 ;
const blurRatio = viewportWidth > 640 ? 1 : 1.4;
const currentLyrictTop = viewportWidth > 640 ? viewportHeight * 0.12 : viewportHeight * 0.05;
const deceleration = 0.95; // Velocity decay factor for inertia
@@ -57,7 +57,7 @@
}
function initLyricTopList() {
- let cumulativeHeight = 0;
+ let cumulativeHeight = currentLyrictTop;
for (let i = 0; i < lyricLines.length; i++) {
const c = lyricComponents[i];
lyricElements.push(c.getRef());
@@ -80,7 +80,7 @@
if (i <= currentLyricIndex) {
delay = 0;
} else {
- delay = 0.013 + Math.min(Math.min(currentLyricDuration, 0.1), 0.075 * (i - currentLyricIndex));
+ delay = Math.min(Math.min(currentLyricDuration, 0.6), 0.064 * (i - currentLyricIndex));
}
const offset = Math.abs(i - currentLyricIndex);
let blurRadius = Math.min(offset * blurRatio, 16);