fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复定时器配置从未选择时的逻辑错误

Browse Source
This commit is contained in:
uye
2023-07-20 22:41:02 +08:00
parent ff8d10d107
commit 9843fbc036
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/MaaWpfGui/Helper/ConfigurationHelper.cs
View File

@@ -15,6 +15,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Windows.Input;
using MaaWpfGui.Constants;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -360,6 +361,24 @@ namespace MaaWpfGui.Helper
return SetGlobalValue($"Timer.Timer{i + 1}Min", value);
}
public static string GetTimerConfig(int i, string defaultValue)
{
// 防止未配置过任务时，读取到的是当前值，切换配置后仍会改变当前值
var hasValue = _globalKvs.TryGetValue($"Timer.Timer{i + 1}.Config", out var value);
if (!hasValue)
{
SetGlobalValue($"Timer.Timer{i + 1}.Config", value);
return defaultValue;
}
return GetGlobalValue($"Timer.Timer{i + 1}.Config", defaultValue); ;
}
public static bool SetTimerConfig(int i, string value)
{
return SetGlobalValue($"Timer.Timer{i + 1}.Config", value);
}
public static string GetTaskOrder(string task, string defaultValue)
{
return GetValue("TaskQueue.Order." + task, defaultValue);
@@ -370,16 +389,6 @@ namespace MaaWpfGui.Helper
return SetValue("TaskQueue.Order." + task, value);
}
public static string GetTimerConfig(int i, string defaultValue)
{
return GetValue($"Timer.Timer{i + 1}.Config", defaultValue);
}
public static bool SetTimerConfig(int i, string value)
{
return SetValue($"Timer.Timer{i + 1}.Config", value);
}
public static void Release()
{
lock (_lock)