fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: changed config name to make more logical sense

Browse Source
This commit is contained in:
Constrat
2024-08-08 00:05:02 +02:00
parent 43a097d03b
commit 06d45ea0bf
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaWpfGui/Constants/ConfigurationKeys.cs
View File

@@ -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";

30
src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
View File

@@ -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));
/// <summary>
/// Gets or sets a value indicating whether to bypass the daily limit.
/// </summary>
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

2
src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
View File

@@ -28,7 +28,7 @@
Block.TextAlignment="Left"
Visibility="{c:Binding CreditVisitFriendsEnabledDisplay}"
Content="{DynamicResource OnlyOnceADay}"
IsChecked="{Binding BypassDailyLimit}"/>
IsChecked="{Binding CreditVisitOnceADay}"/>
<CheckBox
Margin="0,10"
Block.TextAlignment="Left"