From 21b97b03d448a94fde087b91d9fd990d6d8874eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Wed, 18 Jan 2023 20:00:06 +0800 Subject: [PATCH] fix: fix some build bugs. --- RotationSolver/Rotations/Script/IScriptCombo.cs | 2 +- RotationSolver/Updaters/TargetUpdater_Hostile.cs | 6 +++--- .../Windows/ComboConfigWindow/ComboConfigWindow_Attack.cs | 8 +++----- .../Windows/ComboConfigWindow/ComboConfigWindow_Major.cs | 3 +-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/RotationSolver/Rotations/Script/IScriptCombo.cs b/RotationSolver/Rotations/Script/IScriptCombo.cs index f230352f9..8a54b2695 100644 --- a/RotationSolver/Rotations/Script/IScriptCombo.cs +++ b/RotationSolver/Rotations/Script/IScriptCombo.cs @@ -13,7 +13,7 @@ internal static class ScriptComboExtension { public static string GetFolder(this ComboSet set) { - return Path.Combine(Service.Configuration.ScriptComboFolder, $"{(uint)set.JobID}_{set.AuthorName}.json"); + return Path.Combine(typeof(ScriptComboExtension).Assembly.Location, $"{(uint)set.JobID}_{set.AuthorName}.json"); } public static string GetAuthor(this ComboSet set) diff --git a/RotationSolver/Updaters/TargetUpdater_Hostile.cs b/RotationSolver/Updaters/TargetUpdater_Hostile.cs index b6773c4c7..863941f0e 100644 --- a/RotationSolver/Updaters/TargetUpdater_Hostile.cs +++ b/RotationSolver/Updaters/TargetUpdater_Hostile.cs @@ -97,17 +97,17 @@ internal unsafe static void UpdateHostileTargets() switch (IconReplacer.RightNowTargetToHostileType) { - case 0: + case TargetHostileType.AllTargetsCanAttack: HostileTargets = AllTargets; break; default: - case 1: + case TargetHostileType.TargetsHaveTargetOrAllTargetsCanAttack: if (!HostileTargets.Any()) HostileTargets = AllTargets; break; - case 2: + case TargetHostileType.TargetsHaveTarget: break; } diff --git a/RotationSolver/Windows/ComboConfigWindow/ComboConfigWindow_Attack.cs b/RotationSolver/Windows/ComboConfigWindow/ComboConfigWindow_Attack.cs index bde746fa8..8bc013e60 100644 --- a/RotationSolver/Windows/ComboConfigWindow/ComboConfigWindow_Attack.cs +++ b/RotationSolver/Windows/ComboConfigWindow/ComboConfigWindow_Attack.cs @@ -76,7 +76,6 @@ private static void DrawRotations(IconReplacer.CustomRotationGroup[] rotations) } } - private static void DrawRotation(ICustomRotation rotation, bool canAddButton) { ImGui.Spacing(); @@ -86,7 +85,7 @@ private static void DrawRotation(ICustomRotation rotation, bool canAddButton) ImGui.Spacing(); - DrawConfig(rotation.Config); + DrawConfig(rotation.Config, canAddButton); } private static void DrawTargetHostileTYpe(ICustomRotation rotation) @@ -144,11 +143,11 @@ private static void DrawHealerSettings(ClassJobID job) DrawDragFloat(job, LocalizationManager.RightLang.Configwindow_Params_HealingOfTimeSubtractSingle, () => ConfigurationHelper.GetHealingOfTimeSubtractSingle(job), (value) => Service.Configuration.HealingOfTimeSubtractSingles[job] = value); - } - private static void DrawConfig(ActionConfiguration actions) + private static void DrawConfig(ActionConfiguration actions, bool canAddButton) { + var num = actions.GetHashCode(); foreach (var boolean in actions.bools) { bool val = boolean.value; @@ -238,5 +237,4 @@ private static void DrawDragFloat(ClassJobID job, string desc, Func getVa Service.Configuration.Save(); } } - } diff --git a/RotationSolver/Windows/ComboConfigWindow/ComboConfigWindow_Major.cs b/RotationSolver/Windows/ComboConfigWindow/ComboConfigWindow_Major.cs index 2e096ca62..ab13f8620 100644 --- a/RotationSolver/Windows/ComboConfigWindow/ComboConfigWindow_Major.cs +++ b/RotationSolver/Windows/ComboConfigWindow/ComboConfigWindow_Major.cs @@ -266,8 +266,7 @@ internal static void DrawTexture(T texture, Action otherThing, ClassJobID job Spacing(); ImGui.PushFont(UiBuilder.IconFont); - if (Directory.Exists(Service.Configuration.ScriptComboFolder) - && ImGui.Button($"{FontAwesomeIcon.Plus.ToIconString()}##{texture.GetHashCode() + 1}")) + if (ImGui.Button($"{FontAwesomeIcon.Plus.ToIconString()}##{texture.GetHashCode() + 1}")) { var newCom = IconReplacer.AddScripCombo(com.JobIDs[0]); if (newCom != null)