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

Add: Map 11-4 support, Columbia farm is real

Browse Source 
Add: Suport to Rank B
This commit is contained in:
kyO The NinjA
2020-06-08 03:16:00 -03:00
parent 4e4dc52886
commit 95ca113562
17 changed files with 108 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module/combat/combat.py
View File

@@ -230,17 +230,20 @@ class Combat(HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall, Comba
Returns:
bool:
"""
if self.appear_then_click(BATTLE_STATUS_S, screenshot=save_get_items, genre='status',
interval=self.battle_status_click_interval):
if self.appear_then_click(BATTLE_STATUS_S, screenshot=save_get_items, genre='status', interval=self.battle_status_click_interval):
if not save_get_items:
self.device.sleep((0.25, 0.5))
return True
if self.appear_then_click(BATTLE_STATUS_A, screenshot=save_get_items, genre='status',
interval=self.battle_status_click_interval):
if self.appear_then_click(BATTLE_STATUS_A, screenshot=save_get_items, genre='status', interval=self.battle_status_click_interval):
logger.warning('Battle status: A')
if not save_get_items:
self.device.sleep((0.25, 0.5))
return True
if self.appear_then_click(BATTLE_STATUS_B, screenshot=save_get_items, genre='status', interval=self.battle_status_click_interval):
logger.warning('Battle Status B')
if not save_get_items:
self.device.sleep((0.25, 0.5))
return True
return False
@@ -256,11 +259,13 @@ class Combat(HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall, Comba
interval=self.battle_status_click_interval):
self.interval_reset(BATTLE_STATUS_S)
self.interval_reset(BATTLE_STATUS_A)
self.interval_reset(BATTLE_STATUS_B)
return True
if self.appear_then_click(GET_ITEMS_2, screenshot=save_get_items, genre='get_items', offset=5,
interval=self.battle_status_click_interval):
self.interval_reset(BATTLE_STATUS_S)
self.interval_reset(BATTLE_STATUS_A)
self.interval_reset(BATTLE_STATUS_B)
return True
return False
@@ -276,6 +281,9 @@ class Combat(HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall, Comba
if self.appear_then_click(EXP_INFO_A):
self.device.sleep((0.25, 0.5))
return True
if self.appear_then_click(EXP_INFO_B):
self.device.sleep((0.25, 0.5))
return True
return False