From 89dddac75604af303004a21100a8495d202168df Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sat, 2 Jul 2022 00:27:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=82=89=E9=B8=BD=E8=B6=85=E6=97=B6=E5=90=8E=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=92=A4=E9=80=80=E5=B9=B2=E5=91=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/994
---
 resource/tasks.json                            | 2 +-
 src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index 5ce8b90013..97e3a455d4 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -5336,7 +5336,7 @@
     },
     "BattleOperRetreat": {
         "algorithm": "JustReturn",
-        "rearDelay": 100,
+        "rearDelay": 200,
         "action": "ClickRect",
         "specificRect": [
             580,
diff --git a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
index 6666e2a0cd..33c17ec454 100644
--- a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
+++ b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
@@ -341,9 +341,7 @@ bool asst::RoguelikeBattleTaskPlugin::retreat(const Point& point)
     m_ctrler->click(point);
     sleep(Task.get("BattleUseOper")->pre_delay);
 
-    ProcessTask task(*this, { "BattleOperRetreat" });
-    task.set_retry_times(0);
-    return task.run();
+    return ProcessTask(*this, { "BattleOperRetreat" }).run();
 }
 
 void asst::RoguelikeBattleTaskPlugin::all_melee_retreat()
@@ -353,7 +351,7 @@ void asst::RoguelikeBattleTaskPlugin::all_melee_retreat()
         auto& type = tile_info.buildable;
         if (type == Loc::Melee || type == Loc::All) {
             if (!retreat(tile_info.pos)) {
-                return;
+                continue;
             }
         }
     }