diff --git a/RotationSolver/UI/NextActionWindow.cs b/RotationSolver/UI/NextActionWindow.cs index fea941287..e1ca3715c 100644 --- a/RotationSolver/UI/NextActionWindow.cs +++ b/RotationSolver/UI/NextActionWindow.cs @@ -40,17 +40,35 @@ public override void PostDraw() base.PostDraw(); } - public override void Draw() + public override unsafe void Draw() { var width = Service.Config.ControlWindowGCDSize * Service.Config.ControlWindowNextSizeRatio; DrawGcdCooldown(width, false); - ControlWindow.DrawIAction(ActionUpdater.NextAction, width, 1); + + var precent = 0f; + + var group = ActionManager.Instance()->GetRecastGroupDetail(ActionHelper.GCDCooldownGroup - 1); + if (group ->Elapsed == group->Total || group->Total == 0) + { + precent = 1; + } + else + { + precent = group->Elapsed / group->Total; + if(ActionUpdater.NextAction != ActionUpdater.NextGCDAction) + { + precent++; + } + } + + ControlWindow.DrawIAction(ActionUpdater.NextAction, width, precent); } public static unsafe void DrawGcdCooldown(float width, bool drawTittle) { var group = ActionManager.Instance()->GetRecastGroupDetail(ActionHelper.GCDCooldownGroup - 1); + var remain = group->Total - group->Elapsed; var total = DataCenter.WeaponTotal;