bump version

Reviewed-on: https://git.chinosk6.cn/chinosk/gkms-local/pulls/2

app/build.gradle

@@ -16,7 +16,7 @@ android {
         minSdk 29
         targetSdk 34
         versionCode 12
-        versionName "v3.0.4"
+        versionName "v3.2.0"
         buildConfigField "String", "VERSION_NAME", "\"${versionName}\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/libs/rm_duplicate.py

@@ -2,33 +2,33 @@ import os
 
 
 logs = """
-Duplicate class com.google.common.util.concurrent.ListenableFuture found in modules listenablefuture-1.0.jar -> listenablefuture-1.0 (com.google.guava:listenablefuture:1.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.CanIgnoreReturnValue found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.CheckReturnValue found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.CompatibleWith found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.CompileTimeConstant found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.DoNotCall found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.DoNotMock found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.ForOverride found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.FormatMethod found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.FormatString found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.Immutable found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.IncompatibleModifiers found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.InlineMe found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.InlineMeValidationDisabled found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.Keep found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.Modifier found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.MustBeClosed found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.NoAllocation found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.RequiredModifiers found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.RestrictedApi found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.SuppressPackageLocation found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.Var found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.concurrent.GuardedBy found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.concurrent.LazyInit found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.concurrent.LockMethod found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
-Duplicate class com.google.errorprone.annotations.concurrent.UnlockMethod found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch.jar -> lspatch (lspatch.jar)
+Duplicate class com.google.common.util.concurrent.ListenableFuture found in modules listenablefuture-1.0.jar -> listenablefuture-1.0 (com.google.guava:listenablefuture:1.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.CanIgnoreReturnValue found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.CheckReturnValue found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.CompatibleWith found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.CompileTimeConstant found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.DoNotCall found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.DoNotMock found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.ForOverride found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.FormatMethod found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.FormatString found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.Immutable found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.IncompatibleModifiers found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.InlineMe found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.InlineMeValidationDisabled found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.Keep found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.Modifier found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.MustBeClosed found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.NoAllocation found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.RequiredModifiers found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.RestrictedApi found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.SuppressPackageLocation found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.Var found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.concurrent.GuardedBy found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.concurrent.LazyInit found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.concurrent.LockMethod found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
+Duplicate class com.google.errorprone.annotations.concurrent.UnlockMethod found in modules error_prone_annotations-2.15.0.jar -> error_prone_annotations-2.15.0 (com.google.errorprone:error_prone_annotations:2.15.0) and lspatch_cleaned.jar -> lspatch_cleaned (lspatch_cleaned.jar)
 """
 
 for i in logs.split("\n"):

app/src/main/cpp/GakumasLocalify/Hook.cpp

@@ -6,6 +6,7 @@
 #include "Local.h"
 #include "MasterLocal.h"
 #include <unordered_set>
+#include <algorithm>
 #include "camera/camera.hpp"
 #include "config/Config.hpp"
 // #include <jni.h>
@@ -466,6 +467,8 @@ namespace GakumasLocal::HookMain {
                                                       "TMPro", "TMP_Text", "get_font");
         static auto set_font = Il2cppUtils::GetMethod("Unity.TextMeshPro.dll",
                                                       "TMPro", "TMP_Text", "set_font");
+        static auto get_name = Il2cppUtils::GetMethod("UnityEngine.CoreModule.dll",
+                                                      "UnityEngine", "Object", "get_name");
 //        static auto set_fontMaterial = Il2cppUtils::GetMethod("Unity.TextMeshPro.dll",
 //                                                      "TMPro", "TMP_Text", "set_fontMaterial");
 //        static auto ForceMeshUpdate = Il2cppUtils::GetMethod("Unity.TextMeshPro.dll",
@@ -479,21 +482,32 @@ namespace GakumasLocal::HookMain {
         static auto UpdateFontAssetData = Il2cppUtils::GetMethod("Unity.TextMeshPro.dll", "TMPro",
                                                                  "TMP_FontAsset", "UpdateFontAssetData");
 
+        auto fontAsset = get_font->Invoke<void*>(TMP_Textself);
+        if (!fontAsset) {
+            return;
+        }
+
+        // 检查字体名称，跳过 CampusAlphanumeric 系列字体
+        auto fontAssetName = get_name->Invoke<Il2cppString*>(fontAsset);
+        if (fontAssetName) {
+            std::string fontName = fontAssetName->ToString();
+            std::transform(fontName.begin(), fontName.end(), fontName.begin(), 
+                [](unsigned char c) { return std::tolower(c); });
+            if (fontName.find("campusalphanumeric") != std::string::npos) {
+                return;  // 保持原版数字字体
+            }
+        }
+
         auto newFont = GetReplaceFont();
         if (!newFont) return;
 
-        auto fontAsset = get_font->Invoke<void*>(TMP_Textself);
-        if (fontAsset) {
         set_sourceFontFile->Invoke<void>(fontAsset, newFont);
         if (!updatedFontPtrs.contains(fontAsset)) {
             updatedFontPtrs.emplace(fontAsset);
             UpdateFontAssetData->Invoke<void>(fontAsset);
         }
         if (updatedFontPtrs.size() > 200) updatedFontPtrs.clear();
-        }
-        else {
-			Log::Error("UpdateFont: fontAsset is null.");
-        }
+        
         set_font->Invoke<void>(TMP_Textself, fontAsset);
 
 //        auto fontMaterial = get_material->Invoke<void*>(fontAsset);
@@ -526,6 +540,46 @@ namespace GakumasLocal::HookMain {
         UpdateFont(self);
     }
 
+    DEFINE_HOOK(void, TMP_Text_set_text, (void* self, Il2cppString* value, void* mtd)) {
+        if (!value) {
+            return TMP_Text_set_text_Orig(self, value, mtd);
+        }
+        const std::string origText = value->ToString();
+        std::string transText;
+        if (Local::GetGenericText(origText, &transText)) {
+            const auto newText = UnityResolve::UnityType::String::New(transText);
+            UpdateFont(self);
+            return TMP_Text_set_text_Orig(self, newText, mtd);
+        }
+        if (Config::textTest) {
+            TMP_Text_set_text_Orig(self, UnityResolve::UnityType::String::New("[TT]" + origText), mtd);
+        }
+        else {
+            TMP_Text_set_text_Orig(self, value, mtd);
+        }
+        UpdateFont(self);
+    }
+
+    DEFINE_HOOK(void, TMP_Text_SetText_1, (void* self, Il2cppString* sourceText, void* mtd)) {
+        if (!sourceText) {
+            return TMP_Text_SetText_1_Orig(self, sourceText, mtd);
+        }
+        const std::string origText = sourceText->ToString();
+        std::string transText;
+        if (Local::GetGenericText(origText, &transText)) {
+            const auto newText = UnityResolve::UnityType::String::New(transText);
+            UpdateFont(self);
+            return TMP_Text_SetText_1_Orig(self, newText, mtd);
+        }
+        if (Config::textTest) {
+            TMP_Text_SetText_1_Orig(self, UnityResolve::UnityType::String::New("[T1]" + origText), mtd);
+        }
+        else {
+            TMP_Text_SetText_1_Orig(self, sourceText, mtd);
+        }
+        UpdateFont(self);
+    }
+
     DEFINE_HOOK(void, TMP_Text_SetText_2, (void* self, Il2cppString* sourceText, bool syncTextInputBox, void* mtd)) {
 		if (!sourceText) {
 			return TMP_Text_SetText_2_Orig(self, sourceText, syncTextInputBox, mtd);
@@ -572,9 +626,64 @@ namespace GakumasLocal::HookMain {
         TextMeshProUGUI_Awake_Orig(self, method);
     }
 
-    // TODO 文本未hook完整
+    // Legacy UnityEngine.UI.Text hook（礼物/邮件等非TMP界面）
+    DEFINE_HOOK(void, UIText_set_text, (void* self, Il2cppString* value)) {
+        if (!value) {
+            return UIText_set_text_Orig(self, value);
+        }
+        const std::string origText = value->ToString();
+        std::string transText;
+        if (Local::GetGenericText(origText, &transText)) {
+            const auto newText = UnityResolve::UnityType::String::New(transText);
+            return UIText_set_text_Orig(self, newText);
+        }
+        if (Config::textTest) {
+            UIText_set_text_Orig(self, UnityResolve::UnityType::String::New("[UI]" + origText));
+        }
+        else {
+            UIText_set_text_Orig(self, value);
+        }
+    }
+
+    // TMP_Text.SetCharArray(char[], int, int) — 礼物/邮件描述文字通过此路径设置
+    DEFINE_HOOK(void, TMP_Text_SetCharArray, (void* self, void* charArray, int start, int count, void* mtd)) {
+        if (charArray && start >= 0 && count > 0) {
+            // IL2CPP char[] elements are uint16_t (UTF-16)
+            auto arr = reinterpret_cast<UnityResolve::UnityType::Array<uint16_t>*>(charArray);
+            // 边界检查：确保 start+count 不超出数组长度
+            if (static_cast<uintptr_t>(start + count) <= arr->max_length) {
+                auto rawData = arr->GetData();
+                if (rawData) {
+                    // rawData 是 uintptr_t（字节地址），每个 char16_t 占 2 字节
+                    // 必须用 start * sizeof(char16_t) 而非直接 + start（否则偏移量减半）
+                    const std::u16string u16(
+                        reinterpret_cast<const char16_t*>(rawData + static_cast<uintptr_t>(start) * sizeof(char16_t)),
+                        static_cast<size_t>(count));
+                    const std::string origText = Misc::ToUTF8(u16);
+                    std::string transText;
+                    if (Local::GetGenericText(origText, &transText)) {
+                        UpdateFont(self);
+                        TMP_Text_set_text_Orig(self, Il2cppString::New(transText), nullptr);
+                        return;
+                    }
+                    if (Config::textTest) {
+                        UpdateFont(self);
+                        TMP_Text_set_text_Orig(self, Il2cppString::New("[CA]" + origText), nullptr);
+                        return;
+                    }
+                }
+            }
+        }
+        TMP_Text_SetCharArray_Orig(self, charArray, start, count, mtd);
+    }
+
     DEFINE_HOOK(void, TextField_set_value, (void* self, Il2cppString* value)) {
-        Log::DebugFmt("TextField_set_value: %s", value->ToString().c_str());
+        if (value) {
+            std::string transText;
+            if (Local::GetGenericText(value->ToString(), &transText)) {
+                return TextField_set_value_Orig(self, UnityResolve::UnityType::String::New(transText));
+            }
+        }
         TextField_set_value_Orig(self, value);
     }
 
@@ -895,12 +1004,12 @@ namespace GakumasLocal::HookMain {
         return Produce_ViewPictureBookLiveAsync_Orig(retstr, musicId, characterId, ct, callOption, errorHandlerIl, requestIdForResponseCache, mtd);
     }
 #else
-    DEFINE_HOOK(void*, Produce_ViewPictureBookLiveAsync, (Il2cppString* musicId, Il2cppString* characterId,
-        void* ct, void* callOption, void* errorHandlerIl, Il2cppString* requestIdForResponseCache, void* mtd)) {
+    DEFINE_HOOK(void*, Produce_ViewPictureBookLiveAsync, (void* retstr, void* musicId, void* characterId,
+        void* ct, void* callOption, void* errorHandlerIl, void* requestIdForResponseCache, void* mtd, void* wenhao)) {
 
         // Log::DebugFmt("Produce_ViewPictureBookLiveAsync: %s - %s", musicId->ToString().c_str(), characterId->ToString().c_str());
         if (Config::unlockAllLive) return getCompletedUniTask();
-        return Produce_ViewPictureBookLiveAsync_Orig(musicId, characterId, ct, callOption, errorHandlerIl, requestIdForResponseCache, mtd);
+        return Produce_ViewPictureBookLiveAsync_Orig(retstr, musicId, characterId, ct, callOption, errorHandlerIl, requestIdForResponseCache, mtd, wenhao);
     }
 #endif // GKMS_WINDOWS
 
@@ -1597,6 +1706,11 @@ namespace GakumasLocal::HookMain {
         ADD_HOOK(TextMeshProUGUI_Awake, Il2cppUtils::GetMethodPointer("Unity.TextMeshPro.dll", "TMPro",
                                                                       "TextMeshProUGUI", "Awake"));
 
+        ADD_HOOK(TMP_Text_set_text, Il2cppUtils::GetMethodPointer("Unity.TextMeshPro.dll", "TMPro",
+                                                                  "TMP_Text", "set_text"));
+        ADD_HOOK(TMP_Text_SetText_1, Il2cppUtils::GetMethodPointer("Unity.TextMeshPro.dll", "TMPro",
+                                                                  "TMP_Text", "SetText",
+                                                                  {"System.String"}));
         ADD_HOOK(TMP_Text_PopulateTextBackingArray, Il2cppUtils::GetMethodPointer("Unity.TextMeshPro.dll", "TMPro",
                                                                   "TMP_Text", "PopulateTextBackingArray",
                                                                   {"System.String", "System.Int32", "System.Int32"}));
@@ -1606,6 +1720,21 @@ namespace GakumasLocal::HookMain {
 
         ADD_HOOK(TextField_set_value, Il2cppUtils::GetMethodPointer("UnityEngine.UIElementsModule.dll", "UnityEngine.UIElements",
                                                                   "TextField", "set_value"));
+
+        // Legacy UnityEngine.UI.Text hook
+        {
+            auto uiTextPtr = Il2cppUtils::GetMethodPointer("UnityEngine.UI.dll", "UnityEngine.UI",
+                                                           "Text", "set_text");
+            if (uiTextPtr) {
+                ADD_HOOK(UIText_set_text, uiTextPtr);
+            }
+            else {
+                Log::InfoFmt("UIText_set_text: method not found, legacy UI.Text hook skipped.");
+            }
+        }
+
+        ADD_HOOK(TMP_Text_SetCharArray, Il2cppUtils::GetMethodPointer("Unity.TextMeshPro.dll", "TMPro",
+            "TMP_Text", "SetCharArray", {"System.Char[]", "System.Int32", "System.Int32"}));
         /* SQL 查询相关函数，不好用
         // 下面是 byte[] u8 string 转 std::string 的例子
         auto query = reinterpret_cast<UnityResolve::UnityType::Array<UnityResolve::UnityType::Byte>*>(mtd);
@@ -1697,9 +1826,12 @@ namespace GakumasLocal::HookMain {
                  Il2cppUtils::GetMethodPointer("Assembly-CSharp.dll", "Campus.OutGame",
                                                "PictureBookWindowPresenter", "GetLiveMusics"));
 
+#ifdef GKMS_WINDOWS
+        // 跳过切歌Loading，安卓端会崩溃
         ADD_HOOK(Produce_ViewPictureBookLiveAsync,
             Il2cppUtils::GetMethodPointer("Assembly-CSharp.dll", "",
                 "Produce", "ViewPictureBookLiveAsync"));
+#endif
         ADD_HOOK(PictureBookLiveSelectScreenModel_ctor,
                  Il2cppUtils::GetMethodPointer("Assembly-CSharp.dll", "Campus.OutGame",
                                                "PictureBookLiveSelectScreenModel", ".ctor"));

app/src/main/cpp/GakumasLocalify/Local.cpp

@@ -39,6 +39,12 @@ namespace GakumasLocal::Local {
         return Plugin::GetInstance().GetHookInstaller()->localizationFilesDir;
     }
 
+    bool isAllSpace(const std::string& str) {
+        return std::all_of(str.begin(), str.end(), [](unsigned char c) {
+            return std::isspace(c);
+        });
+    }
+
     std::string trim(const std::string& str) {
         auto is_not_space = [](char ch) { return !std::isspace(ch); };
         auto start = std::ranges::find_if(str, is_not_space);
@@ -343,6 +349,7 @@ namespace GakumasLocal::Local {
         bool hasNotTrans = false;
         if (!waitingReplaceTexts.empty()) {
             for (const auto& i : waitingReplaceTexts) {
+                if (isAllSpace(i)) continue;
                 std::string searchResult = findInMapIgnoreSpace(i, genericSplitText);
                 if (!searchResult.empty()) {
                     ReplaceNumberComma(&searchResult);

app/src/main/res/values/strings.xml

@@ -48,7 +48,7 @@
     <string name="axisx_y">axisX.y</string>
     <string name="axisy_y">axisY.y</string>
     <string name="axisz_y">axisZ.y</string>
-    <string name="basic_settings">Basic Ssettings</string>
+    <string name="basic_settings">Basic Settings</string>
     <string name="graphic_settings">Graphic Settings</string>
     <string name="camera_settings">Camera Settings</string>
     <string name="test_mode_live">Test Mode - LIVE</string>