1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-06 04:19:06 +08:00

Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev""

This reverts commit ac9303012c.
This commit is contained in:
whoamikyo
2020-08-18 20:48:14 -03:00
parent ac9303012c
commit 09d3f695de
741 changed files with 18944 additions and 8381 deletions

View File

@@ -119,16 +119,16 @@ class Retirement(Enhancement):
if self.config.RETIRE_SR or self.config.RETIRE_SSR or self.config.RETIREMENT_METHOD == 'one_click_retire':
if self.handle_popup_confirm():
continue
if self.appear_then_click(SHIP_CONFIRM, offset=30, interval=2):
if self.appear_then_click(SHIP_CONFIRM, offset=(30, 30), interval=2):
continue
if self.appear_then_click(SHIP_CONFIRM_2, offset=30, interval=2):
if self.appear_then_click(SHIP_CONFIRM_2, offset=(30, 30), interval=2):
continue
if self.appear_then_click(EQUIP_CONFIRM, offset=30, interval=2):
if self.appear_then_click(EQUIP_CONFIRM, offset=(30, 30), interval=2):
continue
if self.appear_then_click(EQUIP_CONFIRM_2, offset=30, interval=2):
if self.appear_then_click(EQUIP_CONFIRM_2, offset=(30, 30), interval=2):
executed = True
continue
if self.appear(GET_ITEMS_1, interval=0.5):
if self.appear(GET_ITEMS_1, offset=(30, 30)):
self.device.click(GET_ITEMS_1_RETIREMENT_SAVE)
self.interval_reset(SHIP_CONFIRM)
continue