Merge remote-tracking branch 'upstream/main' into main

MaaXYZ · Nov 16, 2023 · 7538cdf · 7538cdf
2 parents 7267316 + c779548
commit 7538cdf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/assets/resource/pipeline/awards.json b/assets/resource/pipeline/awards.json
@@ -203,6 +203,7 @@
         "is_sub": true,
         "recognition": "TemplateMatch",
         "template": "Awards/JukeboxAwardsBadge.png",
+        "threshold": 0.8,
         "roi": [
             967,
             1,

diff --git a/assets/resource/pipeline/psychube.json b/assets/resource/pipeline/psychube.json
@@ -76,6 +76,7 @@
             179
         ],
         "action": "Click",
+        "post_wait_freezes": 1,
         "next": [
             "PsychubeReadyForAction",
             "PsychubeStages_7"
@@ -103,10 +104,18 @@
         "recognition": "TemplateMatch",
         "template": "Psychube/SwitchToReplay.png",
         "roi": [
-            781,
-            581,
-            145,
-            139
+            [
+                781,
+                581,
+                145,
+                139
+            ],
+            [
+                548,
+                569,
+                166,
+                151
+            ]
         ],
         "action": "Click",
         "next": [
@@ -125,6 +134,7 @@
             134
         ],
         "action": "Click",
+        "post_wait_freezes": 1,
         "next": [
             "PsychubeReplayTwice",
             "PsychubeSetReplaysTimes"

diff --git a/source/cli/main.cpp b/source/cli/main.cpp
@@ -5,6 +5,7 @@
 #include <string>
 
 #include "MaaFramework/MaaAPI.h"
+#include "MaaToolKit/MaaToolKitAPI.h"
 
 #include "meojson/json.hpp"
 #include "utils/Locale.hpp"
@@ -64,8 +65,7 @@ int main(int argc, char** argv)
     std::string agent_path = (cur_dir / "MaaAgentBinary").string();
     std::string adb_config = read_adb_config(cur_dir);
 
-    MaaSetGlobalOption(MaaGlobalOption_Logging, (void*)debug_dir.c_str(), debug_dir.size());
-    MaaSetGlobalOption(MaaGlobalOption_DebugMode, (void*)&debug, sizeof(bool));
+    MaaToolKitInit();
 
     auto maa_handle = MaaCreate(nullptr, nullptr);
     auto resource_handle = MaaResourceCreate(nullptr, nullptr);
@@ -91,6 +91,7 @@ int main(int argc, char** argv)
         MaaDestroy(maa_handle);
         MaaResourceDestroy(resource_handle);
         MaaControllerDestroy(controller_handle);
+        MaaToolKitUninit();
     };
 
     if (!MaaInited(maa_handle)) {
@@ -146,7 +147,7 @@ json::value combat_param(int index)
     auto& all_in_doc = diff["AllIn"]["doc"];
     auto& eat_candy_within_24h = diff["EatCandyWithin24H"]["enabled"];
     auto& eat_candy_within_24h_doc = diff["EatCandyWithin24H"]["doc"];
-    
+
     all_in = false;
     all_in_doc = "刷活性；默认false";
     eat_candy_within_24h = false;