sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-09 15:16:58 +08:00
Code Activity

Fix: Enlarge strategy search area since they are shown in 2x4 now (#4108)

Browse Source
This commit is contained in:
LmeSzinc
2024-08-23 02:59:40 +08:00
parent 7eadaa7d8a
commit 918e700831
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module/handler/strategy.py
View File

@@ -20,7 +20,7 @@ submarine_view = Switch('Submarine_view', offset=(100, 200))
submarine_view.add_status('on', check_button=SUBMARINE_VIEW_ON) submarine_view.add_status('on', check_button=SUBMARINE_VIEW_ON)
submarine_view.add_status('off', check_button=SUBMARINE_VIEW_OFF) submarine_view.add_status('off', check_button=SUBMARINE_VIEW_OFF)
MOB_MOVE_OFFSET = (120, 120) MOB_MOVE_OFFSET = (120, 200)
class StrategyHandler(InfoHandler): class StrategyHandler(InfoHandler):
@@ -35,10 +35,10 @@ class StrategyHandler(InfoHandler):
else: else:
self.device.screenshot() self.device.screenshot()
if self.appear(STRATEGY_OPENED, offset=120): if self.appear(STRATEGY_OPENED, offset=200):
break break
if self.appear(IN_MAP, interval=5) and not self.appear(STRATEGY_OPENED, offset=120): if self.appear(IN_MAP, interval=5) and not self.appear(STRATEGY_OPENED, offset=200):
self.device.click(STRATEGY_OPEN) self.device.click(STRATEGY_OPEN)
continue continue
@@ -54,10 +54,10 @@ class StrategyHandler(InfoHandler):
else: else:
self.device.screenshot() self.device.screenshot()
if self.appear_then_click(STRATEGY_OPENED, offset=120, interval=5): if self.appear_then_click(STRATEGY_OPENED, offset=200, interval=5):
continue continue
if not self.appear(STRATEGY_OPENED, offset=120): if not self.appear(STRATEGY_OPENED, offset=200):
break break
def strategy_set_execute(self, formation_index=None, sub_view=None, sub_hunt=None): def strategy_set_execute(self, formation_index=None, sub_view=None, sub_hunt=None):
@@ -156,7 +156,7 @@ class StrategyHandler(InfoHandler):
else: else:
self.device.screenshot() self.device.screenshot()
if self.appear(SUBMARINE_MOVE_ENTER, offset=120, interval=5): if self.appear(SUBMARINE_MOVE_ENTER, offset=200, interval=5):
self.device.click(SUBMARINE_MOVE_ENTER) self.device.click(SUBMARINE_MOVE_ENTER)
if self.appear(SUBMARINE_MOVE_CONFIRM, offset=(20, 20)): if self.appear(SUBMARINE_MOVE_CONFIRM, offset=(20, 20)):
@@ -180,7 +180,7 @@ class StrategyHandler(InfoHandler):
if self.handle_popup_confirm('SUBMARINE_MOVE'): if self.handle_popup_confirm('SUBMARINE_MOVE'):
pass pass
if self.appear(SUBMARINE_MOVE_ENTER, offset=120): if self.appear(SUBMARINE_MOVE_ENTER, offset=200):
break break
def strategy_submarine_move_cancel(self, skip_first_screenshot=True): def strategy_submarine_move_cancel(self, skip_first_screenshot=True):
@@ -201,7 +201,7 @@ class StrategyHandler(InfoHandler):
if self.handle_popup_confirm('SUBMARINE_MOVE'): if self.handle_popup_confirm('SUBMARINE_MOVE'):
pass pass
if self.appear(SUBMARINE_MOVE_ENTER, offset=120): if self.appear(SUBMARINE_MOVE_ENTER, offset=200):
break break
def is_in_strategy_mob_move(self): def is_in_strategy_mob_move(self):