sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/sui-feng-cb/AzurLaneAutoScript1.git synced 2026-07-13 02:54:25 +08:00
Code Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2026-07-09 22:26:29 +08:00
parent 5db517d697 ffe67f285e
commit ca95938971
4 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/coalition/combat.py
View File

@@ -29,6 +29,8 @@ class CoalitionCombat(CoalitionUI, CampaignBase):
# End
if self.is_combat_loading():
break
if self.is_combat_executing():
break
if self.in_coalition():
raise CampaignEnd
@@ -52,6 +54,11 @@ class CoalitionCombat(CoalitionUI, CampaignBase):
self.device.click(BATTLE_STATUS)
click_timer.reset()
def auto_search_combat_end(self):
if self.appear(BATTLE_STATUS, offset=(80, 20)):
return True
return False
def coalition_combat(self):
"""
Pages:

8
module/combat/auto_search_combat.py
View File

@@ -199,6 +199,12 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
raise CampaignEnd
def auto_search_combat_end(self):
"""
A custom combat end that used in coalition
"""
return False
def auto_search_combat_execute(self, emotion_reduce, fleet_index):
"""
Args:
@@ -281,6 +287,8 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
or self.is_auto_search_running():
self.device.screenshot_interval_set()
break
if self.auto_search_combat_end():
break
def auto_search_combat_status(self):
"""

62
module/retire/dock.py
View File

@@ -1,7 +1,7 @@
import module.config.server as server
from module.base.button import ButtonGrid, get_color, color_similar
from module.base.decorator import cached_property
from module.base.decorator import Config, cached_property
from module.base.timer import Timer
from module.combat.assets import GET_ITEMS_1
from module.equipment.equipment import Equipment
@@ -84,7 +84,7 @@ class Dock(Equipment):
logger.info('Dock filter enter')
self.interval_clear(DOCK_CHECK)
for _ in self.loop():
if self.appear(DOCK_FILTER_CONFIRM, offset=(20, 20)):
if self.appear(DOCK_FILTER_CONFIRM, offset=(20, 60)):
break
if self.appear(DOCK_CHECK, offset=(20, 20), interval=5):
self.device.click(DOCK_FILTER)
@@ -116,16 +116,17 @@ class Dock(Equipment):
# End
# sometimes you have dock filter without black-blurred background
# DOCK_FILTER_CONFIRM and DOCK_CHECK appears
if not self.appear(DOCK_FILTER_CONFIRM, offset=(20, 20)):
if not self.appear(DOCK_FILTER_CONFIRM, offset=(20, 60)):
if self.appear(DOCK_CHECK, offset=(20, 20)):
break
if self.appear_then_click(DOCK_FILTER_CONFIRM, offset=(20, 20), interval=3):
if self.appear_then_click(DOCK_FILTER_CONFIRM, offset=(20, 60), interval=3):
continue
if wait_loading:
self.handle_dock_cards_loading()
@cached_property
@Config.when(SERVER='tw')
def dock_filter(self) -> Setting:
delta = (147 + 1 / 3, 57)
button_shape = (139, 42)
@@ -171,6 +172,54 @@ class Dock(Equipment):
)
return setting
@cached_property
@Config.when(SERVER=None)
def dock_filter(self) -> Setting:
delta = (147 + 1 / 3, 57)
button_shape = (139, 42)
setting = Setting(name='DOCK', main=self)
setting.add_setting(
setting='sort',
option_buttons=ButtonGrid(
origin=(218, 36), delta=delta, button_shape=button_shape, grid_shape=(7, 1), name='FILTER_SORT'),
# stat has extra grid, not worth pursuing
option_names=['rarity', 'level', 'total', 'join', 'intimacy', 'mood', 'stat'],
option_default='level'
)
setting.add_setting(
setting='index',
option_buttons=ButtonGrid(
origin=(218, 109), delta=delta, button_shape=button_shape, grid_shape=(7, 2), name='FILTER_INDEX'),
option_names=['all', 'vanguard', 'main', 'dd', 'cl', 'ca', 'bb',
'cv', 'repair', 'ss', 'others', 'not_available', 'not_available', 'not_available'],
option_default='all'
)
setting.add_setting(
setting='faction',
option_buttons=ButtonGrid(
origin=(218, 239), delta=delta, button_shape=button_shape, grid_shape=(7, 3), name='FILTER_FACTION'),
option_names=['all', 'eagle', 'royal', 'sakura', 'iron', 'dragon', 'sardegna',
'northern', 'iris', 'vichya', 'tulipa', 'pedreria', 'meta', 'tempesta',
'other', 'not_available', 'not_available', 'not_available', 'not_available', 'not_available', 'not_available'],
option_default='all'
)
setting.add_setting(
setting='rarity',
option_buttons=ButtonGrid(
origin=(218, 427), delta=delta, button_shape=button_shape, grid_shape=(7, 1), name='FILTER_RARITY'),
option_names=['all', 'common', 'rare', 'elite', 'super_rare', 'ultra', 'not_available'],
option_default='all'
)
setting.add_setting(
setting='extra',
option_buttons=ButtonGrid(
origin=(218, 499), delta=delta, button_shape=button_shape, grid_shape=(7, 2), name='FILTER_EXTRA'),
option_names=['no_limit', 'has_skin', 'can_retrofit', 'enhanceable', 'can_limit_break', 'not_level_max', 'can_awaken',
'can_awaken_plus', 'special', 'oath_skin', 'unique_augment_module', 'wear_skin', 'oathed', 'not_available'],
option_default='no_limit'
)
return setting
def dock_filter_set(
self,
sort='level',
@@ -191,12 +240,13 @@ class Dock(Equipment):
'cv', 'repair', 'ss', 'others', 'not_available', 'not_available', 'not_available']
faction (str, list):
['all', 'eagle', 'royal', 'sakura', 'iron', 'dragon', 'sardegna',
'northern', 'iris', 'vichya', 'other', 'not_available', 'not_available', 'not_available']
'northern', 'iris', 'vichya', 'tulipa', 'pedreria', 'meta', 'tempesta',
'other', 'not_available', 'not_available', 'not_available', 'not_available', 'not_available', 'not_available']
rarity (str, list):
['all', 'common', 'rare', 'elite', 'super_rare', 'ultra', 'not_available']
extra (str, list):
['no_limit', 'has_skin', 'can_retrofit', 'enhanceable', 'can_limit_break', 'not_level_max', 'can_awaken',
'can_awaken_plus', 'special', 'oath_skin', 'unique_augment_module', 'not_available', 'not_available', 'not_available'],
'can_awaken_plus', 'special', 'oath_skin', 'unique_augment_module', 'wear_skin', 'oathed', 'not_available'],
Pages:
in: page_dock