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

Opt: Remove OpsiAshBeacon.AshAttack since it should always be True

Browse Source
This commit is contained in:
LmeSzinc
2023-02-17 23:50:01 +08:00
parent 7261235cc4
commit f5f093c67f
19 changed files with 70 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/os_ash/ash.py
View File

@@ -134,10 +134,6 @@ class OSAsh(UI, MapEventHandler):
in: is_in_map
out: is_in_map
"""
if not self.config.OpsiAshBeacon_AshAttack \
and not self.config.OpsiDossierBeacon_Enable:
return False
if self.ash_collect_status() >= 100 \
and self._support_call_ash_beacon_task():
self.config.task_call(task='OpsiAshBeacon')

10
module/os_ash/meta.py
View File

@@ -307,14 +307,13 @@ class OpsiAshBeacon(Meta):
# Page meta main
if self.appear(ASH_SHOWDOWN, offset=(30, 30), interval=2):
# Beacon
if self.config.OpsiAshBeacon_AshAttack \
and self._check_beacon_point():
if self._check_beacon_point():
self.device.click(META_MAIN_BEACON_ENTRANCE)
logger.info('Select beacon entrance into')
return True
# Dossier
if _server_support() \
and self.config.OpsiDossierBeacon_Enable \
and self.config.OpsiAshBeacon_AttackMode == 'current_dossier' \
and self._check_dossier_point():
if self.appear_then_click(META_MAIN_DOSSIER_ENTRANCE, offset=(20, 20), interval=2):
logger.info('Select dossier entrance into')
@@ -324,8 +323,7 @@ class OpsiAshBeacon(Meta):
return False
# Page beacon
elif self.appear(BEACON_LIST, offset=(20, 20), interval=2):
if self.config.OpsiAshBeacon_AshAttack \
and self._check_beacon_point():
if self._check_beacon_point():
self.device.click(META_BEGIN_ENTRANCE)
logger.info('Begin a beacon')
else:
@@ -337,7 +335,7 @@ class OpsiAshBeacon(Meta):
# Page dossier
elif _server_support() \
and self.appear(DOSSIER_LIST, offset=(20, 20), interval=2):
if self.config.OpsiDossierBeacon_Enable \
if self.config.OpsiAshBeacon_AttackMode == 'current_dossier' \
and self._check_dossier_point():
if self.appear_then_click(META_BEGIN_ENTRANCE, offset=(20, 20), interval=2):
logger.info('Begin a dossier')