歌词正常工作

Author: Coloryr

client

@@ -20,7 +20,7 @@ public void execute(Object sender, String name, String[] args) {
             AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.stopPlaying);
         }
         AllMusic.side.sendStop(name);
-        HudUtils.clearHud(name);
+        HudUtils.sendClearHud(name);
     }
 
     @Override

server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandStop.java

@@ -6,7 +6,6 @@
 import java.util.Map;
 
 public class LyricSave {
-    public int lastIndex = 0;
     protected boolean haveLyric;
     protected float kly = 0;
     protected LyricItemObj now;
@@ -51,29 +50,29 @@ public void kUpdate(long playNow) {
         if (now == null || now.lyric == null || now.lyric.isEmpty()
                 || ktvNow == null || ktvNow.items == null || ktvNow.items.isEmpty()) {
             kly = 0.0f;
+            return;
+        }
+
+        if (playNow < ktvNow.start) {
+            kly = 0.0f;
+            return;
+        }
+
+        if (playNow >= ktvNow.start + ktvNow.time) {
+            kly = 1.0f;
+            return;
         }
 
-        // 查找当前时间落在哪个 KTV 字的时间段内
         for (int i = 0; i < ktvNow.items.size(); i++) {
             KtvLyric.KtvItem item = ktvNow.items.get(i);
             if (playNow >= item.start && playNow < item.start + item.time) {
-                // 当前字内的进度
                 float progressInChar = (float) (playNow - item.start) / item.time;
-                // 整体进度 = (已完成的字 + 当前字的进度) / 总字数
                 kly = (i + progressInChar) / ktvNow.items.size();
-                lastIndex = i;  // 记录当前字索引，可选
+                return;
             }
         }
 
-        // 如果时间超过了最后一个字
-        if (playNow >= ktvNow.start + ktvNow.time) {
-            kly = 1.0f;
-            lastIndex = ktvNow.items.size();
-        }
-
-        // 还没到第一个字的时间
         kly = 0.0f;
-        lastIndex = 0;
     }
 
     private void ktvGetNext(long time) {
@@ -99,17 +98,13 @@ public boolean lyricGetNext(long playNow) {
                 now.tlyric = "";
             }
             kly = 0.0f;
-            lastIndex = 0;
-            ktvGetNext(playNow);
             return true;
         }
 
         return false;
     }
 
     public void updateKtv(long playNow) {
-        if (now != null) {
-            kUpdate(playNow);
-        }
+        ktvGetNext(playNow);
     }
 }

server/core/src/main/java/com/coloryr/allmusic/server/core/music/LyricSave.java

@@ -71,7 +71,7 @@ private static void clear() {
         PlayMusic.lyric = null;
         PlayMusic.nowPlayMusic = null;
         AllMusic.side.updateInfo();
-        HudUtils.clearHud();
+        HudUtils.sendClearHud();
         HudUtils.sendHudNowData();
         HudUtils.sendHudLyricData();
         HudUtils.sendHudListData();
@@ -99,6 +99,10 @@ private static void time1() {
                 if (res) {
                     HudUtils.sendHudLyricData();
                     AllMusic.side.updateLyric();
+                    if (AllMusic.getConfig().ktvMode) {
+                        PlayMusic.lyric.updateKtv(PlayMusic.musicNowTime);
+                        HudUtils.sendHudKtv();
+                    }
                 }
 
                 if (AllMusic.getConfig().ktvMode) {
@@ -206,6 +210,7 @@ private static void musicPlayTask() {
                     }
                     Thread.sleep(1000);
                 } else {
+                    HudUtils.sendClearHud();
                     HudUtils.sendHudNowData();
                     HudUtils.sendHudLyricData();
                     HudUtils.sendHudListData();

server/core/src/main/java/com/coloryr/allmusic/server/core/music/PlayRuntime.java

@@ -1,6 +1,5 @@
 package com.coloryr.allmusic.server.core.objs.config;
 
-import com.coloryr.allmusic.codec.HudPosObj;
 import com.coloryr.allmusic.server.core.AllMusic;
 
 import java.util.HashMap;

server/core/src/main/java/com/coloryr/allmusic/server/core/objs/config/ConfigObj.java

@@ -248,7 +248,7 @@ public static boolean setHudEnable(String player, HudType pos, String arg) {
     /**
      * 清空Hud数据
      */
-    public static void clearHud() {
+    public static void sendClearHud() {
         AllMusic.side.clearHud();
     }
 
@@ -257,7 +257,7 @@ public static void clearHud() {
      *
      * @param player 用户名
      */
-    public static void clearHud(String player) {
+    public static void sendClearHud(String player) {
         AllMusic.side.clearHud(player);
     }