From b478fb7e538c6ac9682bd2d4efde202842154b22 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Fri, 30 Sep 2022 23:48:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=B0=B4=E6=9C=88=E8=82=89=E9=B8=BD=E2=80=9C=E4=B8=87=E8=B1=A1?=
 =?UTF-8?q?=E8=BF=BD=E5=BF=86=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/addition/Roguelike2/resource/tasks.json |  13 +++++++++++++
 .../resource/template/Roguelike2MapObject.png    | Bin 0 -> 3284 bytes
 resource/tasks.json                              |   7 ++++++-
 src/MeoAssistant/Task/RoguelikeTask.cpp          |   3 ++-
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 resource/addition/Roguelike2/resource/template/Roguelike2MapObject.png

diff --git a/resource/addition/Roguelike2/resource/tasks.json b/resource/addition/Roguelike2/resource/tasks.json
index 4266c13421..aec9dc7732 100644
--- a/resource/addition/Roguelike2/resource/tasks.json
+++ b/resource/addition/Roguelike2/resource/tasks.json
@@ -476,5 +476,18 @@
         "next": [
             "Roguelike1ExitThenAbandon"
         ]
+    },
+    "Roguelike2MapObject": {
+        "action": "DoNothing",
+        "cache": false,
+        "roi": [
+            257,
+            488,
+            189,
+            123
+        ],
+        "next": [
+            "Roguelike1RecruitOther"
+        ]
     }
 }
diff --git a/resource/addition/Roguelike2/resource/template/Roguelike2MapObject.png b/resource/addition/Roguelike2/resource/template/Roguelike2MapObject.png
new file mode 100644
index 0000000000000000000000000000000000000000..afd1ff1a09c4ac3b7a9a70cbdf8e166f3f72cfd7
GIT binary patch
literal 3284
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
STTp&003$t9-E!E&7ykt%=v1`;

literal 0
HcmV?d00001

diff --git a/resource/tasks.json b/resource/tasks.json
index 653b8dd249..09911f6297 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -7359,7 +7359,8 @@
             "Roguelike2StageDreadfulFoe-5",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2MapObject"
         ]
     },
     "Roguelike1CloseCollection": {
@@ -7406,6 +7407,10 @@
             "Roguelike1RecruitMain"
         ]
     },
+    "Roguelike2MapObject": {
+        "template": "empty.png",
+        "templThreshold": 2.0
+    },
     "Roguelike1RecruitMain": {
         "action": "ClickSelf",
         "template": "Roguelike1Recruit.png",
diff --git a/src/MeoAssistant/Task/RoguelikeTask.cpp b/src/MeoAssistant/Task/RoguelikeTask.cpp
index 547f05878a..dfa0786ed6 100644
--- a/src/MeoAssistant/Task/RoguelikeTask.cpp
+++ b/src/MeoAssistant/Task/RoguelikeTask.cpp
@@ -50,7 +50,8 @@ bool asst::RoguelikeTask::set_params(const json::value& params)
     case 0:
         break;
     case 1:
-        m_roguelike_task_ptr->set_times_limit("Roguelike1StageTraderLeaveConfirm", 0, ProcessTask::TimesLimitType::Post);
+        m_roguelike_task_ptr->set_times_limit("Roguelike1StageTraderLeaveConfirm", 0,
+                                              ProcessTask::TimesLimitType::Post);
         break;
     case 2:
         [[unlikely]] m_roguelike_task_ptr->set_times_limit("Roguelike1StageTraderInvestCancel", 0);