impl #1796

DGP-Studio · Jul 6, 2024 · 364b056 · 364b056
1 parent a4913e8
commit 364b056
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -3125,6 +3125,9 @@
   <data name="WebDailyNoteExpeditionRemainMinutesFormat" xml:space="preserve">
     <value>{0} 分</value>
   </data>
+  <data name="WebDailyNoteExpeditionRemainTime" xml:space="preserve">
+    <value>{0} 时 {1} 分</value>
+  </data>
   <data name="WebDailyNoteExtraTaskRewardNotAllowed" xml:space="preserve">
     <value>今日完成委托数量不足</value>
   </data>

diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/Expedition.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/Expedition.cs
@@ -80,9 +80,7 @@ public string RemainedTimeFormatted
             }
 
             TimeSpan ts = new(0, 0, RemainedTime);
-            return ts.Hours > 0
-                ? SH.FormatWebDailyNoteExpeditionRemainHoursFormat(ts.Hours)
-                : SH.FormatWebDailyNoteExpeditionRemainMinutesFormat(ts.Minutes);
+            return SH.FormatWebDailyNoteExpeditionRemainTime(ts.Hours, ts.Minutes);
         }
     }
 }