sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-18 09:11:31 +08:00
Code Activity

Fix: check EQUIPMENT_OPEN using template matching

Browse Source
This commit is contained in:
Air111
2024-05-03 17:42:39 +08:00
committed by LmeSzinc
parent 543154eb8b
commit 5e77b8d6e9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/equipment/equipment.py
View File

@@ -63,12 +63,12 @@ class Equipment(StorageHandler):
def ship_view_prev(self, check_button=EQUIPMENT_OPEN): def ship_view_prev(self, check_button=EQUIPMENT_OPEN):
return self._ship_view_swipe(distance=SWIPE_DISTANCE, check_button=check_button) return self._ship_view_swipe(distance=SWIPE_DISTANCE, check_button=check_button)
def ship_info_enter(self, click_button, check_button=EQUIPMENT_OPEN, long_click=True, skil_first_screenshot=True): def ship_info_enter(self, click_button, check_button=EQUIPMENT_OPEN, long_click=True, skip_first_screenshot=True):
enter_timer = Timer(10) enter_timer = Timer(10)
while 1: while 1:
if skil_first_screenshot: if skip_first_screenshot:
skil_first_screenshot = False skip_first_screenshot = False
else: else:
self.device.screenshot() self.device.screenshot()
@@ -200,7 +200,7 @@ class Equipment(StorageHandler):
while True: while True:
self.ship_equipment_take_off() self.ship_equipment_take_off()
self.ui_click(click_button=EQUIPMENT_CLOSE, check_button=EQUIPMENT_OPEN, offset=None) self.ui_click(EQUIPMENT_CLOSE, check_button=EQUIPMENT_OPEN, skip_first_screenshot=True)
if not self.ship_view_next(): if not self.ship_view_next():
break break
@@ -257,7 +257,7 @@ class Equipment(StorageHandler):
self.ship_view_next() self.ship_view_next()
else: else:
self.ship_equipment_take_on_preset(index=index) self.ship_equipment_take_on_preset(index=index)
self.ui_click(click_button=EQUIPMENT_CLOSE, check_button=EQUIPMENT_OPEN, offset=None) self.ui_click(EQUIPMENT_CLOSE, check_button=EQUIPMENT_OPEN, skip_first_screenshot=True)
self.ui_back(out) self.ui_back(out)
self.equipment_has_take_on = True self.equipment_has_take_on = True

2
module/equipment/equipment_change.py
View File

@@ -44,7 +44,7 @@ class EquipmentChange(Equipment):
skip_first_screenshot = False skip_first_screenshot = False
else: else:
self.device.screenshot() self.device.screenshot()
if self.appear(EQUIPMENT_OPEN): if self.appear(EQUIPMENT_OPEN, offset=(5, 5)):
break break
self.equipment_list = {} self.equipment_list = {}