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

fix dock_select_one bug

Browse Source
This commit is contained in:
Cyunmi
2021-08-12 19:28:57 +08:00
parent 94e355915e
commit 79977b840b
3 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module/retire/dock.py
View File

@@ -1,3 +1,4 @@
from module.base.timer import Timer
from module.base.button import ButtonGrid
from module.equipment.equipment import Equipment
from module.exception import ScriptError
@@ -222,19 +223,23 @@ class Dock(Equipment):
button (Button): Ship button to select
skip_first_screenshot:
"""
before, _, _ = OCR_DOCK_SELECTED.ocr(self.device.image)
ocr_check_timer = Timer(1)
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if self.appear(DOCK_CHECK, interval=3):
if self.appear(DOCK_CHECK, interval=2):
self.device.click(button)
current, _, _ = OCR_DOCK_SELECTED.ocr(self.device.image)
if current > before:
break
if ocr_check_timer.reached():
ocr_check_timer.reset()
current, _, _ = OCR_DOCK_SELECTED.ocr(self.device.image)
if current > 0:
break
def dock_select_confirm(self, check_button, skip_first_screenshot=True):
return self.ui_click(SHIP_CONFIRM, check_button=check_button, offset=(200, 50),