From fcde9b21ae8d803dc16fe5992067cd9cced5fa73 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Fri, 3 Feb 2023 20:05:32 +0800
Subject: [PATCH] fix #442

---
 src/Snap.Hutao/Snap.Hutao/.filenesting.json   |   4 +-
 .../Resource/Localization/SH.Designer.cs      | 432 ++++++++++++++++++
 .../Snap.Hutao/Resource/Localization/SH.resx  | 144 ++++++
 src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj   |   6 -
 .../Snap.Hutao/View/Page/DailyNotePage.xaml   |  30 +-
 .../Snap.Hutao/View/Page/GachaLogPage.xaml    |  66 +--
 .../View/Page/HutaoDatabasePage.xaml          |  28 +-
 .../View/Page/HutaoDatabasePresentPage.xaml   | 311 -------------
 .../Page/HutaoDatabasePresentPage.xaml.cs     |  23 -
 .../Snap.Hutao/View/Page/TestPage.xaml        |   4 -
 .../Snap.Hutao/ViewModel/TestViewModel.cs     |  13 -
 .../ViewModel/WikiAvatarViewModel.cs          |  25 +-
 .../ViewModel/WikiWeaponViewModel.cs          |  21 +-
 13 files changed, 665 insertions(+), 442 deletions(-)
 delete mode 100644 src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePresentPage.xaml
 delete mode 100644 src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePresentPage.xaml.cs

diff --git a/src/Snap.Hutao/Snap.Hutao/.filenesting.json b/src/Snap.Hutao/Snap.Hutao/.filenesting.json
index 8c51f689..d1473ce7 100644
--- a/src/Snap.Hutao/Snap.Hutao/.filenesting.json
+++ b/src/Snap.Hutao/Snap.Hutao/.filenesting.json
@@ -21,8 +21,8 @@
         "add": {
           ".filenesting.json": [ "App.xaml.cs" ],
           "app.manifest": [ "App.xaml.cs" ],
-          "Package.appxmanifest": [ "App.xaml.cs" ],
-          "Package.StoreAssociation.xml": [ "App.xaml.cs" ],
+          "Package.appxmanifest": [ "App.xaml" ],
+          "Package.StoreAssociation.xml": [ "App.xaml" ],
           ".editorconfig": [ "Program.cs" ],
           "GlobalUsing.cs": [ "Program.cs" ]
         }
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
index c19f18a8..ac22453f 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
@@ -1464,6 +1464,438 @@ namespace Snap.Hutao.Resource.Localization {
             }
         }
         
+        /// <summary>
+        ///   查找类似 添加角色 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteAddEntry {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteAddEntry", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 添加角色以定时刷新 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteAddEntryHint {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteAddEntryHint", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 添加 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteAddEntryToolTip {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteAddEntryToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 通知 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteNotificationHeader {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteNotificationHeader", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 通知设置 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteNotificationSetting {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteNotificationSetting", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 立即刷新 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteRefresh {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteRefresh", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 刷新间隔时间 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteRefreshTime {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteRefreshTime", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 防止通知自动收入操作中心 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteReminderDescription {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteReminderDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 提醒通知 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteReminderHeader {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteReminderHeader", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 移除用户 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteRemoveToolTip {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteRemoveToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 本周已消耗减半次数 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteResinDiscountUsed {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteResinDiscountUsed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 在我游玩原神时不通知我 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteSlientModeDescription {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteSlientModeDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 免打扰模式 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteSlientModeHeader {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteSlientModeHeader", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 验证当前账号角色 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageDailyNoteVerify {
+            get {
+                return ResourceManager.GetString("ViewPageDailyNoteVerify", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 全量刷新 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogAggressiveRefresh {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogAggressiveRefresh", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 导出 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogExportAction {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogExportAction", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 尚未获取任何祈愿记录 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogHint {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogHint", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 导入 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogImportAction {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogImportAction", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 导入从其他 App 中导出的数据 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogImportDescription {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogImportDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 导入 UIGF Json 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogImportHeader {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogImportHeader", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 输入 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogInputAction {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogInputAction", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 刷新 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogRefresh {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogRefresh", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 获取 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogRefreshAction {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogRefreshAction", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 手动输入 Url 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogRefreshBymanualInput {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogRefreshBymanualInput", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 使用由你提供的 Url 刷新祈愿记录 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogRefreshBymanualInputDescription {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogRefreshBymanualInputDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Stoken 刷新 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogRefreshByStoken {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogRefreshByStoken", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 使用当前账号的 Cookie 信息刷新祈愿记录 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogRefreshByStokenDescription {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogRefreshByStokenDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 网页缓存刷新 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogRefreshByWebCache {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogRefreshByWebCache", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 使用游戏内浏览器的网页缓存刷新祈愿记录 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogRefreshByWebCacheDescription {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogRefreshByWebCacheDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 删除当前存档 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGachaLogRemoveArchiveAction {
+            get {
+                return ResourceManager.GetString("ViewPageGachaLogRemoveArchiveAction", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 角色 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGahcaLogPivotAvatar {
+            get {
+                return ResourceManager.GetString("ViewPageGahcaLogPivotAvatar", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 历史 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGahcaLogPivotHistory {
+            get {
+                return ResourceManager.GetString("ViewPageGahcaLogPivotHistory", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 总览 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGahcaLogPivotOverview {
+            get {
+                return ResourceManager.GetString("ViewPageGahcaLogPivotOverview", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 武器 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageGahcaLogPivotWeapon {
+            get {
+                return ResourceManager.GetString("ViewPageGahcaLogPivotWeapon", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 详情 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverview {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverview", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 角色出场 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewAvatarAppearanceRank {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewAvatarAppearanceRank", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 角色持有 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewAvatarConstellation {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewAvatarConstellation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 角色使用 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewAvatarUsageRank {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewAvatarUsageRank", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 数据收集统计 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewDataCollect {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewDataCollect", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 上传记录总数 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewRecordTotal {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewRecordTotal", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 数据刷新时间 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewRefreshTime {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewRefreshTime", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 深渊数据统计 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewSpiralAbyss {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewSpiralAbyss", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 平均战斗次数 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewSpiralAbyssBattleAverage {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewSpiralAbyssBattleAverage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 满星深渊记录 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewSpiralAbyssFullStar {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewSpiralAbyssFullStar", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 通关深渊记录 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewSpiralAbyssPassed {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewSpiralAbyssPassed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 平均获取渊星 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewSpiralAbyssStarAverage {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewSpiralAbyssStarAverage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 总计深渊记录 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewSpiralAbyssTotal {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewSpiralAbyssTotal", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 队伍出场 的本地化字符串。
+        /// </summary>
+        internal static string ViewPageHutaoDatabaseOverviewTeamAppearance {
+            get {
+                return ResourceManager.GetString("ViewPageHutaoDatabaseOverviewTeamAppearance", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 角色资料 的本地化字符串。
         /// </summary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index a445151b..379f0a67 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -585,6 +585,150 @@
   <data name="ViewPageCultivationWikiWeaponDescription" xml:space="preserve">
     <value>添加任意武器到养成计划</value>
   </data>
+  <data name="ViewPageDailyNoteAddEntry" xml:space="preserve">
+    <value>添加角色</value>
+  </data>
+  <data name="ViewPageDailyNoteAddEntryHint" xml:space="preserve">
+    <value>添加角色以定时刷新</value>
+  </data>
+  <data name="ViewPageDailyNoteAddEntryToolTip" xml:space="preserve">
+    <value>添加</value>
+  </data>
+  <data name="ViewPageDailyNoteNotificationHeader" xml:space="preserve">
+    <value>通知</value>
+  </data>
+  <data name="ViewPageDailyNoteNotificationSetting" xml:space="preserve">
+    <value>通知设置</value>
+  </data>
+  <data name="ViewPageDailyNoteRefresh" xml:space="preserve">
+    <value>立即刷新</value>
+  </data>
+  <data name="ViewPageDailyNoteRefreshTime" xml:space="preserve">
+    <value>刷新间隔时间</value>
+  </data>
+  <data name="ViewPageDailyNoteReminderDescription" xml:space="preserve">
+    <value>防止通知自动收入操作中心</value>
+  </data>
+  <data name="ViewPageDailyNoteReminderHeader" xml:space="preserve">
+    <value>提醒通知</value>
+  </data>
+  <data name="ViewPageDailyNoteRemoveToolTip" xml:space="preserve">
+    <value>移除用户</value>
+  </data>
+  <data name="ViewPageDailyNoteResinDiscountUsed" xml:space="preserve">
+    <value>本周已消耗减半次数</value>
+  </data>
+  <data name="ViewPageDailyNoteSlientModeDescription" xml:space="preserve">
+    <value>在我游玩原神时不通知我</value>
+  </data>
+  <data name="ViewPageDailyNoteSlientModeHeader" xml:space="preserve">
+    <value>免打扰模式</value>
+  </data>
+  <data name="ViewPageDailyNoteVerify" xml:space="preserve">
+    <value>验证当前账号角色</value>
+  </data>
+  <data name="ViewPageGachaLogAggressiveRefresh" xml:space="preserve">
+    <value>全量刷新</value>
+  </data>
+  <data name="ViewPageGachaLogExportAction" xml:space="preserve">
+    <value>导出</value>
+  </data>
+  <data name="ViewPageGachaLogHint" xml:space="preserve">
+    <value>尚未获取任何祈愿记录</value>
+  </data>
+  <data name="ViewPageGachaLogImportAction" xml:space="preserve">
+    <value>导入</value>
+  </data>
+  <data name="ViewPageGachaLogImportDescription" xml:space="preserve">
+    <value>导入从其他 App 中导出的数据</value>
+  </data>
+  <data name="ViewPageGachaLogImportHeader" xml:space="preserve">
+    <value>导入 UIGF Json</value>
+  </data>
+  <data name="ViewPageGachaLogInputAction" xml:space="preserve">
+    <value>输入</value>
+  </data>
+  <data name="ViewPageGachaLogRefresh" xml:space="preserve">
+    <value>刷新</value>
+  </data>
+  <data name="ViewPageGachaLogRefreshAction" xml:space="preserve">
+    <value>获取</value>
+  </data>
+  <data name="ViewPageGachaLogRefreshBymanualInput" xml:space="preserve">
+    <value>手动输入 Url</value>
+  </data>
+  <data name="ViewPageGachaLogRefreshBymanualInputDescription" xml:space="preserve">
+    <value>使用由你提供的 Url 刷新祈愿记录</value>
+  </data>
+  <data name="ViewPageGachaLogRefreshByStoken" xml:space="preserve">
+    <value>Stoken 刷新</value>
+  </data>
+  <data name="ViewPageGachaLogRefreshByStokenDescription" xml:space="preserve">
+    <value>使用当前账号的 Cookie 信息刷新祈愿记录</value>
+  </data>
+  <data name="ViewPageGachaLogRefreshByWebCache" xml:space="preserve">
+    <value>网页缓存刷新</value>
+  </data>
+  <data name="ViewPageGachaLogRefreshByWebCacheDescription" xml:space="preserve">
+    <value>使用游戏内浏览器的网页缓存刷新祈愿记录</value>
+  </data>
+  <data name="ViewPageGachaLogRemoveArchiveAction" xml:space="preserve">
+    <value>删除当前存档</value>
+  </data>
+  <data name="ViewPageGahcaLogPivotAvatar" xml:space="preserve">
+    <value>角色</value>
+  </data>
+  <data name="ViewPageGahcaLogPivotHistory" xml:space="preserve">
+    <value>历史</value>
+  </data>
+  <data name="ViewPageGahcaLogPivotOverview" xml:space="preserve">
+    <value>总览</value>
+  </data>
+  <data name="ViewPageGahcaLogPivotWeapon" xml:space="preserve">
+    <value>武器</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverview" xml:space="preserve">
+    <value>详情</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewAvatarAppearanceRank" xml:space="preserve">
+    <value>角色出场</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewAvatarConstellation" xml:space="preserve">
+    <value>角色持有</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewAvatarUsageRank" xml:space="preserve">
+    <value>角色使用</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewDataCollect" xml:space="preserve">
+    <value>数据收集统计</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewRecordTotal" xml:space="preserve">
+    <value>上传记录总数</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewRefreshTime" xml:space="preserve">
+    <value>数据刷新时间</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewSpiralAbyss" xml:space="preserve">
+    <value>深渊数据统计</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewSpiralAbyssBattleAverage" xml:space="preserve">
+    <value>平均战斗次数</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewSpiralAbyssFullStar" xml:space="preserve">
+    <value>满星深渊记录</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewSpiralAbyssPassed" xml:space="preserve">
+    <value>通关深渊记录</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewSpiralAbyssStarAverage" xml:space="preserve">
+    <value>平均获取渊星</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewSpiralAbyssTotal" xml:space="preserve">
+    <value>总计深渊记录</value>
+  </data>
+  <data name="ViewPageHutaoDatabaseOverviewTeamAppearance" xml:space="preserve">
+    <value>队伍出场</value>
+  </data>
   <data name="ViewWikiAvatarHeader" xml:space="preserve">
     <value>角色资料</value>
   </data>
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index 96fb6544..ff4a5d19 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -102,7 +102,6 @@
     <None Remove="View\Page\DailyNotePage.xaml" />
     <None Remove="View\Page\GachaLogPage.xaml" />
     <None Remove="View\Page\HutaoDatabasePage.xaml" />
-    <None Remove="View\Page\HutaoDatabasePresentPage.xaml" />
     <None Remove="View\Page\LaunchGamePage.xaml" />
     <None Remove="View\Page\LoginMihoyoUserPage.xaml" />
     <None Remove="View\Page\SettingPage.xaml" />
@@ -208,11 +207,6 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Page Update="View\Page\HutaoDatabasePresentPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <Page Update="View\WelcomeView.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index 83af5872..56cb3a26 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -36,8 +36,8 @@
             <AppBarButton
                 Command="{Binding RefreshCommand}"
                 Icon="{shcm:FontIcon Glyph=&#xE72C;}"
-                Label="立即刷新"/>
-            <AppBarButton Icon="{shcm:FontIcon Glyph=&#xE710;}" Label="添加角色">
+                Label="{shcm:ResourceString Name=ViewPageDailyNoteRefresh}"/>
+            <AppBarButton Icon="{shcm:FontIcon Glyph=&#xE710;}" Label="{shcm:ResourceString Name=ViewPageDailyNoteAddEntry}">
                 <AppBarButton.Flyout>
                     <Flyout LightDismissOverlayMode="On" Placement="Bottom">
                         <Flyout.FlyoutPresenterStyle>
@@ -50,7 +50,7 @@
                             <TextBlock
                                 Margin="16,12,16,16"
                                 Style="{StaticResource BaseTextBlockStyle}"
-                                Text="添加角色以定时刷新"/>
+                                Text="{shcm:ResourceString Name=ViewPageDailyNoteAddEntryHint}"/>
                             <ScrollViewer MaxHeight="320" Padding="16,0">
                                 <ItemsControl ItemsSource="{Binding UserAndUids}">
                                     <ItemsControl.ItemTemplate>
@@ -67,7 +67,7 @@
                                                     Content="&#xE710;"
                                                     FontFamily="{StaticResource SymbolThemeFontFamily}"
                                                     Style="{StaticResource ButtonRevealStyle}"
-                                                    ToolTipService.ToolTip="添加"/>
+                                                    ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteAddEntryToolTip}"/>
                                             </Grid>
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
@@ -80,14 +80,14 @@
             <AppBarButton
                 Command="{Binding DailyNoteVerificationCommand}"
                 Icon="{shcm:FontIcon Glyph=&#xE9D5;}"
-                Label="验证当前账号角色"/>
-            <AppBarButton Icon="{shcm:FontIcon Glyph=&#xE713;}" Label="通知设置">
+                Label="{shcm:ResourceString Name=ViewPageDailyNoteVerify}"/>
+            <AppBarButton Icon="{shcm:FontIcon Glyph=&#xE713;}" Label="{shcm:ResourceString Name=ViewPageDailyNoteNotificationSetting}">
                 <AppBarButton.Flyout>
                     <Flyout Placement="BottomEdgeAlignedRight">
                         <StackPanel>
                             <RadioButtons ItemsSource="{Binding RefreshTimes}" SelectedItem="{Binding SelectedRefreshTime, Mode=TwoWay}">
                                 <RadioButtons.Header>
-                                    <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="刷新间隔时间"/>
+                                    <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageDailyNoteRefreshTime}"/>
                                 </RadioButtons.Header>
                                 <RadioButtons.ItemTemplate>
                                     <DataTemplate>
@@ -95,10 +95,10 @@
                                     </DataTemplate>
                                 </RadioButtons.ItemTemplate>
                             </RadioButtons>
-                            <wsc:SettingsGroup Margin="0,-16,0,0" Header="通知">
+                            <wsc:SettingsGroup Margin="0,-16,0,0" Header="{shcm:ResourceString Name=ViewPageDailyNoteNotificationHeader}">
                                 <wsc:Setting
-                                    Description="在我游玩原神时不通知我"
-                                    Header="免打扰模式"
+                                    Description="{shcm:ResourceString Name=ViewPageDailyNoteSlientModeDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageDailyNoteSlientModeHeader}"
                                     Icon="&#xE7ED;">
                                     <ToggleSwitch
                                         Margin="24,0,0,0"
@@ -106,8 +106,8 @@
                                         Style="{StaticResource ToggleSwitchSettingStyle}"/>
                                 </wsc:Setting>
                                 <wsc:Setting
-                                    Description="防止通知自动收入操作中心"
-                                    Header="提醒通知"
+                                    Description="{shcm:ResourceString Name=ViewPageDailyNoteReminderDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageDailyNoteReminderHeader}"
                                     Icon="&#xEA8F;">
                                     <ToggleSwitch
                                         Margin="24,0,0,0"
@@ -163,7 +163,7 @@
                                             CommandParameter="{Binding}"
                                             Content="&#xE74D;"
                                             FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                            ToolTipService.ToolTip="移除用户"/>
+                                            ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteRemoveToolTip}"/>
                                         <Button
                                             MinHeight="36.8"
                                             Margin="8,0,0,0"
@@ -175,7 +175,7 @@
                                             CommandParameter="{Binding}"
                                             Content="&#xE713;"
                                             FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                            ToolTipService.ToolTip="通知设置"/>
+                                            ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteNotificationSetting}"/>
                                     </StackPanel>
                                 </Grid>
 
@@ -337,7 +337,7 @@
                                             Margin="4,4,0,0"
                                             Opacity="0.6"
                                             Style="{StaticResource CaptionTextBlockStyle}"
-                                            Text="本周已消耗减半次数"/>
+                                            Text="{shcm:ResourceString Name=ViewPageDailyNoteResinDiscountUsed}"/>
                                     </Grid>
 
                                     <Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
index 860031bd..1cc2adac 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
@@ -44,25 +44,25 @@
                 </Pivot.LeftHeader>
                 <Pivot.RightHeader>
                     <CommandBar DefaultLabelPosition="Right">
-                        <AppBarButton Icon="{shcm:FontIcon Glyph=&#xE72C;}" Label="刷新">
+                        <AppBarButton Icon="{shcm:FontIcon Glyph=&#xE72C;}" Label="{shcm:ResourceString Name=ViewPageGachaLogRefresh}">
                             <AppBarButton.Flyout>
                                 <MenuFlyout Placement="Bottom">
                                     <MenuFlyoutItem
                                         Command="{Binding RefreshByStokenCommand}"
                                         Icon="{shcm:FontIcon Glyph=&#xE192;}"
-                                        Text="Stoken 刷新"/>
+                                        Text="{shcm:ResourceString Name=ViewPageGachaLogRefreshByStoken}"/>
                                     <MenuFlyoutItem
                                         Command="{Binding RefreshByWebCacheCommand}"
                                         Icon="{shcm:FontIcon Glyph=&#xE81E;}"
-                                        Text="网页缓存刷新"/>
+                                        Text="{shcm:ResourceString Name=ViewPageGachaLogRefreshByWebCache}"/>
                                     <MenuFlyoutItem
                                         Command="{Binding RefreshByManualInputCommand}"
                                         Icon="{shcm:FontIcon Glyph=&#xE765;}"
-                                        Text="手动输入 Url"/>
+                                        Text="{shcm:ResourceString Name=ViewPageGachaLogRefreshBymanualInput}"/>
                                     <ToggleMenuFlyoutItem
                                         Icon="{shcm:FontIcon Glyph=&#xE1CD;}"
                                         IsChecked="{Binding IsAggressiveRefresh}"
-                                        Text="全量刷新"/>
+                                        Text="{shcm:ResourceString Name=ViewPageGachaLogAggressiveRefresh}"/>
                                 </MenuFlyout>
                             </AppBarButton.Flyout>
                         </AppBarButton>
@@ -70,20 +70,20 @@
                         <AppBarButton
                             Command="{Binding ImportFromUIGFJsonCommand}"
                             Icon="{shcm:FontIcon Glyph=&#xE8B5;}"
-                            Label="导入"/>
+                            Label="{shcm:ResourceString Name=ViewPageGachaLogImportAction}"/>
                         <AppBarButton
                             Command="{Binding ExportToUIGFJsonCommand}"
                             Icon="{shcm:FontIcon Glyph=&#xEDE1;}"
-                            Label="导出"/>
+                            Label="{shcm:ResourceString Name=ViewPageGachaLogExportAction}"/>
                         <CommandBar.SecondaryCommands>
                             <AppBarButton
                                 Command="{Binding RemoveArchiveCommand}"
                                 Icon="{shcm:FontIcon Glyph=&#xE74D;}"
-                                Label="删除当前存档"/>
+                                Label="{shcm:ResourceString Name=ViewPageGachaLogRemoveArchiveAction}"/>
                         </CommandBar.SecondaryCommands>
                     </CommandBar>
                 </Pivot.RightHeader>
-                <PivotItem Header="总览">
+                <PivotItem Header="{shcm:ResourceString Name=ViewPageGahcaLogPivotOverview}">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition MaxWidth="390"/>
@@ -105,7 +105,7 @@
                             DataContext="{Binding Statistics.PermanentWish}"/>
                     </Grid>
                 </PivotItem>
-                <PivotItem Header="历史">
+                <PivotItem Header="{shcm:ResourceString Name=ViewPageGahcaLogPivotHistory}">
                     <SplitView
                         DisplayMode="Inline"
                         IsPaneOpen="True"
@@ -237,7 +237,7 @@
                                     <TextBlock
                                         Margin="0,16,0,8"
                                         Style="{StaticResource BaseTextBlockStyle}"
-                                        Text="五星"
+                                        Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"
                                         Visibility="{Binding SelectedHistoryWish.OrangeList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
                                     <GridView ItemsSource="{Binding SelectedHistoryWish.OrangeList}" SelectionMode="None">
                                         <GridView.ItemTemplate>
@@ -265,7 +265,7 @@
                                     <TextBlock
                                         Margin="0,0,0,8"
                                         Style="{StaticResource BaseTextBlockStyle}"
-                                        Text="四星"
+                                        Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"
                                         Visibility="{Binding SelectedHistoryWish.PurpleList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
                                     <GridView ItemsSource="{Binding SelectedHistoryWish.PurpleList}" SelectionMode="None">
                                         <GridView.ItemTemplate>
@@ -293,7 +293,7 @@
                                     <TextBlock
                                         Margin="0,0,0,8"
                                         Style="{StaticResource BaseTextBlockStyle}"
-                                        Text="三星"
+                                        Text="{shcm:ResourceString Name=ViewControlStatisticsCardBlueText}"
                                         Visibility="{Binding SelectedHistoryWish.BlueList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
                                     <GridView ItemsSource="{Binding SelectedHistoryWish.BlueList}" SelectionMode="None">
                                         <GridView.ItemTemplate>
@@ -322,13 +322,13 @@
                         </SplitView.Content>
                     </SplitView>
                 </PivotItem>
-                <PivotItem Header="角色">
+                <PivotItem Header="{shcm:ResourceString Name=ViewPageGahcaLogPivotAvatar}">
                     <ScrollViewer>
                         <StackPanel Margin="16,0,16,0">
                             <TextBlock
                                 Margin="0,16,0,8"
                                 Style="{StaticResource BaseTextBlockStyle}"
-                                Text="五星"/>
+                                Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
                             <GridView ItemsSource="{Binding Statistics.OrangeAvatars}" SelectionMode="None">
                                 <GridView.ItemTemplate>
                                     <DataTemplate>
@@ -355,7 +355,7 @@
                             <TextBlock
                                 Margin="0,0,0,8"
                                 Style="{StaticResource BaseTextBlockStyle}"
-                                Text="四星"/>
+                                Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
                             <GridView ItemsSource="{Binding Statistics.PurpleAvatars}" SelectionMode="None">
                                 <GridView.ItemTemplate>
                                     <DataTemplate>
@@ -381,13 +381,13 @@
                         </StackPanel>
                     </ScrollViewer>
                 </PivotItem>
-                <PivotItem Header="武器">
+                <PivotItem Header="{shcm:ResourceString Name=ViewPageGahcaLogPivotWeapon}">
                     <ScrollViewer>
                         <StackPanel Margin="16,0,16,0">
                             <TextBlock
                                 Margin="0,16,0,8"
                                 Style="{StaticResource BaseTextBlockStyle}"
-                                Text="五星"/>
+                                Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
                             <GridView ItemsSource="{Binding Statistics.OrangeWeapons}" SelectionMode="None">
                                 <GridView.ItemTemplate>
                                     <DataTemplate>
@@ -414,7 +414,7 @@
                             <TextBlock
                                 Margin="0,0,0,8"
                                 Style="{StaticResource BaseTextBlockStyle}"
-                                Text="四星"/>
+                                Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
                             <GridView ItemsSource="{Binding Statistics.PurpleWeapons}" SelectionMode="None">
                                 <GridView.ItemTemplate>
                                     <DataTemplate>
@@ -441,7 +441,7 @@
                             <TextBlock
                                 Margin="0,0,0,8"
                                 Style="{StaticResource BaseTextBlockStyle}"
-                                Text="三星"/>
+                                Text="{shcm:ResourceString Name=ViewControlStatisticsCardBlueText}"/>
                             <GridView ItemsSource="{Binding Statistics.BlueWeapons}" SelectionMode="None">
                                 <GridView.ItemTemplate>
                                     <DataTemplate>
@@ -479,32 +479,32 @@
                     Margin="0,16,0,0"
                     HorizontalAlignment="Center"
                     Style="{StaticResource SubtitleTextBlockStyle}"
-                    Text="尚未获取任何祈愿记录"/>
+                    Text="{shcm:ResourceString Name=ViewPageGachaLogHint}"/>
                 <wsc:SettingsGroup Margin="0,-36,0,0" HorizontalAlignment="Center">
                     <wsc:Setting
-                        Description="使用当前账号的Cookie信息刷新祈愿记录"
-                        Header="Stoken 刷新"
+                        Description="{shcm:ResourceString Name=ViewPageGachaLogRefreshByStokenDescription}"
+                        Header="{shcm:ResourceString Name=ViewPageGachaLogRefreshByStoken}"
                         Icon="{shcm:FontIcon Glyph=&#xE192;}"
                         Style="{StaticResource DefaultSettingStyle}">
-                        <Button Command="{Binding RefreshByStokenCommand}" Content="获取"/>
+                        <Button Command="{Binding RefreshByStokenCommand}" Content="{shcm:ResourceString Name=ViewPageGachaLogRefreshAction}"/>
                     </wsc:Setting>
                     <wsc:Setting
-                        Description="使用游戏内浏览器的网页缓存刷新祈愿记录"
-                        Header="网页缓存刷新"
+                        Description="{shcm:ResourceString Name=ViewPageGachaLogRefreshByWebCacheDescription}"
+                        Header="{shcm:ResourceString Name=ViewPageGachaLogRefreshByWebCache}"
                         Icon="{shcm:FontIcon Glyph=&#xE81E;}">
-                        <Button Command="{Binding RefreshByWebCacheCommand}" Content="获取"/>
+                        <Button Command="{Binding RefreshByWebCacheCommand}" Content="{shcm:ResourceString Name=ViewPageGachaLogRefreshAction}"/>
                     </wsc:Setting>
                     <wsc:Setting
-                        Description="使用由你提供的 Url 刷新祈愿记录"
-                        Header="手动输入 Url"
+                        Description="{shcm:ResourceString Name=ViewPageGachaLogRefreshBymanualInputDescription}"
+                        Header="{shcm:ResourceString Name=ViewPageGachaLogRefreshBymanualInput}"
                         Icon="{shcm:FontIcon Glyph=&#xE765;}">
-                        <Button Command="{Binding RefreshByManualInputCommand}" Content="输入"/>
+                        <Button Command="{Binding RefreshByManualInputCommand}" Content="{shcm:ResourceString Name=ViewPageGachaLogInputAction}"/>
                     </wsc:Setting>
                     <wsc:Setting
-                        Description="导入从其他 App 中导出的数据"
-                        Header="导入 UIGF Json"
+                        Description="{shcm:ResourceString Name=ViewPageGachaLogImportDescription}"
+                        Header="{shcm:ResourceString Name=ViewPageGachaLogImportHeader}"
                         Icon="{shcm:FontIcon Glyph=&#xE8B5;}">
-                        <Button Command="{Binding ImportFromUIGFJsonCommand}" Content="导入"/>
+                        <Button Command="{Binding ImportFromUIGFJsonCommand}" Content="{shcm:ResourceString Name=ViewPageGachaLogExportAction}"/>
                     </wsc:Setting>
                 </wsc:SettingsGroup>
             </StackPanel>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePage.xaml
index 3cad88ba..1716e126 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePage.xaml
@@ -66,17 +66,17 @@
         <Pivot Visibility="{Binding Overview, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
             <Pivot.RightHeader>
                 <CommandBar DefaultLabelPosition="Right">
-                    <AppBarButton Icon="{shcm:FontIcon Glyph=&#xE946;}" Label="详情">
+                    <AppBarButton Icon="{shcm:FontIcon Glyph=&#xE946;}" Label="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverview}">
                         <AppBarButton.Flyout>
                             <Flyout Placement="BottomEdgeAlignedRight">
                                 <StackPanel MinWidth="260">
-                                    <wsc:SettingsGroup Margin="0,-32,0,0" Header="数据收集统计">
-                                        <wsc:Setting Content="{Binding Overview.RefreshTime}" Header="数据刷新时间"/>
-                                        <wsc:Setting Content="{Binding Overview.RecordTotal}" Header="上传记录总数"/>
+                                    <wsc:SettingsGroup Margin="0,-32,0,0" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewDataCollect}">
+                                        <wsc:Setting Content="{Binding Overview.RefreshTime}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewRefreshTime}"/>
+                                        <wsc:Setting Content="{Binding Overview.RecordTotal}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewRecordTotal}"/>
                                     </wsc:SettingsGroup>
-                                    <wsc:SettingsGroup Margin="0,-16,0,0" Header="深渊数据统计">
-                                        <wsc:Setting Content="{Binding Overview.SpiralAbyssTotal}" Header="总计深渊记录"/>
-                                        <wsc:Setting Padding="16,8" Header="通关深渊记录">
+                                    <wsc:SettingsGroup Margin="0,-16,0,0" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyss}">
+                                        <wsc:Setting Content="{Binding Overview.SpiralAbyssTotal}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssTotal}"/>
+                                        <wsc:Setting Padding="16,8" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssPassed}">
                                             <StackPanel>
                                                 <TextBlock Text="{Binding Overview.SpiralAbyssPassedPercent}"/>
                                                 <TextBlock
@@ -86,7 +86,7 @@
                                                     Text="{Binding Overview.SpiralAbyssPassed}"/>
                                             </StackPanel>
                                         </wsc:Setting>
-                                        <wsc:Setting Padding="16,8" Header="满星深渊记录">
+                                        <wsc:Setting Padding="16,8" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssFullStar}">
                                             <StackPanel>
                                                 <TextBlock Text="{Binding Overview.SpiralAbyssFullStarPercent}"/>
                                                 <TextBlock
@@ -96,8 +96,8 @@
                                                     Text="{Binding Overview.SpiralAbyssFullStar}"/>
                                             </StackPanel>
                                         </wsc:Setting>
-                                        <wsc:Setting Content="{Binding Overview.SpiralAbyssStarAverage}" Header="平均获取渊星"/>
-                                        <wsc:Setting Content="{Binding Overview.SpiralAbyssBattleAverage}" Header="平均战斗次数"/>
+                                        <wsc:Setting Content="{Binding Overview.SpiralAbyssStarAverage}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssStarAverage}"/>
+                                        <wsc:Setting Content="{Binding Overview.SpiralAbyssBattleAverage}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssBattleAverage}"/>
                                     </wsc:SettingsGroup>
                                 </StackPanel>
                             </Flyout>
@@ -105,7 +105,7 @@
                     </AppBarButton>
                 </CommandBar>
             </Pivot.RightHeader>
-            <PivotItem Header="角色使用">
+            <PivotItem Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewAvatarUsageRank}">
                 <Pivot ItemsSource="{Binding AvatarUsageRanks}">
                     <Pivot.HeaderTemplate>
                         <DataTemplate>
@@ -133,7 +133,7 @@
                     </Pivot.ItemTemplate>
                 </Pivot>
             </PivotItem>
-            <PivotItem Header="角色出场">
+            <PivotItem Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewAvatarAppearanceRank}">
                 <Pivot ItemsSource="{Binding AvatarAppearanceRanks}">
                     <Pivot.HeaderTemplate>
                         <DataTemplate>
@@ -161,7 +161,7 @@
                     </Pivot.ItemTemplate>
                 </Pivot>
             </PivotItem>
-            <PivotItem Header="队伍出场">
+            <PivotItem Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewTeamAppearance}">
                 <Pivot ItemsSource="{Binding TeamAppearances}">
                     <Pivot.HeaderTemplate>
                         <DataTemplate>
@@ -194,7 +194,7 @@
                     </Pivot.ItemTemplate>
                 </Pivot>
             </PivotItem>
-            <PivotItem Header="角色持有">
+            <PivotItem Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewAvatarConstellation}">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePresentPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePresentPage.xaml
deleted file mode 100644
index 4976f857..00000000
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePresentPage.xaml
+++ /dev/null
@@ -1,311 +0,0 @@
-<shc:ScopedPage
-    x:Class="Snap.Hutao.View.Page.HutaoDatabasePresentPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:image="using:Snap.Hutao.Control.Image"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:mxi="using:Microsoft.Xaml.Interactivity"
-    xmlns:shc="using:Snap.Hutao.Control"
-    xmlns:shcb="using:Snap.Hutao.Control.Behavior"
-    xmlns:shmbh="using:Snap.Hutao.Model.Binding.Hutao"
-    xmlns:shv="using:Snap.Hutao.ViewModel"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
-    xmlns:wsc="using:WinUICommunity.SettingsUI.Controls"
-    d:DataContext="{d:DesignInstance shv:HutaoDatabaseViewModel}"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-    mc:Ignorable="d">
-    <mxi:Interaction.Behaviors>
-        <shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
-    </mxi:Interaction.Behaviors>
-
-    <Page.Resources>
-        <DataTemplate x:Key="TeamItemTemplate" x:DataType="shmbh:Team">
-            <Border Margin="0,0,8,8" Style="{StaticResource BorderCardStyle}">
-                <Grid Margin="6">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="108"/>
-                    </Grid.ColumnDefinitions>
-                    <ItemsControl HorizontalAlignment="Left" ItemsSource="{Binding}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <cwuc:UniformGrid ColumnSpacing="6" Columns="4"/>
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <image:CachedImage
-                                    Width="48"
-                                    Height="48"
-                                    Margin="-4,-20,-4,-4"
-                                    Source="{Binding SideIcon}"/>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                    <StackPanel
-                        Grid.Column="1"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                        <TextBlock Text="{Binding Rate}"/>
-                        <TextBlock
-                            Margin="0,2,0,0"
-                            Opacity="0.6"
-                            Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="{Binding Name}"/>
-                    </StackPanel>
-
-                </Grid>
-            </Border>
-        </DataTemplate>
-    </Page.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="auto"/>
-            <RowDefinition/>
-        </Grid.RowDefinitions>
-        <CommandBar DefaultLabelPosition="Right">
-            <AppBarButton
-                Command="{Binding ExportAsImageCommand}"
-                CommandParameter="{Binding ElementName=RenderTargetContainer}"
-                Label="导出图片"/>
-        </CommandBar>
-        <ScrollViewer Grid.Row="1">
-            <StackPanel
-                Name="RenderTargetContainer"
-                MaxWidth="956"
-                Padding="16"
-                Background="Transparent">
-                <TextBlock
-                    Margin="0,0,0,16"
-                    Style="{StaticResource SubheaderTextBlockStyle}"
-                    Text="胡桃数据库 统计数据"/>
-                <wsc:Setting Content="{Binding Overview.RefreshTime}" Header="数据刷新时间"/>
-                <cwuc:UniformGrid
-                    Margin="0,16"
-                    ColumnSpacing="16"
-                    Columns="3"
-                    Orientation="Vertical"
-                    RowSpacing="16">
-                    <wsc:Setting Content="{Binding Overview.RecordTotal}" Header="上传记录总数"/>
-                    <wsc:Setting Content="{Binding Overview.SpiralAbyssTotal}" Header="总计深渊记录"/>
-                    <wsc:Setting Padding="16,8" Header="通关深渊记录">
-                        <StackPanel>
-                            <TextBlock Text="{Binding Overview.SpiralAbyssPassedPercent}"/>
-                            <TextBlock
-                                HorizontalAlignment="Right"
-                                Opacity="0.7"
-                                Style="{StaticResource CaptionTextBlockStyle}"
-                                Text="{Binding Overview.SpiralAbyssPassed}"/>
-                        </StackPanel>
-                    </wsc:Setting>
-                    <wsc:Setting Padding="16,8" Header="满星深渊记录">
-                        <StackPanel>
-                            <TextBlock Text="{Binding Overview.SpiralAbyssFullStarPercent}"/>
-                            <TextBlock
-                                HorizontalAlignment="Right"
-                                Opacity="0.7"
-                                Style="{StaticResource CaptionTextBlockStyle}"
-                                Text="{Binding Overview.SpiralAbyssFullStar}"/>
-                        </StackPanel>
-                    </wsc:Setting>
-                    <wsc:Setting Content="{Binding Overview.SpiralAbyssStarAverage}" Header="平均获取渊星"/>
-                    <wsc:Setting Content="{Binding Overview.SpiralAbyssBattleAverage}" Header="平均战斗次数"/>
-                </cwuc:UniformGrid>
-
-                <TextBlock
-                    Margin="0,0,0,16"
-                    Style="{StaticResource TitleTextBlockStyle}"
-                    Text="第 12 层 角色使用率"
-                    Visibility="Collapsed"/>
-                <GridView
-                    Margin="0,0,-16,-8"
-                    ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
-                    ItemsSource="{Binding AvatarUsageRanks[0].Avatars}"
-                    SelectionMode="None"
-                    Visibility="Collapsed">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <shvc:BottomTextControl Text="{Binding Rate}">
-                                <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
-                            </shvc:BottomTextControl>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </GridView>
-
-                <TextBlock
-                    Margin="0,0,0,16"
-                    Style="{StaticResource TitleTextBlockStyle}"
-                    Text="第 12 层 角色出场率"
-                    Visibility="Collapsed"/>
-                <GridView
-                    Margin="0,0,-16,-8"
-                    ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
-                    ItemsSource="{Binding AvatarAppearanceRanks[0].Avatars}"
-                    SelectionMode="None"
-                    Visibility="Collapsed">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <shvc:BottomTextControl Text="{Binding Rate}">
-                                <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
-                            </shvc:BottomTextControl>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </GridView>
-
-                <StackPanel Visibility="Visible">
-                    <TextBlock
-                        Margin="0,0,0,16"
-                        Style="{StaticResource TitleTextBlockStyle}"
-                        Text="第 12 层 队伍出场次数"/>
-                    <TextBlock
-                        Margin="0,0,0,8"
-                        Style="{StaticResource SubtitleTextBlockStyle}"
-                        Text="上半"/>
-                    <GridView
-                        Margin="0,0,-16,-8"
-                        ItemTemplate="{StaticResource TeamItemTemplate}"
-                        ItemsSource="{Binding TeamAppearances[0].Up}"
-                        SelectionMode="None"/>
-                    <TextBlock
-                        Margin="0,0,0,8"
-                        Style="{StaticResource SubtitleTextBlockStyle}"
-                        Text="下半"/>
-                    <GridView
-                        Margin="0,0,-16,-8"
-                        ItemTemplate="{StaticResource TeamItemTemplate}"
-                        ItemsSource="{Binding TeamAppearances[0].Down}"
-                        SelectionMode="None"/>
-                </StackPanel>
-
-                <StackPanel Visibility="Collapsed">
-                    <TextBlock
-                        Margin="0,0,0,16"
-                        Style="{StaticResource SubheaderTextBlockStyle}"
-                        Text="角色/命座持有率"/>
-                    <Grid Margin="0,0,0,0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="48"/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock
-                            Grid.Column="0"
-                            Margin="6"
-                            HorizontalAlignment="Center"
-                            Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="角色"/>
-                        <TextBlock
-                            Grid.Column="1"
-                            Margin="6"
-                            HorizontalAlignment="Center"
-                            Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="持有"/>
-                        <TextBlock
-                            Grid.Column="2"
-                            Margin="6"
-                            HorizontalAlignment="Center"
-                            Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="0 命"/>
-                        <TextBlock
-                            Grid.Column="3"
-                            Margin="6"
-                            HorizontalAlignment="Center"
-                            Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="1 命"/>
-                        <TextBlock
-                            Grid.Column="4"
-                            Margin="6"
-                            HorizontalAlignment="Center"
-                            Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="2 命"/>
-                        <TextBlock
-                            Grid.Column="5"
-                            Margin="6"
-                            HorizontalAlignment="Center"
-                            Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="3 命"/>
-                        <TextBlock
-                            Grid.Column="6"
-                            Margin="6"
-                            HorizontalAlignment="Center"
-                            Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="4 命"/>
-                        <TextBlock
-                            Grid.Column="7"
-                            Margin="6"
-                            HorizontalAlignment="Center"
-                            Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="5 命"/>
-                        <TextBlock
-                            Grid.Column="8"
-                            Margin="6"
-                            HorizontalAlignment="Center"
-                            Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="6 命"/>
-                    </Grid>
-                    <ItemsControl
-                        Margin="0,0,0,8"
-                        HorizontalContentAlignment="Stretch"
-                        ItemsSource="{Binding AvatarConstellationInfos}">
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <Border Margin="0,0,0,4" Style="{StaticResource BorderCardStyle}">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="auto"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-
-                                        <shvc:ItemIcon
-                                            Width="48"
-                                            Height="48"
-                                            Icon="{Binding Icon}"
-                                            Quality="{Binding Quality}"/>
-
-                                        <Grid Grid.Column="1">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="1*"/>
-                                                <ColumnDefinition Width="7*"/>
-                                            </Grid.ColumnDefinitions>
-                                            <TextBlock
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Text="{Binding Rate}"/>
-                                            <ItemsControl Grid.Column="1" ItemsSource="{Binding Rates}">
-                                                <ItemsControl.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <cwuc:UniformGrid Columns="7"/>
-                                                    </ItemsPanelTemplate>
-                                                </ItemsControl.ItemsPanel>
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <TextBlock
-                                                            HorizontalAlignment="Center"
-                                                            VerticalAlignment="Center"
-                                                            Text="{Binding}"/>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
-                                        </Grid>
-                                    </Grid>
-                                </Border>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </StackPanel>
-
-                <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="Snap Hutao API @ DGP Studio"/>
-            </StackPanel>
-        </ScrollViewer>
-    </Grid>
-
-
-</shc:ScopedPage>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePresentPage.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePresentPage.xaml.cs
deleted file mode 100644
index 77705558..00000000
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePresentPage.xaml.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Control;
-using Snap.Hutao.ViewModel;
-
-namespace Snap.Hutao.View.Page;
-
-/// <summary>
-/// 用于展示用途的胡桃数据库页面
-/// 仅用于发布相关的统计数据
-/// </summary>
-public sealed partial class HutaoDatabasePresentPage : ScopedPage
-{
-    /// <summary>
-    /// 构造一个新的胡桃数据库页面
-    /// </summary>
-    public HutaoDatabasePresentPage()
-    {
-        InitializeComponent();
-        InitializeWith<HutaoDatabaseViewModel>();
-    }
-}
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml
index ed8945aa..0a2af1be 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml
@@ -32,10 +32,6 @@
             <wsc:Setting Header="DownloadStaticFileTest">
                 <Button Command="{Binding DownloadStaticFileCommand}" Content="Download"/>
             </wsc:Setting>
-
-            <wsc:Setting Header="HutaoDatabasePresentTest">
-                <Button Command="{Binding HutaoDatabasePresentCommand}" Content="Navigate"/>
-            </wsc:Setting>
         </wsc:SettingsGroup>
     </ScrollViewer>
 </shc:ScopedPage>
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs
index 29f3f76c..c19b1385 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs
@@ -27,7 +27,6 @@ internal class TestViewModel : Abstraction.ViewModel
         ShowAdoptCalculatorDialogCommand = new AsyncRelayCommand(ShowAdoptCalculatorDialogAsync);
         DangerousLoginMihoyoBbsCommand = new AsyncRelayCommand(DangerousLoginMihoyoBbsAsync);
         DownloadStaticFileCommand = new AsyncRelayCommand(DownloadStaticFileAsync);
-        HutaoDatabasePresentCommand = new RelayCommand(HutaoDatabasePresent);
     }
 
     /// <summary>
@@ -50,11 +49,6 @@ internal class TestViewModel : Abstraction.ViewModel
     /// </summary>
     public ICommand DownloadStaticFileCommand { get; }
 
-    /// <summary>
-    /// 胡桃数据库呈现命令
-    /// </summary>
-    public ICommand HutaoDatabasePresentCommand { get; }
-
     private async Task ShowCommunityGameRecordDialogAsync()
     {
         // ContentDialog must be created by main thread.
@@ -121,11 +115,4 @@ internal class TestViewModel : Abstraction.ViewModel
             }
         }
     }
-
-    private void HutaoDatabasePresent()
-    {
-        Ioc.Default
-            .GetRequiredService<Service.Navigation.INavigationService>()
-            .Navigate<View.Page.HutaoDatabasePresentPage>(Service.Navigation.INavigationAwaiter.Default);
-    }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/WikiAvatarViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/WikiAvatarViewModel.cs
index 6a4d4f00..eeedd48e 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/WikiAvatarViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/WikiAvatarViewModel.cs
@@ -204,49 +204,52 @@ internal class WikiAvatarViewModel : Abstraction.ViewModel
 
         private static bool DoFilter(string input, Avatar avatar)
         {
-            bool keep = true;
+            List<bool> matches = new();
 
             foreach (StringSegment segment in new StringTokenizer(input, ' '.Enumerate().ToArray()))
             {
                 string value = segment.ToString();
 
+                if (avatar.Name == value)
+                {
+                    matches.Add(true);
+                    continue;
+                }
+
                 if (value == "火" || value == "水" || value == "草" || value == "雷" || value == "冰" || value == "风" || value == "岩")
                 {
-                    keep = keep && avatar.FetterInfo.VisionBefore == value;
+                    matches.Add(avatar.FetterInfo.VisionBefore == value);
                     continue;
                 }
 
                 if (IntrinsicImmutables.AssociationTypes.Contains(value))
                 {
-                    keep = keep && avatar.FetterInfo.Association.GetDescriptionOrNull() == value;
+                    matches.Add(avatar.FetterInfo.Association.GetDescriptionOrNull() == value);
                     continue;
                 }
 
                 if (IntrinsicImmutables.WeaponTypes.Contains(value))
                 {
-                    keep = keep && avatar.Weapon.GetDescriptionOrNull() == value;
+                    matches.Add(avatar.Weapon.GetDescriptionOrNull() == value);
                     continue;
                 }
 
                 if (IntrinsicImmutables.ItemQualities.Contains(value))
                 {
-                    keep = keep && avatar.Quality.GetDescriptionOrNull() == value;
+                    matches.Add(avatar.Quality.GetDescriptionOrNull() == value);
                     continue;
                 }
 
                 if (IntrinsicImmutables.BodyTypes.Contains(value))
                 {
-                    keep = keep && avatar.Body.GetDescriptionOrNull() == value;
+                    matches.Add(avatar.Body.GetDescriptionOrNull() == value);
                     continue;
                 }
 
-                if (avatar.Name == value)
-                {
-                    keep = true;
-                }
+                matches.Add(false);
             }
 
-            return keep;
+            return matches.Count > 0 && matches.Aggregate((a, b) => a && b);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/WikiWeaponViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/WikiWeaponViewModel.cs
index ac36e97d..856f0998 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/WikiWeaponViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/WikiWeaponViewModel.cs
@@ -202,37 +202,38 @@ internal class WikiWeaponViewModel : Abstraction.ViewModel
 
         private static bool DoFilter(string input, Weapon weapon)
         {
-            bool keep = true;
+            List<bool> matches = new();
 
             foreach (StringSegment segment in new StringTokenizer(input, ' '.Enumerate().ToArray()))
             {
                 string value = segment.ToString();
 
+                if (weapon.Name == value)
+                {
+                    matches.Add(true);
+                    continue;
+                }
+
                 if (IntrinsicImmutables.WeaponTypes.Contains(value))
                 {
-                    keep = keep && weapon.WeaponType.GetDescriptionOrNull() == value;
+                    matches.Add(weapon.WeaponType.GetDescriptionOrNull() == value);
                     continue;
                 }
 
                 if (IntrinsicImmutables.ItemQualities.Contains(value))
                 {
-                    keep = keep && weapon.Quality.GetDescriptionOrNull() == value;
+                    matches.Add(weapon.Quality.GetDescriptionOrNull() == value);
                     continue;
                 }
 
                 if (IntrinsicImmutables.FightProperties.Contains(value))
                 {
-                    keep = keep && weapon.Property.Properties.ElementAtOrDefault(1).GetDescriptionOrNull() == value;
+                    matches.Add(weapon.Property.Properties.ElementAtOrDefault(1).GetDescriptionOrNull() == value);
                     continue;
                 }
-
-                if (weapon.Name == value)
-                {
-                    keep = true;
-                }
             }
 
-            return keep;
+            return matches.Count > 0 && matches.Aggregate((a, b) => a && b);
         }
     }
 }
\ No newline at end of file