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

fix: 修复理智数据的一系列问题

Browse Source
This commit is contained in:
zzyyyl
2023-09-25 14:45:41 +08:00
parent eae6c5f6e8
commit de9ffbc625
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaCore/Assistant.cpp
View File

@@ -423,7 +423,7 @@ void Assistant::working_proc()
callback_json["finished_tasks"] = json::array(finished_tasks);
const auto& sanity_report = status()->get_str(Status::FightSanityReport);
if (sanity_report) {
if (sanity_report && !sanity_report.value().empty()) {
// [100, 135, "2023-09-01 09:31:53.527"]
auto sanity_array = json::array(json::parse(*sanity_report).value_or(json::value(json::array())));
callback_json["sanity"] = sanity_array;

5
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -623,6 +623,11 @@ namespace MaaWpfGui.Main
break;
}
if (!sanity_report.Select(i => i.Type).SequenceEqual(new[] { JTokenType.Integer, JTokenType.Integer, JTokenType.String }))
{
break;
}
int[] sanity = sanity_report.Take(2).Select(i => (int)i).ToArray();
if (sanity[0] < 0 || sanity[1] <= 1)
{