Merge branch 'cassidy'

This commit is contained in:
SillyStar-Github 2026-01-02 13:50:32 -05:00
commit a8c48c53b4
3 changed files with 29 additions and 24 deletions

View file

@ -10,9 +10,15 @@ namespace PvZ_Fusion_Translator.Patches.GameObjects
{ {
[HarmonyPatch(nameof(AbyssStoreMenu.Update))] [HarmonyPatch(nameof(AbyssStoreMenu.Update))]
[HarmonyPostfix] [HarmonyPostfix]
private static void UpdateInfo(AbyssStoreMenu __instance) private static void Update(AbyssStoreMenu __instance)
{ {
__instance.yourMoney.text = StringStore.TranslateText(__instance.yourMoney.text); TMP_FontAsset fontAsset = FontStore.LoadTMPFont(Utils.Language.ToString());
foreach(TextMeshProUGUI text in __instance.GetComponentsInChildren<TextMeshProUGUI>())
{
text.text = StringStore.TranslateText(text.text);
text.font = fontAsset;
}
} }
} }
} }

View file

@ -13,13 +13,11 @@ namespace PvZ_Fusion_Translator.Patches.GameObjects
{ {
[HarmonyPatch(nameof(TravelBuffMenu.RefeshOptions))] [HarmonyPatch(nameof(TravelBuffMenu.RefeshOptions))]
[HarmonyPostfix] [HarmonyPostfix]
private static void RefeshOptions(TravelBuffMenu __instance) public static void RefeshOptions(TravelBuffMenu __instance)
{ {
foreach(TravelBuffOptionButton button in __instance.options) foreach(TravelBuffOptionButton button in __instance.options)
{ {
List<string> buffSet = translatedTravelBuffs[buffLinks[button.buffType]]; TravelBuffOptionButton_Patch.TranslateOptionButton(button);
string buffText = (button.buffIndex < buffSet.Count && button.show != null) ? buffSet[button.buffIndex] : StringStore.TranslateText(button.introduce.text);
button.introduce.text = buffText;
} }
} }
} }

View file

@ -3,6 +3,7 @@ using Il2Cpp;
using Il2CppTMPro; using Il2CppTMPro;
using MelonLoader; using MelonLoader;
using PvZ_Fusion_Translator.AssetStore; using PvZ_Fusion_Translator.AssetStore;
using static MelonLoader.MelonLogger;
using static PvZ_Fusion_Translator.Patches.Managers.TravelMgr_Patch; using static PvZ_Fusion_Translator.Patches.Managers.TravelMgr_Patch;
namespace PvZ_Fusion_Translator.Patches.GameObjects namespace PvZ_Fusion_Translator.Patches.GameObjects
@ -10,31 +11,31 @@ namespace PvZ_Fusion_Translator.Patches.GameObjects
[HarmonyPatch(typeof(TravelBuffOptionButton))] [HarmonyPatch(typeof(TravelBuffOptionButton))]
public static class TravelBuffOptionButton_Patch public static class TravelBuffOptionButton_Patch
{ {
[HarmonyPatch(nameof(TravelBuffOptionButton.SetBuff))]
[HarmonyPostfix]
private static void SetBuff(TravelBuffOptionButton __instance)
{
List<string> buffSet = translatedTravelBuffs[buffLinks[__instance.buffType]];
string buffText = (__instance.buffIndex < buffSet.Count && __instance.show != null) ? buffSet[__instance.buffIndex] : StringStore.TranslateText(__instance.introduce.text);
__instance.introduce.text = buffText;
}
[HarmonyPatch(nameof(TravelBuffOptionButton.Awake))] [HarmonyPatch(nameof(TravelBuffOptionButton.Awake))]
[HarmonyPostfix] [HarmonyPostfix]
private static void Awake(TravelBuffOptionButton __instance) public static void Awake(TravelBuffOptionButton __instance)
{ {
List<string> buffSet = translatedTravelBuffs[buffLinks[__instance.buffType]]; TranslateOptionButton(__instance);
string buffText = (__instance.buffIndex < buffSet.Count && __instance.show != null) ? buffSet[__instance.buffIndex] : StringStore.TranslateText(__instance.introduce.text);
__instance.introduce.text = buffText;
} }
[HarmonyPatch(nameof(TravelBuffOptionButton.OnAnimOver))] [HarmonyPatch(nameof(TravelBuffOptionButton.OnAnimOver))]
[HarmonyPostfix] [HarmonyPostfix]
private static void OnAnimOver(TravelBuffOptionButton __instance) public static void OnAnimOver(TravelBuffOptionButton __instance)
{ {
List<string> buffSet = translatedTravelBuffs[buffLinks[__instance.buffType]]; TranslateOptionButton(__instance);
string buffText = (__instance.buffIndex < buffSet.Count && __instance.show != null) ? buffSet[__instance.buffIndex] : StringStore.TranslateText(__instance.introduce.text); }
__instance.introduce.text = buffText;
public static void TranslateOptionButton(TravelBuffOptionButton button)
{
List<string> buffSet = translatedTravelBuffs[buffLinks[button.buffType]];
string buff = (button.show != null && button.introduce.text != "词条已选完") ? buffSet[button.buffIndex] : StringStore.TranslateText("词条已选完");
button.introduce.text = buff;
} }
} }
//List<string> buffSet = translatedTravelBuffs[buffLinks[__instance.buffType]];
//string buff = (__instance.show != null) ? buffSet[__instance.buffIndex] : StringStore.TranslateText("无");
//__instance.introduce.text = buff;
} }