From 1278221599300f9588536bbb7312bb316beb348d Mon Sep 17 00:00:00 2001 From: Soar Qin Date: Fri, 15 Sep 2023 21:19:51 +0800 Subject: [PATCH] fix --- CheatEnabler/CheatEnabler.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/CheatEnabler/CheatEnabler.cs b/CheatEnabler/CheatEnabler.cs index 3dc54af..94ae354 100644 --- a/CheatEnabler/CheatEnabler.cs +++ b/CheatEnabler/CheatEnabler.cs @@ -178,7 +178,7 @@ public class CheatEnabler : BaseUnityPlugin rect.localScale = new Vector3(0.5f, 0.5f, 0.5f); rect.anchoredPosition3D = new Vector3(128f, -105f, 0f); b.onClick.RemoveAllListeners(); - btn.onClick += (_) => { ToggleConfigWindow(); }; + btn.onClick += _ => { ToggleConfigWindow(); }; btn.tips.tipTitle = "CheatEnabler Config"; I18N.OnInitialized += () => { btn.tips.tipTitle = "CheatEnabler Config".Translate(); }; btn.tips.tipText = null; @@ -218,16 +218,11 @@ public class CheatEnabler : BaseUnityPlugin new CodeMatch(OpCodes.Ldloc_2), new CodeMatch(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(Component), nameof(Component.gameObject))), new CodeMatch(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(GameObject), nameof(GameObject.activeSelf))) - ).InsertAndAdvance( - new CodeInstruction(OpCodes.Ldloc_2), - new CodeInstruction(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(Component), nameof(Component.transform))), - new CodeInstruction(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(Transform), nameof(Transform.parent))), - new CodeInstruction(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(Transform), nameof(Transform.parent))), - new CodeInstruction(OpCodes.Callvirt, AccessTools.Method(typeof(Transform), nameof(Transform.SetAsLastSibling))) - ).MatchForward(false, - new CodeMatch(OpCodes.Callvirt, AccessTools.Method(typeof(UIButtonTip), nameof(UIButtonTip.SetTip))) - ).Advance(1).Insert( - new CodeInstruction(OpCodes.Ldloc_2), + ); + var labels = matcher.Labels; + matcher.Labels = null; + matcher.Insert( + new CodeInstruction(OpCodes.Ldloc_2).WithLabels(labels), new CodeInstruction(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(Component), nameof(Component.transform))), new CodeInstruction(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(Transform), nameof(Transform.parent))), new CodeInstruction(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(Transform), nameof(Transform.parent))),