From 265a94735f0a6addcd0695cfdf90565bc9222e40 Mon Sep 17 00:00:00 2001
From: DavidWang19 <dwang0340@gmail.com>
Date: Wed, 5 Oct 2022 23:25:32 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=BC=9A?=
 =?UTF-8?q?=E5=AE=A2=E5=AE=A4=E6=8A=8A=E5=8F=AF=E4=BB=A5=E6=8C=82=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84=E7=BA=BF=E7=B4=A2=E9=80=81=E5=87=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                           | 10 +++++++++
 .../Task/Sub/InfrastReceptionTask.cpp         | 21 +++++++++++++------
 .../Task/Sub/InfrastReceptionTask.h           |  1 +
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index e2c300f139..1cf49ecaf6 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -5620,6 +5620,16 @@
             "CloseCluePageThenSendClue"
         ]
     },
+    "BackToReceptionMain": {
+        "algorithm": "JustReturn",
+        "action": "ClickRect",
+        "specificRect": [
+            280,
+            96,
+            130,
+            32
+        ]
+    },
     "CloseCluePageThenSendClue": {
         "template": "CloseCluePage.png",
         "action": "ClickSelf",
diff --git a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp
index 61f8f2112d..46845e2cd8 100644
--- a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp
+++ b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp
@@ -20,16 +20,19 @@ bool asst::InfrastReceptionTask::_run()
 
     close_end_of_clue_exchange();
 
+    // 防止送线索把可以填入的送了
+    proc_clue_vacancy();
+    if (unlock_clue_exchange()) {
+        proc_clue_vacancy();
+    }
+    back_to_reception_main();
+
     get_clue();
     if (need_exit()) {
         return false;
     }
     use_clue();
-    if (need_exit()) {
-        return false;
-    }
-    click_return_button();
-    click_bottom_left_tab();
+    back_to_reception_main();
     if (need_exit()) {
         return false;
     }
@@ -133,6 +136,12 @@ bool asst::InfrastReceptionTask::unlock_clue_exchange()
     return task.run();
 }
 
+bool asst::InfrastReceptionTask::back_to_reception_main()
+{
+    ProcessTask task(*this, { "BackToReceptionMain" });
+    return task.run();
+}
+
 bool asst::InfrastReceptionTask::send_clue()
 {
     ProcessTask task(*this, { "SendClues" });
@@ -204,4 +213,4 @@ bool asst::InfrastReceptionTask::shift()
     }
     click_confirm_button();
     return true;
-}
\ No newline at end of file
+}
diff --git a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.h b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.h
index 9781344cc2..1cd6a90f42 100644
--- a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.h
+++ b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.h
@@ -19,6 +19,7 @@ namespace asst
         bool use_clue();
         bool proc_clue_vacancy();
         bool unlock_clue_exchange();
+        bool back_to_reception_main();
         bool send_clue();
         bool shift();
     };