Skip to content

Commit

Permalink
[- 修复部分机型点击星球未生效的问题
Browse files Browse the repository at this point in the history
V2.2.21
  • Loading branch information
smjes3 authored Jun 7, 2024
2 parents c254ad4 + 9cfb965 commit fb4fab6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
2 changes: 1 addition & 1 deletion map/HuangQuan/map_3-2_6.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"e": 2
},
{
"s": 0.1
"s": 0.15
},
{
"e": 2
Expand Down
6 changes: 6 additions & 0 deletions map/HuangQuan/map_3-6_4.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@
{
"e": 2
},
{
"d": 0.1
},
{
"e": 2
},
{
"s": 0.1
},
Expand Down
12 changes: 10 additions & 2 deletions utils/map.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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"检测到星轨航图,不进行点击'返回'")

Expand Down

0 comments on commit fb4fab6

Please sign in to comment.