fix: fix for moving check.

ArchiDog1998 · Jul 1, 2023 · da82cda · da82cda
1 parent 41c059f
commit da82cda
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git 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
@@ -334,7 +334,7 @@ private static BattleChara RandomObject(IEnumerable<BattleChara> objs)
     /// <param name="radius"></param>
     /// <returns></returns>
     public static IEnumerable<T> GetObjectInRadius<T>(this IEnumerable<T> objects, float radius) where T : GameObject
-        => objects.Where(o => o.DistanceToPlayer() <= radius)
+        => objects.Where(o => o.DistanceToPlayer() <= radius);
 
     private static IEnumerable<BattleChara> DefaultTargetingType(IEnumerable<BattleChara> charas)
         => DataCenter.TargetingType switch

diff --git 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,28 +75,13 @@ 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());
         ImGui.Text("CanHealSingleSpell: " + DataCenter.CanHealSingleSpell.ToString());
         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
@@ -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;
-    /// <summary>
-    /// 跳蓝经过时间
-    /// </summary>
+
     internal static float MPUpdateElapsed => (float)(DateTime.Now - _lastMPUpdate).TotalSeconds % 3;
 
     private static void UpdateMPTimer()