From eb58aa788bf044a30c298158602f3be9e8dda9ab Mon Sep 17 00:00:00 2001 From: Trust_04zh Date: Mon, 30 Oct 2023 19:33:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=BF=83=E7=9B=B8?= =?UTF-8?q?=E6=9D=90=E6=96=99=E5=85=B3=E5=8D=A1pipeline=E4=B8=AD=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E5=A4=8D=E7=8E=B0=E5=8A=A8=E4=BD=9C=E7=9A=84ROI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/pipeline/psychube.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/assets/resource/pipeline/psychube.json b/assets/resource/pipeline/psychube.json index 7cd1c46..483b6ba 100644 --- a/assets/resource/pipeline/psychube.json +++ b/assets/resource/pipeline/psychube.json @@ -103,10 +103,18 @@ "recognition": "TemplateMatch", "template": "Psychube/SwitchToReplay.png", "roi": [ - 781, - 581, - 145, - 139 + [ + 781, + 581, + 145, + 139 + ], + [ + 548, + 569, + 166, + 151 + ] ], "action": "Click", "next": [ From dc6606f0296dc4b4277b15da32eb61b11b9e369b Mon Sep 17 00:00:00 2001 From: Trust_04zh Date: Mon, 30 Oct 2023 19:52:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E7=82=B9=E5=94=B1=E6=9C=BA=E5=A5=96=E5=8A=B1=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=8D=A1=E6=AD=BB=E5=9C=A8=E9=A2=86=E5=8F=96=E5=88=86?= =?UTF-8?q?=E8=B4=9D=E7=95=8C=E9=9D=A2=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/pipeline/awards.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/resource/pipeline/awards.json b/assets/resource/pipeline/awards.json index 5d8c4cf..45437a0 100644 --- 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, From f5b21b33268d4308b494638d4d72b3bb8b117af7 Mon Sep 17 00:00:00 2001 From: Trust_04zh Date: Mon, 30 Oct 2023 20:14:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=88=B7=E5=8F=96?= =?UTF-8?q?=E5=BF=83=E7=9B=B8=E6=9D=90=E6=96=99=E5=85=B3=E5=8D=A1=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=A8=B3=E5=81=A5=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/pipeline/psychube.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/resource/pipeline/psychube.json b/assets/resource/pipeline/psychube.json index 483b6ba..d6dcad4 100644 --- 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" @@ -133,6 +134,7 @@ 134 ], "action": "Click", + "post_wait_freezes": 1, "next": [ "PsychubeReplayTwice", "PsychubeSetReplaysTimes" From c779548ac5252a622baed27b6c7cc9d73bb043c1 Mon Sep 17 00:00:00 2001 From: MistEO Date: Wed, 1 Nov 2023 01:31:30 +0800 Subject: [PATCH 4/4] fix: build error --- source/cli/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/cli/main.cpp b/source/cli/main.cpp index 35f7154..b35dcf8 100644 --- a/source/cli/main.cpp +++ b/source/cli/main.cpp @@ -5,6 +5,7 @@ #include #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;