sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 23:47:02 +08:00
Code Activity

Chore: Use new syntax sugar in os_handler

Browse Source
This commit is contained in:
LmeSzinc
2026-01-22 19:07:09 +08:00
parent 8ea89756f1
commit 475c2dd2bc
15 changed files with 135 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
module/os_handler/map_order.py
View File

@@ -15,19 +15,14 @@ class MapOrderHandler(MapOperation, ActionPointHandler, MapEventHandler, ZoneMan
def is_in_map_order(self):
return self.appear(ORDER_CHECK, offset=(20, 20))
def order_enter(self, skip_first_screenshot=True):
def order_enter(self):
"""
Pages:
in: is_in_map
out: is_in_map_order
"""
logger.info('Order enter')
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
for _ in self.loop():
# End
if self.is_in_map_order():
break
@@ -52,11 +47,10 @@ class MapOrderHandler(MapOperation, ActionPointHandler, MapEventHandler, ZoneMan
self.ui_click(ORDER_CHECK, appear_button=self.is_in_map_order, check_button=self.is_in_map,
skip_first_screenshot=True)
def order_execute(self, button, skip_first_screenshot=True):
def order_execute(self, button):
"""
Args:
button (Button): A button in navigational order page.
skip_first_screenshot (bool):
Returns:
bool: If success
@@ -69,15 +63,10 @@ class MapOrderHandler(MapOperation, ActionPointHandler, MapEventHandler, ZoneMan
self.order_enter()
missing_timer = Timer(1, count=3).start()
confirm_timer = Timer(1.2, count=4)
confirm_timer = Timer(1.2, count=4).start()
assume_zone = self.name_to_zone(11)
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
for _ in self.loop():
# End
if self.is_in_map():
if confirm_timer.reached():
@@ -109,13 +98,9 @@ class MapOrderHandler(MapOperation, ActionPointHandler, MapEventHandler, ZoneMan
missing_timer.reset()
continue
def wait_until_order_finished(self, skip_first_screenshot=True):
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
def wait_until_order_finished(self):
for _ in self.loop():
# End
if self.is_in_map() and self.appear(ORDER_ENTER, offset=(20, 20)):
break