From b1096a8ebbf2694f6a7a88a28d1711bfad6ea853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Sun, 30 Apr 2023 16:41:52 +0800 Subject: [PATCH] fix: fixed with ui. --- Resources/AnimationLockTime.json | 1 + .../Configuration/OtherConfiguration.cs | 35 ++----------------- RotationSolver.Basic/Data/ActionEffectSet.cs | 1 - .../UI/RotationConfigWindow_List.cs | 3 ++ 4 files changed, 7 insertions(+), 33 deletions(-) diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json index cfda07da4..42a801666 100644 --- a/Resources/AnimationLockTime.json +++ b/Resources/AnimationLockTime.json @@ -15,6 +15,7 @@ "153": 0.6, "154": 0.1, "158": 0.6, + "167": 0.6, "185": 0.1, "3549": 0.6, "3550": 0.6, diff --git a/RotationSolver.Basic/Configuration/OtherConfiguration.cs b/RotationSolver.Basic/Configuration/OtherConfiguration.cs index 8e31f4838..9b929ce7d 100644 --- a/RotationSolver.Basic/Configuration/OtherConfiguration.cs +++ b/RotationSolver.Basic/Configuration/OtherConfiguration.cs @@ -14,38 +14,9 @@ public class OtherConfiguration public static Dictionary NoHostileNames = new Dictionary(); - public static SortedSet DangerousStatus = new SortedSet() - { - (uint)StatusID.Doom, - (uint)StatusID.Amnesia, - (uint)StatusID.Stun, - (uint)StatusID.Stun2, - (uint)StatusID.Sleep, - (uint)StatusID.Sleep2, - (uint)StatusID.Sleep3, - (uint)StatusID.Pacification, - (uint)StatusID.Pacification2, - (uint)StatusID.Silence, - (uint)StatusID.Slow, - (uint)StatusID.Slow2, - (uint)StatusID.Slow3, - (uint)StatusID.Slow4, - (uint)StatusID.Slow5, - (uint)StatusID.Blind, - (uint)StatusID.Blind2, - (uint)StatusID.Blind3, - (uint)StatusID.Paralysis, - (uint)StatusID.Paralysis2, - (uint)StatusID.Nightmare, - (uint)StatusID.Necrosis, - }; - - public static SortedSet InvincibleStatus = new SortedSet() - { - 151, //StoneSkin - 198, //IceSpikesInvincible - 3012, //VortexBarrier - }; + public static SortedSet DangerousStatus = new SortedSet(); + + public static SortedSet InvincibleStatus = new SortedSet(); public static void Init() { diff --git a/RotationSolver.Basic/Data/ActionEffectSet.cs b/RotationSolver.Basic/Data/ActionEffectSet.cs index 1e14f0aa7..da982d195 100644 --- a/RotationSolver.Basic/Data/ActionEffectSet.cs +++ b/RotationSolver.Basic/Data/ActionEffectSet.cs @@ -45,7 +45,6 @@ public Dictionary GetSpecificTypeEffect(ActionEffectType type) public override string ToString() { var str = $"S:{Source?.Name}, T:{Target?.Name}, Lock:{AnimationLock}"; - str = $"Lock:{AnimationLock}"; str += $"\nType: {Type}, Name: {Action?.Name}({Action?.RowId})"; if (TargetEffects != null) { diff --git a/RotationSolver/UI/RotationConfigWindow_List.cs b/RotationSolver/UI/RotationConfigWindow_List.cs index 4b3163de4..dc729d258 100644 --- a/RotationSolver/UI/RotationConfigWindow_List.cs +++ b/RotationSolver/UI/RotationConfigWindow_List.cs @@ -246,6 +246,9 @@ private void DrawListTab() Util.OpenLink("https://archidog1998.github.io/RotationSolver/#/RotationDev/"); } + ImGui.SameLine(); + ImGuiHelper.Spacing(); + if (ImGuiHelper.IconButton(FontAwesomeIcon.Plus, "Add Rotation")) { Service.Config.OtherLibs = Service.Config.OtherLibs.Append(string.Empty).ToArray();