From da82cda9e518baf0db02ce56c61bdb18c665a38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Sat, 1 Jul 2023 19:35:08 +0800 Subject: [PATCH] fix: fix for moving check. --- RotationSolver.Basic/DataCenter.cs | 3 ++- RotationSolver.Basic/Helpers/TargetFilter.cs | 2 +- .../UI/RotationConfigWindow_Debug.cs | 19 ++++--------------- RotationSolver/Updaters/ActionUpdater.cs | 5 ++--- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs index a6c6095b4..ad0c82c7f 100644 --- a/RotationSolver.Basic/DataCenter.cs +++ b/RotationSolver.Basic/DataCenter.cs @@ -119,7 +119,8 @@ public static TargetingType TargetingType } public static bool IsMoving { get; internal set; } - public static float StopMovingRaw { get; internal set; } + + internal static float StopMovingRaw { get; set; } public static unsafe ushort FateId { diff --git a/RotationSolver.Basic/Helpers/TargetFilter.cs b/RotationSolver.Basic/Helpers/TargetFilter.cs index bacf0e115..37cee8a1f 100644 --- a/RotationSolver.Basic/Helpers/TargetFilter.cs +++ b/RotationSolver.Basic/Helpers/TargetFilter.cs @@ -334,7 +334,7 @@ private static BattleChara RandomObject(IEnumerable objs) /// /// public static IEnumerable GetObjectInRadius(this IEnumerable objects, float radius) where T : GameObject - => objects.Where(o => o.DistanceToPlayer() <= radius) + => objects.Where(o => o.DistanceToPlayer() <= radius); private static IEnumerable DefaultTargetingType(IEnumerable charas) => DataCenter.TargetingType switch diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs index b40a1f757..b45955975 100644 --- a/RotationSolver/UI/RotationConfigWindow_Debug.cs +++ b/RotationSolver/UI/RotationConfigWindow_Debug.cs @@ -48,6 +48,10 @@ private unsafe void DrawStatus() { ImGui.Text("Fate: " + DataCenter.FateId.ToString()); } + ImGui.Text("Moving: " + DataCenter.IsMoving.ToString()); + ImGui.Text("Stop Moving: " + DataCenter.StopMovingRaw.ToString()); + + ImGui.Text("TerritoryType: " + DataCenter.TerritoryContentType.ToString()); ImGui.Text("DPSTaken: " + DataCenter.DPSTaken.ToString()); ImGui.Text("TimeToNext: " + DataCenter.NextAbilityToNextGCD.ToString()); @@ -71,20 +75,6 @@ private unsafe void DrawStatus() } private unsafe void DrawParty() { - //var status = AgentDeepDungeonStatus.Instance(); - //if ((IntPtr)status != IntPtr.Zero) - //{ - // foreach (var item in status->Data->PomanderSpan) - // { - // ImGui.Text(item.Name.ToString() + " : " + item.ItemId.ToString()); - // } - - // foreach (var item in status->Data->MagiciteSpan) - // { - // ImGui.Text(item.Name.ToString() + " : " + item.ItemId.ToString()); - // } - //} - ImGui.Text("Party Burst Ratio: " + DataCenter.RatioOfMembersIn2minsBurst.ToString()); ImGui.Text("Party: " + DataCenter.PartyMembers.Count().ToString()); ImGui.Text("CanHealSingleAbility: " + DataCenter.CanHealSingleAbility.ToString()); @@ -92,7 +82,6 @@ private unsafe void DrawParty() ImGui.Text("CanHealAreaAbility: " + DataCenter.CanHealAreaAbility.ToString()); ImGui.Text("CanHealAreaSpell: " + DataCenter.CanHealAreaSpell.ToString()); ImGui.Text("CanHealAreaSpell: " + DataCenter.CanHealAreaSpell.ToString()); - ImGui.Text("PartyMembersAverHP: " + DataCenter.PartyMembersAverHP.ToString()); } diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs index 4abe1950a..cd192e0f5 100644 --- a/RotationSolver/Updaters/ActionUpdater.cs +++ b/RotationSolver/Updaters/ActionUpdater.cs @@ -100,6 +100,7 @@ internal unsafe static void UpdateActionInfo() UpdateWeaponTime(); UpdateCombatTime(); UpdateBluSlots(); + UpdateMoving(); UpdateMPTimer(); } private unsafe static void UpdateBluSlots() @@ -186,9 +187,7 @@ private static unsafe void UpdateWeaponTime() static uint _lastMP = 0; static DateTime _lastMPUpdate = DateTime.Now; - /// - /// 跳蓝经过时间 - /// + internal static float MPUpdateElapsed => (float)(DateTime.Now - _lastMPUpdate).TotalSeconds % 3; private static void UpdateMPTimer()