From b159e48a0aa4b4e3fa461dc8f27ca854f0b80892 Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Thu, 10 Nov 2022 19:11:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A08=E7=BE=A4=E4=B8=8E?=
 =?UTF-8?q?=E9=A2=91=E9=81=93=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAsstGui/Helper/MaaUrls.cs              |  1 +
 .../Resources/Localizations/en-us.xaml        |  2 +
 .../Resources/Localizations/ja-jp.xaml        |  1 +
 .../Resources/Localizations/ko-kr.xaml        |  1 +
 .../Resources/Localizations/pallas.xaml       |  1 +
 .../Resources/Localizations/zh-cn.xaml        |  2 +
 .../Resources/Localizations/zh-tw.xaml        |  2 +
 .../UserControl/AboutUserControl.xaml         | 45 ++++++++++++++-----
 8 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/MeoAsstGui/Helper/MaaUrls.cs b/src/MeoAsstGui/Helper/MaaUrls.cs
index ea87d674ca..ae18da4d59 100644
--- a/src/MeoAsstGui/Helper/MaaUrls.cs
+++ b/src/MeoAsstGui/Helper/MaaUrls.cs
@@ -41,6 +41,7 @@ namespace MeoAsstGui
             "https://jq.qq.com/?k=To6b6H6m",
             "https://jq.qq.com/?k=K8t6W7HZ",
             "https://jq.qq.com/?k=gGRc2Rlw",
+            "https://jq.qq.com/?k=NOpUOidq",
         };
 
         public static string LatestQqGroup => QqGroups.Last();
diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
index 832091a037..03110beeb8 100644
--- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
@@ -451,7 +451,9 @@
     <system:String x:Key="QQgroup5">QQ group 5</system:String>
     <system:String x:Key="QQgroup6">QQ group 6</system:String>
     <system:String x:Key="QQgroup7">QQ group 7</system:String>
+    <system:String x:Key="QQgroup8">QQ group 8</system:String>
     <system:String x:Key="QQgroupfull">(Full)</system:String>
+    <system:String x:Key="QQchannel">QQ channel</system:String>
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">FAQ</system:String>
     <uri:Uri x:Key="HelpUri">https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/en-us/1.2-FAQ.md</uri:Uri>
diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
index 2b25b7590e..600d607056 100644
--- a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
@@ -438,6 +438,7 @@
     <system:String x:Key="QQgroup5">グループ5</system:String>
     <system:String x:Key="QQgroup6">グループ6</system:String>
     <system:String x:Key="QQgroup7">グループ7</system:String>
+    <system:String x:Key="QQgroup8">グループ8</system:String>
     <system:String x:Key="QQgroupfull">(満員)</system:String>
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">よくある質問</system:String>
diff --git a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
index 866a29a707..bdcec2e137 100644
--- a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
@@ -424,6 +424,7 @@
     <system:String x:Key="QQgroup5">QQ그룹5</system:String>
     <system:String x:Key="QQgroup6">QQ그룹6</system:String>
     <system:String x:Key="QQgroup7">QQ그룹7</system:String>
+    <system:String x:Key="QQgroup8">QQ그룹8</system:String>
     <system:String x:Key="QQgroupfull">(만원)</system:String>
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">자주 묻는 질문</system:String>
diff --git a/src/MeoAsstGui/Resources/Localizations/pallas.xaml b/src/MeoAsstGui/Resources/Localizations/pallas.xaml
index 8549856da5..4c6aa3b208 100644
--- a/src/MeoAsstGui/Resources/Localizations/pallas.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/pallas.xaml
@@ -424,6 +424,7 @@
     <system:String x:Key="QQgroup5">🍻💃💃</system:String>
     <system:String x:Key="QQgroup6">🍻💃🍻</system:String>
     <system:String x:Key="QQgroup7">🍻💃💃</system:String>
+    <system:String x:Key="QQgroup8">🍻🍺🍺</system:String>
     <system:String x:Key="QQgroupfull">🍸🍸🕺🕺🍺</system:String>
     <system:String x:Key="Telegram">🍷🍷🍷🍺</system:String>
     <system:String x:Key="Help">🍸🍺🍺🍻🍺</system:String>
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
index daf50b6b18..1256167e10 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
@@ -451,7 +451,9 @@
     <system:String x:Key="QQgroup5">五群</system:String>
     <system:String x:Key="QQgroup6">六群</system:String>
     <system:String x:Key="QQgroup7">七群</system:String>
+    <system:String x:Key="QQgroup8">八群</system:String>
     <system:String x:Key="QQgroupfull">(已满)</system:String>
+    <system:String x:Key="QQchannel">QQ频道</system:String>
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">常见问题</system:String>
     <uri:Uri x:Key="HelpUri">https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/1.2-%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98.md</uri:Uri>
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
index 476fcbfd72..ab7f6e228e 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
@@ -426,7 +426,9 @@
     <system:String x:Key="QQgroup5">五群</system:String>
     <system:String x:Key="QQgroup6">六群</system:String>
     <system:String x:Key="QQgroup7">七群</system:String>
+    <system:String x:Key="QQgroup8">八群</system:String>
     <system:String x:Key="QQgroupfull">(已滿)</system:String>
+    <system:String x:Key="QQchannel">QQ頻道</system:String>
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">常見問題</system:String>
     <uri:Uri x:Key="HelpUri">https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/zh-tw/1.2-%E5%B8%B8%E8%A6%8B%E5%95%8F%E9%A1%8C.md</uri:Uri>
diff --git a/src/MeoAsstGui/UserControl/AboutUserControl.xaml b/src/MeoAsstGui/UserControl/AboutUserControl.xaml
index 6a409093f8..93e9f29111 100644
--- a/src/MeoAsstGui/UserControl/AboutUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/AboutUserControl.xaml
@@ -4,10 +4,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dd="urn:gong-wpf-dragdrop"
+    xmlns:local="clr-namespace:MeoAsstGui"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
     xmlns:vm="clr-namespace:MeoAsstGui;assembly=MeoAsstGui"
-    xmlns:local="clr-namespace:MeoAsstGui"
     d:DataContext="{d:DesignInstance {x:Type vm:SettingsViewModel}}"
     d:DesignWidth="550"
     mc:Ignorable="d">
@@ -44,7 +44,6 @@
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Style="{StaticResource TextBlockDefault}">
-            <TextBlock Text="{DynamicResource QQgroup}" />
             <Hyperlink
                 Click="Hyperlink_Click"
                 NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[0]}"
@@ -82,13 +81,6 @@
                 <TextBlock Text="{DynamicResource QQgroup3}" />
             </Hyperlink>
             <TextBlock Text="{DynamicResource QQgroupfull}" />
-        </TextBlock>
-
-        <TextBlock
-            Margin="5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}">
             <Hyperlink
                 Click="Hyperlink_Click"
                 Cursor="Hand"
@@ -102,6 +94,13 @@
                 <TextBlock Text="{DynamicResource QQgroup4}" />
             </Hyperlink>
             <TextBlock Text="{DynamicResource QQgroupfull}" />
+        </TextBlock>
+
+        <TextBlock
+            Margin="5"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Style="{StaticResource TextBlockDefault}">
             <Hyperlink
                 Click="Hyperlink_Click"
                 Cursor="Hand"
@@ -135,11 +134,37 @@
                 TextDecorations="None">
                 <Hyperlink.Style>
                     <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
-                        <Setter Property="Foreground" Value="#06C" />
+                        <Setter Property="Foreground" Value="#666" />
                     </Style>
                 </Hyperlink.Style>
                 <TextBlock Text="{DynamicResource QQgroup7}" />
             </Hyperlink>
+            <TextBlock Text="{DynamicResource QQgroupfull}" />
+            <Hyperlink
+                Click="Hyperlink_Click"
+                Cursor="Hand"
+                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[7]}"
+                TextDecorations="None">
+                <Hyperlink.Style>
+                    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
+                        <Setter Property="Foreground" Value="#06C" />
+                    </Style>
+                </Hyperlink.Style>
+                <TextBlock Text="{DynamicResource QQgroup8}" />
+            </Hyperlink>
+        </TextBlock>
+
+        <TextBlock
+            Margin="5"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Style="{StaticResource TextBlockDefault}">
+            <Hyperlink
+                Click="Hyperlink_Click"
+                NavigateUri="https://pd.qq.com/s/4j1ju9z47"
+                TextDecorations="None">
+                <TextBlock Text="{DynamicResource QQchannel}" />
+            </Hyperlink>
         </TextBlock>
 
         <TextBlock