Fun/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact.git synced 2026-05-19 09:35:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

more user-friendly parsing of error messages

Browse Source
This commit is contained in:
huiyadanli
2024-02-08 19:56:10 +08:00
parent a2255f8250
commit 2d6b399a07
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
BetterGenshinImpact/GameTask/AutoPick/AutoPickTrigger.cs
View File

@@ -9,6 +9,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Text.Json;
using System.Windows.Forms;
using BetterGenshinImpact.Helpers;
using WindowsInput;
@@ -45,16 +46,32 @@ public class AutoPickTrigger : ITaskTrigger
public void Init()
{
IsEnabled = TaskContext.Instance().Config.AutoPickConfig.Enabled;
var blackListJson = Global.ReadAllTextIfExist("User\\pick_black_lists.json");
if (!string.IsNullOrEmpty(blackListJson))
try
{
_blackList = JsonSerializer.Deserialize<List<string>>(blackListJson) ?? new List<string>();
var blackListJson = Global.ReadAllTextIfExist("User\\pick_black_lists.json");
if (!string.IsNullOrEmpty(blackListJson))
{
_blackList = JsonSerializer.Deserialize<List<string>>(blackListJson) ?? new List<string>();
}
}
catch (Exception e)
{
_logger.LogError(e, "读取拾取黑名单失败");
MessageBox.Show("读取拾取黑名单失败，请确认修改后的拾取黑名单内容格式是否正确！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
var whiteListJson = Global.ReadAllTextIfExist("User\\pick_white_lists.json");
if (!string.IsNullOrEmpty(whiteListJson))
try
{
_whiteList = JsonSerializer.Deserialize<List<string>>(whiteListJson) ?? new List<string>();
var whiteListJson = Global.ReadAllTextIfExist("User\\pick_white_lists.json");
if (!string.IsNullOrEmpty(whiteListJson))
{
_whiteList = JsonSerializer.Deserialize<List<string>>(whiteListJson) ?? new List<string>();
}
}
catch (Exception e)
{
_logger.LogError(e, "读取拾取白名单失败");
MessageBox.Show("读取拾取白名单失败，请确认修改后的拾取白名单内容格式是否正确！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
@@ -72,7 +89,7 @@ public class AutoPickTrigger : ITaskTrigger
public void OnCapture(CaptureContent content)
{
var speedTimer = new SpeedTimer();
var speedTimer = new SpeedTimer();
content.CaptureRectArea.Find(_autoPickAssets.FRo, foundRectArea =>
{
speedTimer.Record("识别到 F 拾取键");
@@ -136,6 +153,7 @@ public class AutoPickTrigger : ITaskTrigger
{
return;
}
// 单个字符不拾取
if (text.Length <= 1)
{
@@ -148,6 +166,7 @@ public class AutoPickTrigger : ITaskTrigger
Simulation.SendInput.Keyboard.KeyPress(VirtualKeyCode.VK_F);
return;
}
speedTimer.Record("白名单判断");
if (isExcludeIcon)
@@ -160,6 +179,7 @@ public class AutoPickTrigger : ITaskTrigger
{
return;
}
speedTimer.Record("黑名单判断");
LogPick(content, text);