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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2020-07-13 23:09:12 +08:00
parent ad83800302 0f26b4ee3c
commit c2545e060e
7 changed files with 616 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/combat/combat.py
View File

@@ -280,6 +280,8 @@ class Combat(HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall, Comba
Returns:
bool:
"""
if self.is_combat_executing():
return False
if self.appear_then_click(EXP_INFO_S):
self.device.sleep((0.25, 0.5))
return True

10
module/retire/retirement.py
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

1191
module/reward/commission.py
View File

File diff suppressed because it is too large Load Diff