diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj index 636ef46c63..6fa8a3195f 100644 --- a/src/MaaWpfGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -108,8 +108,10 @@ 3.4.5 - 1.15.0 + 1.21.0 + + 7.1.2 diff --git a/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs b/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs index cc264bba60..774cc4e8a6 100644 --- a/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs @@ -20,8 +20,7 @@ using System.Windows.Documents; using System.Windows.Input; using MaaWpfGui.Constants; using MaaWpfGui.Helper; -using Markdig; -using Markdig.Wpf; +using MdXaml; using Stylet; namespace MaaWpfGui.ViewModels.UI @@ -61,9 +60,6 @@ namespace MaaWpfGui.ViewModels.UI } } - public FlowDocument AnnouncementInfoDoc => Markdig.Wpf.Markdown.ToFlowDocument(AnnouncementInfo, - new MarkdownPipelineBuilder().UseSupportedExtensions().Build()); - /// /// 检查更新 /// diff --git a/src/MaaWpfGui/Views/UI/AnnouncementView.xaml b/src/MaaWpfGui/Views/UI/AnnouncementView.xaml index d8d3c7e710..3e6d7997af 100644 --- a/src/MaaWpfGui/Views/UI/AnnouncementView.xaml +++ b/src/MaaWpfGui/Views/UI/AnnouncementView.xaml @@ -4,9 +4,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:hc="https://handyorg.github.io/handycontrol" - xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:s="https://github.com/canton7/Stylet" + xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml" + xmlns:mdplug="clr-namespace:MdXaml.Plugins;assembly=MdXaml.Plugins" + xmlns:mdhtml="clr-namespace:MdXaml.Html;assembly=MdXaml.Html" xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI" Title="{DynamicResource Announcement}" Width="600" @@ -19,35 +20,23 @@ - + + + + + + + + + + - - - - - - - - - - - - - - + \ No newline at end of file