From d119b97871c540b4e7494cbdaff18d528517dfc4 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Mon, 7 Feb 2022 01:48:26 +0800
Subject: [PATCH] =?UTF-8?q?perf.=E4=BC=98=E5=8C=96=E8=82=89=E9=B8=BD?=
 =?UTF-8?q?=E6=88=98=E6=96=97=E6=8A=80=E8=83=BD=E4=BD=BF=E7=94=A8=EF=BC=8C?=
 =?UTF-8?q?=E7=89=B9=E7=A7=8D=E3=80=81=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=9A=84?=
 =?UTF-8?q?=E6=91=86=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                           | 12 ++++++---
 .../RoguelikeBattleTaskPlugin.cpp             | 25 ++++++++++---------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index 7c9b0d37b1..61566406c9 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -3515,6 +3515,14 @@
             40
         ]
     },
+    "BattleUseSkillBegin": {
+        "algorithm": "JustReturn",
+        "action": "doNothing",
+        "rearDelay": 1000,
+        "next": [
+            "BattleUseSkill"
+        ]
+    },
     "BattleUseSkill": {
         "algorithm": "OcrDetect",
         "text": [
@@ -3532,9 +3540,7 @@
             380,
             100,
             100
-        ],
-        "preDelay": 1000,
-        "rearDelay": 0
+        ]
     },
     "StartToWakeUpToRoguelike1": {
         "template": "StartToWakeUp.png",
diff --git a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
index cc23b13a07..0f5165cc83 100644
--- a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
+++ b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
@@ -217,17 +217,18 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
     default:
         // 特种和无人机，有的只能放地面，有的又只能放高台，不好判断
         // 笨办法，都试试，总有一次能成的
-    {
-        static Loc static_loc = Loc::Melee;
-        loc = static_loc;
-        if (static_loc == Loc::Melee) {
-            static_loc = Loc::Ranged;
-        }
-        else {
-            static_loc = Loc::Melee;
-        }
-    }
-    break;
+    //{
+    //    static Loc static_loc = Loc::Melee;
+    //    loc = static_loc;
+    //    if (static_loc == Loc::Melee) {
+    //        static_loc = Loc::Ranged;
+    //    }
+    //    else {
+    //        static_loc = Loc::Melee;
+    //    }
+    //}
+        loc = Loc::Melee;
+        break;
     }
 
     Point placed_loc = get_placed(loc);
@@ -273,7 +274,7 @@ bool asst::RoguelikeBattleTaskPlugin::use_skill(const asst::Rect& rect)
 {
     Ctrler.click(rect);
 
-    ProcessTask task(*this, { "BattleUseSkill" });
+    ProcessTask task(*this, { "BattleUseSkillBegin" });
     task.set_retry_times(0);
     return task.run();
 }