遠征と入渠のカウントダウンの仕様変更

・表示はゲームの表示通り・通知のみ設定秒数だけ早める fixed #51
KCV-Localisation · Aug 6, 2014 · 0e3c61d · 0e3c61d
1 parent 4f202d7
commit 0e3c61d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Grabacr07.KanColleWrapper/Models/Expedition.cs b/Grabacr07.KanColleWrapper/Models/Expedition.cs
@@ -139,12 +139,14 @@ private void UpdateCore()
 		{
 			if (this.ReturnTime.HasValue)
 			{
-				var remaining = this.ReturnTime.Value - TimeSpan.FromSeconds(KanColleClient.Current.Settings.NotificationShorteningTime) - DateTimeOffset.Now;
+				var remaining = this.ReturnTime.Value - DateTimeOffset.Now;
 				if (remaining.Ticks < 0) remaining = TimeSpan.Zero;
 
 				this.Remaining = remaining;
 
-				if (!this.notificated && this.Returned != null && remaining.Ticks <= 0)
+				if (!this.notificated
+					&& this.Returned != null
+					&& remaining <= TimeSpan.FromSeconds(KanColleClient.Current.Settings.NotificationShorteningTime))
 				{
 					this.Returned(this, new ExpeditionReturnedEventArgs(this.fleet.Name));
 					this.notificated = true;

diff --git a/Grabacr07.KanColleWrapper/Models/RepairingDock.cs b/Grabacr07.KanColleWrapper/Models/RepairingDock.cs
@@ -186,12 +186,14 @@ protected override void Tick()
 
 			if (this.CompleteTime.HasValue)
 			{
-				var remaining = this.CompleteTime.Value - TimeSpan.FromSeconds(KanColleClient.Current.Settings.NotificationShorteningTime) - DateTimeOffset.Now;
+				var remaining = this.CompleteTime.Value - DateTimeOffset.Now;
 				if (remaining.Ticks < 0) remaining = TimeSpan.Zero;
 
 				this.Remaining = remaining;
 
-				if (!this.notificated && this.Completed != null && remaining.Ticks <= 0)
+				if (!this.notificated
+					&& this.Completed != null
+					&& remaining <= TimeSpan.FromSeconds(KanColleClient.Current.Settings.NotificationShorteningTime))
 				{
 					this.Completed(this, new RepairingCompletedEventArgs(this.Id, this.Ship));
 					this.notificated = true;