From 3aa28f6a9ce86139fb64829f1147f140f5957750 Mon Sep 17 00:00:00 2001
From: NanoRocky <3525987739@qq.com>
Date: Sat, 30 Nov 2024 12:17:57 +0800
Subject: [PATCH] =?UTF-8?q?Footer=20=E9=95=BF=E9=9F=B3=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E9=80=90=E5=AD=97=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=EF=BC=8C=E8=BF=9B=E8=A1=8C=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Footer.vue | 120 ++++++++++++++++++++++++++++++--------
 src/components/Player.vue |   3 +-
 src/main.js               |   1 +
 3 files changed, 99 insertions(+), 25 deletions(-)

diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index f3cd4fd..8899d5c 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -40,19 +40,30 @@
           <div class="lrc-all"
             :key="store.playerLrc.length != 0 ? `lrc-line-${store.playerLrc[0][2]}` : `lrc-line-null`">
             <music-one theme="filled" size="18" fill="#efefef" />
+            <!-- &nbsp; -->
+            <!-- <Icon size="20" style="transform: rotate(-18deg);" class="paws-1">
+              <paw />
+            </Icon> -->
             <span class="yrc-box">
               <span class="yrc-2 lrc-text text-hidden" id="yrc-2-wrap">
                 <span v-for="i in store.playerLrc" :key="`lrc-over-char-${i[2]}-${i[3]}`" v-html="i[4]">
                 </span>
               </span>
               <span class="yrc-1 lrc-text text-hidden" id="yrc-1-wrap">
-                <span v-for="i in store.playerLrc" :key="`lrc-char-${i[2]}-${i[3]}`"
-                  :style="`opacity: ${i[1] ? '1' : '0.6'}`"
-                  :class="`yrc-char ${i[0] ? 'fade-in' : 'fade-in-start'} ${i[0] > 1.5 ? 'long-tone' : 'fade-in-start'}`"
-                  :id="`lrc-char-${i[2]}-${i[3]}`" v-html="i[4]">
+                <span v-for="i in store.playerLrc" :key="`lrc-char-${i[2]}-${i[3]}`" :class="[
+                  'yrc-char',
+                  i[0] && Number(i[6]) > 0 ? 'fade-in' : 'fade-in-start',
+                  i[0] && Number(i[5]) > 1019 && Number(i[6]) > 0 ? 'long-tone' : 'fade-in-start',
+                  i[0] && Number(i[6]) <= 0 ? 'fade-out' : '',
+                  i[1] ? 'yrc-style-s2' : 'yrc-style-s1'
+                ]" :id="`lrc-char-${i[2]}-${i[3]}`" v-html="i[4]">
                 </span>
               </span>
             </span>
+            <!-- <Icon size="20" style="transform: rotate(18deg);" class="paws-2">
+              <paw />
+            </Icon> -->
+            <!-- &nbsp; -->
             <music-one theme="filled" size="18" fill="#efefef" />
           </div>
         </Transition>
@@ -60,7 +71,15 @@
           <!-- 逐行模块 -->
           <div class="lrc-all" :key="store.getPlayerLrc">
             <music-one theme="filled" size="18" fill="#efefef" />
+            <!-- &nbsp; -->
+            <!-- <Icon size="20" style="transform: rotate(-18deg);" class="paws-3">
+              <paw />
+            </Icon> -->
             <span class="lrc-text text-hidden" v-html="store.getPlayerLrc[0][4]" :class="`lrc-char`" />
+            <!-- <Icon size="20" style="transform: rotate(18deg);" class="paws-4">
+              <paw />
+            </Icon> -->
+            <!-- &nbsp; -->
             <music-one theme="filled" size="18" fill="#efefef" />
           </div>
         </Transition>
@@ -71,6 +90,8 @@
 
 <script setup>
 import { MusicOne } from "@icon-park/vue-next";
+// import { Icon } from "@vicons/utils";
+// import { Paw } from "@vicons/ionicons5";
 import { mainStore } from "@/store";
 import config from "@/../package.json";
 
@@ -101,10 +122,10 @@ const siteUrl = computed(() => {
 // 逐字模块1
 .yrc-char {
   display: inline-block;
-  opacity: 0.3;
+  opacity: 0.6;
   transform: translateY(1px);
-  background-clip: text;
   -webkit-background-clip: text;
+  background-clip: text;
   font-family: MiSans-Regular;
   transition:
     opacity 0.3s linear,
@@ -112,8 +133,8 @@ const siteUrl = computed(() => {
     transform 0.3s linear;
 
   &.fade-in-start {
-    text-shadow: 0 0 2px rgba(255, 255, 255, 0.8);
-    opacity: 0.3; // 初始显示的透明度
+    text-shadow: 0px 0px 2px rgba(255, 240, 245, 1);
+    opacity: 0.6;
     transform: translateY(1px);
     transition:
       color 0.5s linear,
@@ -131,13 +152,51 @@ const siteUrl = computed(() => {
       transform 0.3s linear;
   }
 
+  &.fade-out {
+    opacity: 1;
+    transform: translateY(-1px);
+    text-shadow: 0px 0px 6px rgba(255, 240, 245, 1),
+      0px 0px 2px rgba(176, 224, 230, 1),
+      0px 0px 2px rgba(230, 230, 250, 1);
+    transition:
+      color 0.5s linear,
+      opacity 0.3s linear,
+      transform 0.3s linear;
+  }
+
   &.fade-enter-active {
     animation: float-up 0.3s linear forwards;
   }
 
   &.long-tone {
-    text-shadow: 0 0 10px rgba(255, 255, 255, 0.9);
-    animation: pulse 1.5s infinite alternate;
+    opacity: 1;
+    transform: translateY(-1px);
+    animation: pulse 1s ease-in-out forwards;
+    transition:
+      color 0.5s linear,
+      opacity 0.3s linear,
+      transform 0.3s linear;
+  }
+
+  &.yrc-style-s1 {
+    opacity: 0.6;
+    color: rgba(220, 220, 220, 1);
+    transition:
+      color 0.5s linear,
+      opacity 0.3s linear,
+      transform 0.3s linear;
+  }
+
+  &.yrc-style-s2 {
+    opacity: 1;
+    color: rgba(255, 240, 245, 1);
+    text-shadow: 0px 0px 6px rgba(255, 240, 245, 1),
+      0px 0px 2px rgba(176, 224, 230, 1),
+      0px 0px 2px rgba(230, 230, 250, 1);
+    transition:
+      color 0.5s linear,
+      opacity 0.3s linear,
+      transform 0.3s linear;
   }
 }
 
@@ -153,29 +212,37 @@ const siteUrl = computed(() => {
 
 @keyframes colorFade {
   from {
-    color: #dfd9d9;
+    color: rgba(220, 220, 220, 1);
     opacity: 0.6;
-    text-shadow: 0 0 3px rgba(255, 255, 255, 0.8);
+    text-shadow: 0px 0px 3px rgba(255, 240, 245, 1),
+      0px 0px 0px rgba(176, 224, 230, 1),
+      0px 0px 0px rgba(230, 230, 250, 1);
   }
 
   to {
-    color: rgba(255, 255, 255, 0.8);
+    color: rgba(255, 240, 245, 1);
     opacity: 1;
-    text-shadow: 0 0 6px rgba(255, 255, 255, 0.8);
+    text-shadow: 0px 0px 6px rgba(255, 240, 245, 1),
+      0px 0px 2px rgba(176, 224, 230, 1),
+      0px 0px 2px rgba(230, 230, 250, 1);
   }
 }
 
 @keyframes pulse {
   from {
-    text-shadow: 0 0 10px rgba(255, 255, 255, 0.8),
-      0 0 20px rgba(255, 255, 255, 0.6),
-      0 0 30px rgba(255, 255, 255, 0.4);
+    color: rgba(220, 220, 220, 1);
+    opacity: 0.6;
+    text-shadow: 0px 0px 3px rgba(255, 240, 245, 1),
+      0px 0px 0px rgba(255, 182, 193, 1),
+      0px 0px 0px rgba(255, 192, 203, 1);
   }
 
   to {
-    text-shadow: 0 0 15px rgba(255, 255, 255, 1),
-      0 0 25px rgba(255, 255, 255, 0.8),
-      0 0 35px rgba(255, 255, 255, 0.6);
+    color: rgba(255, 255, 255, 0.8);
+    opacity: 1;
+    text-shadow: 3px 3px 7px rgba(255, 240, 245, 1),
+      0px 0px 12px rgba(255, 182, 193, 1),
+      0px 0px 12px rgba(255, 192, 203, 1);
   }
 }
 
@@ -191,8 +258,10 @@ const siteUrl = computed(() => {
   display: inline-block;
   position: absolute;
   width: auto;
-  opacity: 0.5;
-  text-shadow: 0 0 4px rgba(255, 255, 255, 0.8);
+  opacity: 0.6;
+  text-shadow: 0 0 6px rgba(255, 240, 245, 1),
+    0px 0px 2px rgba(176, 224, 230, 1),
+    0px 0px 2px rgba(230, 230, 250, 1);
   font-family: MiSans-Regular;
   overflow: hidden;
   white-space: nowrap;
@@ -207,9 +276,11 @@ const siteUrl = computed(() => {
 .lrc-char {
   display: inline;
   opacity: 1;
-  background-clip: text;
   -webkit-background-clip: text;
-  text-shadow: 0 0 4px rgba(255, 255, 255, 0.8);
+  background-clip: text;
+  text-shadow: 0 0 6px rgba(255, 255, 255, 0.8),
+    0 0 2px rgba(255, 165, 0, 1),
+    0 0 2px rgba(255, 179, 71, 1);
   font-family: MiSans-Regular;
   transition:
     opacity 0.3s linear,
@@ -218,6 +289,7 @@ const siteUrl = computed(() => {
 
 // End
 
+
 #footer {
   width: 100%;
   position: absolute;
diff --git a/src/components/Player.vue b/src/components/Player.vue
index c67f383..f5a887e 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -304,7 +304,8 @@ function showYrc() {
           const [[start, duration], word, line, row] = it;
           const isCurrent = now >= start && now <= start + duration;
           const isSungLyrics = start + duration < now;
-          return [isCurrent, isSungLyrics, line, row, word, "auto"];
+          const lessdur = start + duration - now;
+          return [isCurrent, isSungLyrics, line, row, word, duration, lessdur, "auto"];
         })
         : [[true, 1, 0, 0, `${store.playerTitle} - ${store.playerArtist}`]];
     if (store.playerLrc.toString() != yrcLyric.toString()) {
diff --git a/src/main.js b/src/main.js
index b031fa6..0178282 100644
--- a/src/main.js
+++ b/src/main.js
@@ -46,6 +46,7 @@ window.addEventListener("beforeunload", () => {
 
 app.use(pinia);
 app.mount("#app");
+const store = mainStore();
 
 // PWA
 navigator.serviceWorker.addEventListener("controllerchange", async () => {