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

Fix: Guild combat inherit

Browse Source
This commit is contained in:
LmeSzinc
2021-09-22 21:53:56 +08:00
parent 62211b2af4
commit 7c34d4598f
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
module/guild/guild_combat.py
View File

@@ -1,45 +1,41 @@
from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2
from module.combat.combat import Combat
from module.guild.assets import BATTLE_STATUS_CF, EXP_INFO_CF
class GuildCombat(Combat):
def handle_battle_status(self, save_get_items=False):
def handle_battle_status(self, drop=None):
"""
Args:
save_get_items (bool):
drop (DropImage):
Returns:
bool:
"""
if self.is_combat_executing():
return False
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:
if self.appear(BATTLE_STATUS_CF, interval=self.battle_status_click_interval):
if drop:
drop.handle_add(self)
else:
self.device.sleep((0.25, 0.5))
self.device.click(BATTLE_STATUS_CF)
return True
return False
def handle_get_items(self, save_get_items=False):
def handle_get_items(self, drop=None):
"""
Args:
save_get_items (bool):
drop (DropImage):
Returns:
bool:
"""
if self.appear_then_click(GET_ITEMS_1, screenshot=save_get_items, genre='get_items', offset=5,
interval=self.battle_status_click_interval):
if super().handle_get_items(drop=drop):
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_CF)
return True
return False
else:
return False
def handle_exp_info(self):
"""