From b92e61db3ff0a4fef23a84fdcd1b04e902680c11 Mon Sep 17 00:00:00 2001
From: Nyutanislavsky <nyutanislavsky@qq.com>
Date: Sat, 26 Oct 2024 01:05:17 +0900
Subject: [PATCH] Fix (#404)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. processPrompt恢复dest的getPlayerStr
2. 武将一览中隐藏隐藏技能
---
 Fk/LobbyElement/FilterRoom.qml | 2 +-
 Fk/Pages/GeneralsOverview.qml  | 8 +++++---
 Fk/util.js                     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Fk/LobbyElement/FilterRoom.qml b/Fk/LobbyElement/FilterRoom.qml
index f310375f..b390fcb6 100644
--- a/Fk/LobbyElement/FilterRoom.qml
+++ b/Fk/LobbyElement/FilterRoom.qml
@@ -186,7 +186,7 @@ Flickable {
       }
 
       Button {
-        text: luatr("Filter")
+        text: luatr("OK")
         // width: 200
         // enabled: !opTimer.running
         onClicked: {
diff --git a/Fk/Pages/GeneralsOverview.qml b/Fk/Pages/GeneralsOverview.qml
index 1d47987e..33c899e8 100644
--- a/Fk/Pages/GeneralsOverview.qml
+++ b/Fk/Pages/GeneralsOverview.qml
@@ -519,10 +519,12 @@ Item {
       }
 
       data.skill.forEach(t => {
-        generalText.append((t.is_related_skill ? "<font color=\"purple\"><b>" : "<b>") + luatr(t.name) +
-          "</b>: " + t.description + (t.is_related_skill ? "</font>" : ""));
+        if (!t.name.startsWith('#')) {
+          generalText.append((t.is_related_skill ? "<font color=\"purple\"><b>" : "<b>") + luatr(t.name) +
+            "</b>: " + t.description + (t.is_related_skill ? "</font>" : ""));
 
-        addSkillAudio(t.name);
+          addSkillAudio(t.name);
+        }
       });
       findDeathAudio(general);
 
diff --git a/Fk/util.js b/Fk/util.js
index 730c7452..2c8c49d3 100644
--- a/Fk/util.js
+++ b/Fk/util.js
@@ -34,7 +34,7 @@ function processPrompt(prompt) {
   if (raw.match("%src"))
     raw = raw.replace(/%src/g, getPlayerStr(src));
   if (raw.match("%dest"))
-    raw = raw.replace(/%dest/g, luatr(getPhoto(dest).general));
+    raw = raw.replace(/%dest/g, getPlayerStr(dest));
 
   if (data.length > 3) {
     for (let i = 4; i < data.length; i++) {