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

Fix: Handle meta assist being redirected to BATTLE_PREPARATION

Browse Source
This commit is contained in:
LmeSzinc
2022-09-12 14:53:53 +08:00
parent 654a5d5aac
commit 0ec10c0c26
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
module/os_ash/meta.py
View File

@@ -333,8 +333,6 @@ class OpsiAshBeacon(Meta):
class AshBeaconAssist(Meta): class AshBeaconAssist(Meta):
finished = False
def _attack_meta(self, skip_first_screenshot=True): def _attack_meta(self, skip_first_screenshot=True):
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
@@ -344,12 +342,14 @@ class AshBeaconAssist(Meta):
if self.handle_map_event(): if self.handle_map_event():
continue continue
if self._satisfy_attack_condition(): if self.appear(ASH_START, offset=(20, 20)):
self._ensure_meta_level() remain_times = self.digit_ocr_point_and_check(BEACON_REMAIN, 1)
self._make_an_attack() if remain_times:
continue self._ensure_meta_level()
else: self._make_an_attack()
break else:
logger.info('No enough assist times, complete')
break
def _make_an_attack(self): def _make_an_attack(self):
""" """
@@ -364,19 +364,6 @@ class AshBeaconAssist(Meta):
combat = AshCombat(config=self.config, device=self.device) combat = AshCombat(config=self.config, device=self.device)
combat.combat(expected_end=self._in_meta_assist_page, save_get_items=False, emotion_reduce=False) combat.combat(expected_end=self._in_meta_assist_page, save_get_items=False, emotion_reduce=False)
def _satisfy_attack_condition(self):
remain_times = self.digit_ocr_point_and_check(BEACON_REMAIN, 1)
if not remain_times:
logger.info('No enough assist times, complete')
self.finished = True
return False
if self.appear(ASH_START, offset=(20, 20)):
return True
else:
logger.info('Can not find a meta to attack, check after 30 minutes')
self.config.task_delay(minute=30)
self.config.task_stop()
def _ensure_meta_level(self): def _ensure_meta_level(self):
""" """
Select an meta whose level satisfies Select an meta whose level satisfies