sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-18 18:27:19 +08:00
Code Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2021-02-21 21:22:42 +08:00
parent 2d48654def be87fd97fe
commit 82c70c4871
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/map/map_operation.py
View File

@@ -24,9 +24,7 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
Switch fleet. Switch fleet.
""" """
logger.info('Switch over') logger.info('Switch over')
if not self.appear(SWITCH_OVER): self.wait_until_appear(SWITCH_OVER, skip_first_screenshot=True)
logger.warning('No buttons detected.')
return False
FLEET_NUM.load_color(self.device.image) FLEET_NUM.load_color(self.device.image)
FLEET_NUM._match_init = True FLEET_NUM._match_init = True
@@ -37,7 +35,6 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
if not FLEET_NUM.match(self.device.image, offset=(0, 0), threshold=0.9): if not FLEET_NUM.match(self.device.image, offset=(0, 0), threshold=0.9):
break break
logger.warning('Fleet switch failed. Retrying.') logger.warning('Fleet switch failed. Retrying.')
return True
def enter_map(self, button, mode='normal'): def enter_map(self, button, mode='normal'):
"""Enter a campaign. """Enter a campaign.

1
module/os/config.py
View File

@@ -4,6 +4,7 @@ class OSConfig:
""" """
MAP_FOCUS_ENEMY_AFTER_BATTLE = True MAP_FOCUS_ENEMY_AFTER_BATTLE = True
MAP_HAS_SIREN = True MAP_HAS_SIREN = True
IGNORE_LOW_EMOTION_WARN = False
MAP_GRID_CENTER_TOLERANCE = 0.2 MAP_GRID_CENTER_TOLERANCE = 0.2
MAP_SWIPE_MULTIPLY = (1.320, 1.009) MAP_SWIPE_MULTIPLY = (1.320, 1.009)

1
module/research/research.py
View File

@@ -318,6 +318,7 @@ class RewardResearch(ResearchSelector):
self.ui_goto(page_reshmenu, skip_first_screenshot=True) self.ui_goto(page_reshmenu, skip_first_screenshot=True)
self.ui_click(RESHMENU_GOTO_RESEARCH, check_button=research_check, skip_first_screenshot=True) self.ui_click(RESHMENU_GOTO_RESEARCH, check_button=research_check, skip_first_screenshot=True)
self.device.send_notification('Research Start', 'Research receive')
self.ensure_research_stable() self.ensure_research_stable()
@Config.when(SERVER=None) @Config.when(SERVER=None)