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

Merge branch 'dev'

Browse Source
This commit is contained in:
MistEO
2022-06-16 02:19:31 +08:00
parent e275b6af6d 98ec5249e9
commit 08730a1da6
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/MeoAssistant/Controller.cpp
View File

@@ -560,12 +560,12 @@ bool asst::Controller::screencap()
{
LogTraceFunction;
if (true) {
m_inited = true;
std::unique_lock<std::shared_mutex> image_lock(m_image_mutex);
m_cache_image = cv::imread("err/1.png");
return true;
}
//if (true) {
// m_inited = true;
// std::unique_lock<std::shared_mutex> image_lock(m_image_mutex);
// m_cache_image = cv::imread("err/1.png");
// return true;
//}
DecodeFunc decode_raw = [&](std::vector<uchar>& data) -> bool {
if (data.empty()) {

2
src/MeoAssistant/MeoAssistant.vcxproj
View File

@@ -335,7 +335,7 @@
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties _1_1_4_1_1_4resource_4config_1json__JsonSchema="" />
<UserProperties _1_1_4_1_1_4resource_4config_1json__JsonSchema="" _1_1_4_1_1_4resource_4tasks_1json__JsonSchema="../docs/maa_tasks_schema.json" />
</VisualStudio>
</ProjectExtensions>
</Project>

4
tools/TestCaller/main.cpp
View File

@@ -24,7 +24,7 @@ int main(/*int argc, char** argv*/)
return -1;
}
bool connected = AsstConnect(ptr, "adb", "127.0.0.1:5555", nullptr);
bool connected = AsstConnect(ptr, "adb", "127.0.0.1:5555", "DEBUG");
if (!connected) {
std::cerr << "connect failed" << std::endl;
AsstDestroy(ptr);
@@ -76,7 +76,7 @@ int main(/*int argc, char** argv*/)
//
// AsstAppendTask(ptr, "Roguelike", nullptr);
AsstAppendTask(ptr, "Depot", nullptr);
AsstAppendTask(ptr, "Debug", nullptr);
// AsstAppendTask(ptr, "Copilot", R"(
//{