sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-22 04:49:17 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:53:03 +08:00
parent 5e482958f6 24aa3e00bd
commit 3cb29a9a37
179 changed files with 17873 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module/retire/enhancement.py
View File

@@ -49,7 +49,11 @@ class Enhancement(Dock):
if self.appear(DOCK_EMPTY, offset=(30, 30)):
return False
<<<<<<< HEAD
self.equip_enter(
=======
self.ship_info_enter(
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
CARD_GRIDS[(0, 0)], check_button=SHIP_DETAIL_CHECK, long_click=False)
return True
@@ -127,7 +131,11 @@ class Enhancement(Dock):
logger.info(
'Reached maximum number to check, exiting current category')
return "state_enhance_exit"
<<<<<<< HEAD
if not self.equip_side_navbar_ensure(bottom=4):
=======
if not self.ship_side_navbar_ensure(bottom=4):
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return "state_enhance_check"
self.wait_until_appear(ENHANCE_RECOMMEND, offset=(
@@ -189,7 +197,11 @@ class Enhancement(Dock):
return "state_enhance_confirm"
# Try to swipe to next
<<<<<<< HEAD
if self.equip_view_next(check_button=ENHANCE_RECOMMEND):
=======
if self.ship_view_next(check_button=ENHANCE_RECOMMEND):
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
if not need_to_skip:
nonlocal ship_count
ship_count -= 1
@@ -221,7 +233,11 @@ class Enhancement(Dock):
# Avoid too_many_click exception caused by multiple tries without material
if state_list[-2:] == ["state_enhance_recommend", "state_enhance_fail"]:
if len(self.device.click_record):
<<<<<<< HEAD
while self.device.click_record[-1] in ['ENHANCE_RECOMMEND', 'EQUIP_SWIPE']:
=======
while self.device.click_record[-1] in ['ENHANCE_RECOMMEND', 'SHIP_SWIPE']:
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
self.device.click_record.pop()
state_list.clear()
state_list.append(state)