diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml
index 39e369c8..2d8cbaa4 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml
@@ -20,6 +20,8 @@
https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Proce.png
+ https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Start.png
+ https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Proce.png
https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Start.png
https://api.snapgenshin.com/static/raw/Mark/UI_MarkTower.png
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs
index 003217fc..fb72909d 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs
@@ -96,7 +96,7 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom
已复制到剪贴板
+
+ 所有魔神任务已完成
+
全部完成
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index 6ae5ce6b..f3c2bef1 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -3,7 +3,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cw="using:CommunityToolkit.WinUI"
- xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
+ xmlns:cwcont="using:CommunityToolkit.WinUI.Controls"
+ xmlns:cwconv="using:CommunityToolkit.WinUI.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mxi="using:Microsoft.Xaml.Interactivity"
@@ -26,6 +27,17 @@
+
+
+
+
@@ -127,7 +139,7 @@
Margin="4"
VerticalAlignment="Center"
shch:FrameworkElementHelper.SquareLength="32"
- Source="{StaticResource UI_MarkQuest_Main_Start}"/>
+ Source="{Binding DailyNote.ArchonQuestProgress.List.Count, Converter={StaticResource ArchonQuestIconConverter}}"/>
+ Source="{Binding DailyNote.DailyTask.IsExtraTaskRewardReceived, Converter={StaticResource DailyTaskIconConverter}}"/>
-
@@ -487,16 +499,16 @@
0
-
-
+
-
+
-
-
+
-
+
-
-
+
-
+
-
-
-
+
-
+
-
+
- ArchonQuestIds { get; } = [
- 1001U, 1002U, 1003U,
- 1101U, 1102U, 1103U, 1104U,
- 1201U, 1202U, 1203U, 1204U, 1205U, 1206U, 1207U,
- 1301U, 1302U, 1303U, 1304U, 1305U, 1306U, 1307U, 1308U,
- 1401U, 1402U, 1403U, 1404U, 1405U
- ];
-
[JsonPropertyName("list")]
public List List { get; set; } = default!;
- public int ArchonQuestStatusValue
- {
- get
- {
- if (List.IsNullOrEmpty())
- {
- return ArchonQuestIds.Count;
- }
-
- return ArchonQuestIds.IndexOf(List.Single().Id);
- }
- }
-
- public string ArchonQuestStatusFormatted
- {
- get
- {
- if (List.IsNullOrEmpty())
- {
- return SH.WebDailyNoteArchonQuestStatusFinished;
- }
-
- return List.Single().Status.GetLocalizedDescription();
- }
- }
-
- public string ArchonQuestChapterFormatted
- {
- get
- {
- if (List.IsNullOrEmpty())
- {
- return string.Empty;
- }
-
- ArchonQuest quest = List.Single();
- return $"{quest.ChapterNum} {quest.ChapterTitle}";
- }
- }
-
[JsonPropertyName("is_open_archon_quest")]
public bool IsOpenArchonQuest { get; set; }