From 28c3096c6ad4124f59d2b253caddca37b07d228d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Sat, 22 Apr 2023 23:51:23 +0800 Subject: [PATCH] fix: if the status is very long ,dispell it. --- Resources/AnimationLockTime.json | 15 ++++++++++++--- RotationSolver.Basic/Helpers/StatusHelper.cs | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json index f1acbb2fe..6d6a357c3 100644 --- a/Resources/AnimationLockTime.json +++ b/Resources/AnimationLockTime.json @@ -34,9 +34,16 @@ "110": 0.6, "114": 0.6, "118": 0.6, + "120": 0.1, + "121": 0.6, + "124": 0.1, + "125": 0.1, "127": 0.1, + "131": 0.1, "132": 0.6, + "135": 0.1, "136": 0.6, + "137": 0.6, "141": 0.1, "149": 0.6, "152": 0.1, @@ -90,12 +97,13 @@ "3593": 0.6, "3595": 0.6, "3596": 0.1, - "3600": 0.6, - "3601": 0.1, + "3598": 0.1, + "3600": 0.1, + "3601": 0.6, "3603": 0.1, "3606": 0.6, "3608": 0.6, - "3610": 0.6, + "3610": 0.1, "3612": 0.6, "3614": 0.6, "3615": 0.1, @@ -231,6 +239,7 @@ "19004": 0.6, "19012": 0.6, "19297": 0.6, + "20667": 2.1, "24284": 0.1, "24285": 0.6, "24290": 0.6, diff --git a/RotationSolver.Basic/Helpers/StatusHelper.cs b/RotationSolver.Basic/Helpers/StatusHelper.cs index 0c97db0f8..2ea1c4088 100644 --- a/RotationSolver.Basic/Helpers/StatusHelper.cs +++ b/RotationSolver.Basic/Helpers/StatusHelper.cs @@ -189,6 +189,7 @@ public static bool IsDangerous(this Status status) { if (!status.CanDispel()) return false; if (status.StackCount > 2) return true; + if (status.RemainingTime > 8 + DataCenter.WeaponRemain) return true; return dangerousStatus.Any(id => (uint)id == status.StatusId); }