Merge pull request #444 from wbonbon/master

added function to offset v-notice
anoyetta · Dec 31, 2024 · 00e01da · 00e01da
2 parents 195074a + f4bb540
commit 00e01da
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt
@@ -1 +1 @@
-v10.4.8
+v10.4.9
diff --git a/source/ACT.Hojoring.Common/Version.cs b/source/ACT.Hojoring.Common/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.4.0.8")]
-[assembly: AssemblyFileVersion("10.4.0.8")]
+[assembly: AssemblyVersion("10.4.0.9")]
+[assembly: AssemblyFileVersion("10.4.0.9")]
diff --git a/...CT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/TimelineVisualNoticeModel.cs b/...CT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/TimelineVisualNoticeModel.cs
@@ -62,6 +62,16 @@ public double? Duration
             set => this.SetProperty(ref this.duration, value);
         }
 
+        private double? duration_offset = null;
+
+        [XmlIgnore]
+        public double? DurationOffset
+        {
+            get => this.duration_offset;
+            set => this.SetProperty(ref this.duration_offset, value);
+        }
+
+
         private double durationToDisplay = 0;
 
         [XmlIgnore]
@@ -89,6 +99,13 @@ public string DurationXML
             set => this.Duration = double.TryParse(value, out var v) ? v : (double?)null;
         }
 
+        [XmlAttribute(AttributeName = "offset")]
+        public string OffsetXML
+        {
+            get => this.DurationOffset?.ToString();
+            set => this.DurationOffset = double.TryParse(value, out var v) ? v : (double?)null;
+        }
+
         private bool? durationVisible = null;
 
         [XmlIgnore]
@@ -339,7 +356,7 @@ public DateTime Timestamp
 
         [XmlIgnore]
         public DateTime TimeToHide
-            => this.Timestamp.AddSeconds(this.Duration.GetValueOrDefault());
+            => this.Timestamp.AddSeconds(this.Duration.GetValueOrDefault() + this.DurationOffset.GetValueOrDefault());
 
         private volatile bool toHide = false;