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

Mov: *_CF references and assets to module guild from combat

Browse Source 
Add: GuildCombat class

Fix: GuildOperations use independent instance GuildCombat to
handle combat interfaces for guild raid boss
This commit is contained in:
nEEtdo0d
2021-01-16 13:53:46 -05:00
parent bbd44d3d3c
commit 3a049c99fa
21 changed files with 90 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/combat/combat.py
View File

@@ -251,10 +251,6 @@ class Combat(Level, HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall
if not save_get_items:
self.device.sleep((0.25, 0.5))
return True
if self.appear_then_click(BATTLE_STATUS_CF, 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
return False
@@ -271,14 +267,12 @@ class Combat(Level, HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall
self.interval_reset(BATTLE_STATUS_S)
self.interval_reset(BATTLE_STATUS_A)
self.interval_reset(BATTLE_STATUS_B)
self.interval_reset(BATTLE_STATUS_CF)
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)
self.interval_reset(BATTLE_STATUS_CF)
return True
return False
@@ -299,9 +293,6 @@ class Combat(Level, HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall
if self.appear_then_click(EXP_INFO_B):
self.device.sleep((0.25, 0.5))
return True
if self.appear_then_click(EXP_INFO_CF):
self.device.sleep((0.25, 0.5))
return True
return False