Merge branch 'cassidy'

This commit is contained in:
SillyStar-Github 2025-10-02 17:06:34 -04:00
commit d2a1dedd99
2 changed files with 15 additions and 14 deletions

View file

@ -154,24 +154,25 @@ namespace PvZ_Fusion_Translator__BepInEx_
} }
#endif #endif
[HarmonyPatch(typeof(UnityEngine.AudioSource), "Play", [])] [HarmonyPatch(typeof(AudioSource), "Play", [])]
public class AudioSource_Patch public class AudioSource_Patch
{ {
public static void Prefix(UnityEngine.AudioSource __instance) public static void Prefix(AudioSource __instance)
{ {
if(Utils.customAudio) if (Utils.customAudio)
{ {
if (__instance.clip == null) if (__instance.clip == null)
return; return;
string audioClipName = __instance.clip.name; string audioClipName = overrideEnabled ? "REPLACE_ALL" : __instance.clip.name;
if (AudioStore.AudioClips.TryGetValue(audioClipName, out AudioClip replaceClip)) if (AudioClips.TryGetValue(audioClipName, out AudioClip replaceClip))
{ {
__instance.pitch = 1; __instance.pitch = 1;
__instance.clip = replaceClip;
} __instance.clip = replaceClip;
} }
}
} }
} }
} }

View file

@ -232,7 +232,7 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.ButtonObjects
} }
child.gameObject.SetActive(true); child.gameObject.SetActive(true);
System.Threading.Tasks.Task.Delay(1000).ContinueWith(_ => System.Threading.Tasks.Task.Delay(1000).ContinueWith(_ =>
{ {
if (button != null && child != null && child.gameObject.activeSelf) if (button != null && child != null && child.gameObject.activeSelf)
{ {