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

fix: 修复在部分情况下，刷理智的当前理智识别结果丢失分隔符 (#6208)

Browse Source 
![C1WT`{R)Z2T$IP52%{P44A1](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/102887808/5ed7bae3-b8f9-41fa-b3f0-5ba53eda630c)
This commit is contained in:
MistEO
2023-09-05 01:20:48 +08:00
committed by GitHub
parent 2c7246f1c3 a17cfda455
commit 0afbdadb79
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/MaaCore/Task/Fight/SanityBeforeStagePlugin.cpp
View File

@@ -2,11 +2,11 @@
#include <regex>
#include "Config/TaskData.h"
#include "Controller/Controller.h"
#include "Utils/ImageIo.hpp"
#include "Utils/Logger.hpp"
#include "Vision/OCRer.h"
#include "Controller/Controller.h"
#include "Config/TaskData.h"
#include "Vision/RegionOCRer.h"
bool asst::SanityBeforeStagePlugin::verify(AsstMsg msg, const json::value& details) const
{
@@ -24,7 +24,8 @@ bool asst::SanityBeforeStagePlugin::verify(AsstMsg msg, const json::value& detai
}
}
bool asst::SanityBeforeStagePlugin::_run() {
bool asst::SanityBeforeStagePlugin::_run()
{
LogTraceFunction;
get_sanity();
@@ -39,16 +40,24 @@ void asst::SanityBeforeStagePlugin::get_sanity()
{
LogTraceFunction;
// 直接摘抄博朗台部分，DrGrandetTaskPlugin
OCRer analyzer(ctrler()->get_image());
RegionOCRer analyzer(ctrler()->get_image());
analyzer.set_task_info("SanityMatch");
if (!analyzer.analyze()) {
Log.info(__FUNCTION__, "Current Sanity analyze failed");
return;
}
auto text = analyzer.get_result().front().text;
std::string text = analyzer.get_result().text;
Log.info("Current Sanity:" + text);
if (!text.find('/') && text.length() > 2) {
if (text[text.length() - 3] == '1' && text[text.length() - 2] >= '0' && text[text.length() - 2] <= '3') {
text = text.substr(0, text.length() - 3) + '/' + text.substr(text.length() - 3);
}
else {
text = text.substr(0, text.length() - 2) + '/' + text.substr(text.length() - 2);
}
}
Log.info(__FUNCTION__, "Current Sanity:" + text);
json::value sanity_info = basic_info_with_what("SanityBeforeStage");
sanity_info["details"]["sanity"] = text;