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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2020-07-28 16:01:07 +08:00
parent ce499886ee 2badf70d83
commit ebf382dd4d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
campaign/event_20200716_en/a3.py
View File

@@ -61,5 +61,5 @@ class Campaign(CampaignBase):
return self.battle_default() return self.battle_default()
def battle_5(self): def battle_4(self):
self.fleet_boss.capture_clear_boss() self.fleet_boss.capture_clear_boss()

3
module/handler/enemy_searching.py
View File

@@ -4,6 +4,7 @@ from module.exception import CampaignEnd
from module.handler.assets import * from module.handler.assets import *
from module.handler.info_handler import InfoHandler from module.handler.info_handler import InfoHandler
from module.logger import logger from module.logger import logger
from module.map.assets import *
class EnemySearchingHandler(InfoHandler): class EnemySearchingHandler(InfoHandler):
@@ -38,6 +39,8 @@ class EnemySearchingHandler(InfoHandler):
def is_in_stage(self): def is_in_stage(self):
if not self.appear(IN_STAGE, offset=(10, 10)): if not self.appear(IN_STAGE, offset=(10, 10)):
if self.appear(MAP_PREPARATION) or self.appear(FLEET_PREPARATION):
self.device.click(MAP_PREPARATION_CANCEL)
return False return False
if self.is_map_green \ if self.is_map_green \
and self.stage_entrance is not None \ and self.stage_entrance is not None \