diff --git a/src/MaaWpfGui/Constants/ConfigurationKeys.cs b/src/MaaWpfGui/Constants/ConfigurationKeys.cs index b172a61827..7e4f536578 100644 --- a/src/MaaWpfGui/Constants/ConfigurationKeys.cs +++ b/src/MaaWpfGui/Constants/ConfigurationKeys.cs @@ -154,7 +154,7 @@ namespace MaaWpfGui.Constants public const string CreditFightSelectFormation = "Visit.CreditFightSelectFormation"; public const string LastCreditVisitFriendsTime = "Mall.LastCreditVisitFriendsTime"; - public const string BypassCreditVisitDaily = "Mall.BypassCreditVisitDaily"; + public const string CreditVisitOnceADay = "Mall.CreditVisitOnceADay"; public const string CreditVisitFriendsEnabled = "Mall.CreditVisitFriendsEnabled"; public const string CreditShopping = "Mall.CreditShopping"; public const string CreditFirstListNew = "Mall.CreditFirstListNew"; diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index ed6077d036..2a25df78c5 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -2542,18 +2542,18 @@ namespace MaaWpfGui.ViewModels.UI } } - private bool _bypassDailyLimit = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.BypassCreditVisitDaily, bool.FalseString)); + private bool _creditVisitOnceADay = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.CreditVisitOnceADay, bool.FalseString)); /// /// Gets or sets a value indicating whether to bypass the daily limit. /// - public bool BypassDailyLimit + public bool CreditVisitOnceADay { - get => _bypassDailyLimit; + get => _creditVisitOnceADay; set { - SetAndNotify(ref _bypassDailyLimit, value); - ConfigurationHelper.SetValue(ConfigurationKeys.BypassCreditVisitDaily, value.ToString()); + SetAndNotify(ref _creditVisitOnceADay, value); + ConfigurationHelper.SetValue(ConfigurationKeys.CreditVisitOnceADay, value.ToString()); } } @@ -2566,24 +2566,20 @@ namespace MaaWpfGui.ViewModels.UI { get { - if (!_bypassDailyLimit) + if (_creditVisitOnceADay) { - return true; - } - - try - { - if (DateTime.UtcNow.ToYjDate() > DateTime.ParseExact(_lastCreditVisitFriendsTime.Replace('-', '/'), "yyyy/MM/dd HH:mm:ss", CultureInfo.InvariantCulture)) + try + { + return DateTime.UtcNow.ToYjDate() > DateTime.ParseExact(_lastCreditVisitFriendsTime.Replace('-', '/'), "yyyy/MM/dd HH:mm:ss", CultureInfo.InvariantCulture) + && _creditVisitFriendsEnabled; + } + catch { return _creditVisitFriendsEnabled; } } - catch - { - return _creditVisitFriendsEnabled; - } - return false; + return true; } set diff --git a/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml index a2398d57b6..a516110a57 100644 --- a/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml @@ -28,7 +28,7 @@ Block.TextAlignment="Left" Visibility="{c:Binding CreditVisitFriendsEnabledDisplay}" Content="{DynamicResource OnlyOnceADay}" - IsChecked="{Binding BypassDailyLimit}"/> + IsChecked="{Binding CreditVisitOnceADay}"/>