LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 17:39:29 +08:00
Code Activity

Merge branch 'master_lme'

Browse Source 
# Conflicts:
#	module/equipment/equipment.py
This commit is contained in:
xhqss
2024-12-20 23:51:48 +08:00
parent 775432486f 63bd1fc317
commit e7f93d8efe
92 changed files with 1751 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/map/map_operation.py
View File

@@ -271,8 +271,7 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
return True
if mode == 'normal':
if self.appear(MAP_MODE_SWITCH_NORMAL, offset=(20, 20)) \
and MAP_MODE_SWITCH_NORMAL.match_appear_on(self.device.image):
if self.match_template_color(MAP_MODE_SWITCH_NORMAL, offset=(20, 20)):
logger.attr('MAP_MODE_SWITCH', 'normal')
return True
elif self.appear(MAP_MODE_SWITCH_HARD, offset=(20, 20), interval=2):
@@ -283,8 +282,7 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
else:
return False
elif mode == 'hard':
if self.appear(MAP_MODE_SWITCH_HARD, offset=(20, 20)) \
and MAP_MODE_SWITCH_HARD.match_appear_on(self.device.image):
if self.match_template_color(MAP_MODE_SWITCH_HARD, offset=(20, 20)):
logger.attr('MAP_MODE_SWITCH', 'hard')
return True
if self.appear(MAP_MODE_SWITCH_NORMAL, offset=(20, 20), interval=2):