diff --git a/MAA.sln.DotSettings b/MAA.sln.DotSettings
index bed4fe8374..25ff3e8901 100644
--- a/MAA.sln.DotSettings
+++ b/MAA.sln.DotSettings
@@ -55,6 +55,7 @@
True
True
True
+ True
True
True
True
@@ -97,6 +98,7 @@
True
True
True
+ True
True
True
True
diff --git a/src/MaaWpfGui/Models/ResourceUpdater.cs b/src/MaaWpfGui/Models/ResourceUpdater.cs
index 7a6d506e4d..be8deb034d 100644
--- a/src/MaaWpfGui/Models/ResourceUpdater.cs
+++ b/src/MaaWpfGui/Models/ResourceUpdater.cs
@@ -92,6 +92,8 @@ namespace MaaWpfGui.Models
_logger.Error("Failed to delete MaaResource: " + e.Message);
}
+ SettingsViewModel.VersionUpdateSettings.NewResourceFoundInfo = string.Empty;
+
return true;
}
@@ -200,6 +202,8 @@ namespace MaaWpfGui.Models
_ => $"「{version.ToString(LocalizationHelper.CustomCultureInfo.DateTimeFormat.ShortDatePattern.Replace("yyyy", string.Empty).Trim('/', '.'))} {releaseNote}」",
};
+ SettingsViewModel.VersionUpdateSettings.NewResourceFoundInfo = string.Format(LocalizationHelper.GetString("MirrorChyanResourceUpdateShortTip"), releaseNote);
+
if (string.IsNullOrEmpty(cdk))
{
ToastNotification.ShowDirect(string.Format(LocalizationHelper.GetString("MirrorChyanResourceUpdateTip"), releaseNote));
@@ -270,6 +274,8 @@ namespace MaaWpfGui.Models
_logger.Error("Failed to delete MaaResourceMirrorchyan: " + e.Message);
}
+ SettingsViewModel.VersionUpdateSettings.NewResourceFoundInfo = string.Empty;
+
return true;
}
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 64cd72bd5b..05b8cc298a 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -277,7 +277,8 @@ You can cancel this popup by clicking the Settings - About Us - Issue Reporting
MirrorChyan
Fill after switching source
Software update detected. Please go to 「Settings - Update Settings」 to configure MirrorChyan CDK or switch to Global Source.
- Resource update {0} detected. Please go to 「Settings- Update Settings- Resource Update」 to update manually, or fill in MirrorChayn CDK to update automatically.
+ Resource update {0} detected. Please go to 「Settings- Update Settings - Resource Update」 to update manually, or fill in MirrorChayn CDK to update automatically.
+ Resource update {0} detected
The CDK has expired. Please use a new CDK for authorization.
The CDK is invalid. Please check if the input is correct.
The CDK has reached the maximum download limit for today. Please try again tomorrow.
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 1193328d62..76327ee818 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -278,6 +278,7 @@
更新ソース切替後入力
ソフトウェア更新が検出されました。「設定 - 更新設定」に移動して MirrorChyan CDK を設定するか、グローバル ソースに切り替えてください。
リソース更新 {0} が検出されました。「設定 - 更新設定 - リソース更新」に移動して手動で更新するか、MirrorChayn CDK を入力して自動的に更新してください。
+ リソース更新 {0} が検出されました
CDK の有効期限が切れました。新しい CDK を使用して認証してください。
CDK が無効です。入力が正しいか確認してください。
CDK の本日のダウンロード回数が上限に達しました。明日もう一度お試しください。
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 5a4f3ecd03..a5d08e4ae6 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -278,6 +278,7 @@
소스 전환 후 입력
소프트웨어 업데이트가 감지되었습니다. 「설정 - 업데이트 설정」으로 이동하여 MirrorChyan CDK를 구성하거나 글로벌 소스로 전환하세요.
리소스 업데이트 {0}이 감지되었습니다. 「설정 - 업데이트 설정 - 리소스 업데이트」로 이동하여 수동으로 업데이트하거나, MirrorChyan CDK를 입력하여 자동으로 업데이트하세요.
+ 리소스 업데이트 {0}이 감지되었습니다
CDK가 만료되었습니다. 새 CDK로 인증해 주세요.
CDK가 유효하지 않습니다. 입력값이 올바른지 확인해 주세요.
해당 CDK의 일일 다운로드 횟수가 제한에 도달했습니다. 내일 다시 시도해 주세요.
@@ -782,7 +783,7 @@ C:\\leidian\\LDPlayer9
작업 완료:
작전 시작:
작전 완료
- 모든 작업을 완료했습니다!\n(소요 시간: {0})
+ 모든 작업을 완료했습니다!\n(소요 시간: {0})
{DateTime}에 이성이 모두 회복됩니다.\n(남은 시간: {TimeDiff})
MAA가 {Preset} 구성으로 모든 작업을 {DateTime}에 완료했습니다. (소요 시간: {TimeDiff})
작업 시작됨
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 653c68c7f7..f1f7ed6d21 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -278,6 +278,7 @@
切换更新源后填写
检测到软件更新。请前往「设置-更新设置」配置 Mirror酱 CDK 或切换海外源。
检测到资源更新{0}。请前往「设置-更新设置-资源更新」手动更新，或配置 Mirror酱 CDK 以自动更新。
+ 检测到资源更新{0}
CDK 已过期，请使用新的 CDK 进行授权。
CDK 无效，请检查输入是否正确。
CDK 今日下载次数已达上限，请明日再试。
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index bafff33a8d..10caf4bd5c 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -278,6 +278,7 @@
切換更新源後填寫
偵測到軟體更新。請前往「設定-更新設定」設定 MirrorChyan CDK 或切換到全域來源。
偵測到資源更新{0}。請前往「設定-更新設定-資源更新」手動更新，或設定 MirrorChayn CDK 以自動更新。
+ 偵測到資源更新{0}
CDK 已過期，請使用新的 CDK 進行授權。
CDK 無效，請檢查輸入是否正確。
CDK 今日下載次數已達上限，請明日再試。
diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
index 316d03a13e..63421eb042 100644
--- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
@@ -691,6 +691,12 @@ namespace MaaWpfGui.ViewModels.UI
updateTip = $"{LocalizationHelper.GetString("NewVersionFoundTitle")}: {updateTag} - ";
}
+ var newResourceFoundInfo = VersionUpdateSettings.NewResourceFoundInfo;
+ if (!string.IsNullOrEmpty(newResourceFoundInfo))
+ {
+ updateTip += $"{newResourceFoundInfo} - ";
+ }
+
string prefix = ConfigurationHelper.GetValue(ConfigurationKeys.WindowTitlePrefix, string.Empty);
if (!string.IsNullOrEmpty(prefix))
{
diff --git a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
index 88ea331229..d65ceb43ed 100644
--- a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
@@ -82,6 +82,7 @@ public class VersionUpdateViewModel : Screen
{
SetAndNotify(ref _updateTag, value);
ConfigurationHelper.SetGlobalValue(ConfigurationKeys.VersionName, value);
+ Instances.SettingsViewModel.UpdateWindowTitle();
}
}
diff --git a/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
index b9df3db6a9..685705c576 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
@@ -94,6 +94,18 @@ public class VersionUpdateSettingsUserControlModel : PropertyChangedBase
private static string _resourceVersion = _resourceInfo.VersionName;
+ private string _newResourceFoundInfo = string.Empty;
+
+ public string NewResourceFoundInfo
+ {
+ get => _newResourceFoundInfo;
+ set
+ {
+ SetAndNotify(ref _newResourceFoundInfo, value);
+ Instances.SettingsViewModel.UpdateWindowTitle();
+ }
+ }
+
///
/// Gets or sets the resource version.
///