From 2201ba532cf975c9fbdb2aa826fa665ad351f403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com>
Date: Mon, 22 Jul 2024 17:38:58 +0800
Subject: [PATCH] fix: changed the way to get gcd time.

---
 .../Actions/ActionSettingAttribute.cs            |  7 ++++---
 .../Configurations/Actions/GCDAction.cs          | 16 ++++++++--------
 ActionTimelineEx/Configurations/Settings.cs      |  2 +-
 ECommons                                         |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ActionTimelineEx/Configurations/Actions/ActionSettingAttribute.cs b/ActionTimelineEx/Configurations/Actions/ActionSettingAttribute.cs
index 0532116..a3d72c4 100644
--- a/ActionTimelineEx/Configurations/Actions/ActionSettingAttribute.cs
+++ b/ActionTimelineEx/Configurations/Actions/ActionSettingAttribute.cs
@@ -22,9 +22,10 @@ public override string DrawIndex(object obj, int index)
         if (index == 0) _time = TimeSpan.Zero;
 
         var result = $"{(int)_time.TotalMinutes}:{_time.Seconds:D2}.{_time.Milliseconds.ToString()[0]}";
-        var time = setting.GcdOverride == 0
-            ? Plugin.Settings.RotationHelper.GcdTime
-            : setting.GcdOverride;
+
+        var recastTime = Svc.Data.GetExcelSheet<Action>()?.GetRow(setting.ActionId)?.Recast100ms ?? 0;
+
+        var time = Plugin.Settings.RotationHelper.GcdTime / 2.5f * recastTime / 10f;
 
         _time = _time.Add(TimeSpan.FromSeconds(time));
         return result;
diff --git a/ActionTimelineEx/Configurations/Actions/GCDAction.cs b/ActionTimelineEx/Configurations/Actions/GCDAction.cs
index aae6d32..a81ca32 100644
--- a/ActionTimelineEx/Configurations/Actions/GCDAction.cs
+++ b/ActionTimelineEx/Configurations/Actions/GCDAction.cs
@@ -11,14 +11,14 @@ public class GCDAction : ActionSetting
 {
     internal override ActionSettingType Type => ActionSettingType.Action;
 
-    [JsonIgnore]
-    [Range(0, 20, ConfigUnitType.Seconds)]
-    [UI("Recast time override")]
-    public float GcdOverride
-    {
-        get => Plugin.Settings.ActionRecast.TryGetValue(ActionId, out var v) ? v : 0f;
-        set => Plugin.Settings.ActionRecast[ActionId] = value;
-    }
+    //[JsonIgnore]
+    //[Range(0, 20, ConfigUnitType.Seconds)]
+    //[UI("Recast time override")]
+    //public float GcdOverride
+    //{
+    //    get => Plugin.Settings.ActionRecast.TryGetValue(ActionId, out var v) ? v : 0f;
+    //    set => Plugin.Settings.ActionRecast[ActionId] = value;
+    //}
 
     [UI]
     public List<oGCDAction> oGCDs { get; set; } = [];
diff --git a/ActionTimelineEx/Configurations/Settings.cs b/ActionTimelineEx/Configurations/Settings.cs
index c715b3c..7b71fe0 100644
--- a/ActionTimelineEx/Configurations/Settings.cs
+++ b/ActionTimelineEx/Configurations/Settings.cs
@@ -144,7 +144,7 @@ internal RotationsSetting RotationHelper
 
     private static readonly RotationsSetting EmptyHolder = new();
 
-    public Dictionary<uint, float> ActionRecast { get; set; } = [];
+    //public Dictionary<uint, float> ActionRecast { get; set; } = [];
 
     public int Version { get; set; } = 6;
 
diff --git a/ECommons b/ECommons
index 3878596..9505f74 160000
--- a/ECommons
+++ b/ECommons
@@ -1 +1 @@
-Subproject commit 387859644f09f11af5c4005e3827f49a7b4c95fc
+Subproject commit 9505f7456f837bb3a67735395b5ee58197575b4d