From dc5bcfe8fb2d38d5107f3ed7d586a606c4045071 Mon Sep 17 00:00:00 2001 From: Lhy <33685788+smjes3@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:15:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E7=82=B9=E5=87=BB=E6=98=9F=E7=90=83=E6=9C=AA?= =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/map.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/utils/map.py b/utils/map.py index 68a1ee5e..e91f6bc8 100644 --- a/utils/map.py +++ b/utils/map.py @@ -327,7 +327,15 @@ def handle_planet(self, key): else: self.find_transfer_point(key, threshold=0.975) if self.calculated.click_target(key, 0.93, delay=0.1): - self.planet = key + img = cv.imread("./picture/kaituoli_1.png") + delay_time = 0.5 + while not self.calculated.on_interface(check_list=[img], timeout=1, interface_desc='星轨航图', threshold=0.97, offset=(1580,0,0,-910), allow_log=False): + delay_time += 0.1 + delay_time = max(delay_time, 1) + log.info(f"检测到未成功点击星球,尝试重试点击星球,鼠标点击间隔时间 {delay_time}") + self.calculated.click_target(key, 0.93, delay=delay_time) + else: + self.planet = key time.sleep(1.7) def handle_floor(self, key): @@ -343,7 +351,7 @@ def handle_back(self, key): """ img = cv.imread("./picture/kaituoli_1.png") if not self.calculated.on_interface(check_list=[img], timeout=1, interface_desc='星轨航图', threshold=0.97, offset=(1580,0,0,-910), allow_log=False): - self.calculated.click_target(key, 0.94,timeout=3, offset=(1660,100,-40,-910), retry_in_map=False) + self.calculated.click_target(key, 0.94, timeout=3, offset=(1660,100,-40,-910), retry_in_map=False) else: log.info(f"检测到星轨航图,不进行点击'返回'") From f4fb878f1674de0d5e0ca7feb7bd46fe51ddf21d Mon Sep 17 00:00:00 2001 From: Lhy <33685788+smjes3@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:19:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E9=BB=84=E6=B3=89?= =?UTF-8?q?=E4=B8=B9=E9=BC=8E=E5=8F=B8=E6=BC=8F=E6=80=AA=20fix=208b71976?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- map/HuangQuan/map_3-6_4.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/map/HuangQuan/map_3-6_4.json b/map/HuangQuan/map_3-6_4.json index 0b5e9993..37144c20 100644 --- a/map/HuangQuan/map_3-6_4.json +++ b/map/HuangQuan/map_3-6_4.json @@ -187,6 +187,12 @@ { "e": 2 }, + { + "d": 0.1 + }, + { + "e": 2 + }, { "s": 0.1 }, From 9cfb965e37512bbb62c8ac6d95d036fe6219b2de Mon Sep 17 00:00:00 2001 From: Lhy <33685788+smjes3@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:20:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E9=BB=84=E6=B3=89?= =?UTF-8?q?=E8=BF=B4=E6=98=9F=E6=B8=AF=E9=83=A8=E5=88=86=E6=9C=BA=E5=9E=8B?= =?UTF-8?q?=E5=81=B6=E5=8F=91=E6=BC=8F=E6=80=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- map/HuangQuan/map_3-2_6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map/HuangQuan/map_3-2_6.json b/map/HuangQuan/map_3-2_6.json index c3dc84e2..fb1c9234 100644 --- a/map/HuangQuan/map_3-2_6.json +++ b/map/HuangQuan/map_3-2_6.json @@ -134,7 +134,7 @@ "e": 2 }, { - "s": 0.1 + "s": 0.15 }, { "e": 2