sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/sui-feng-cb/AzurLaneAutoScript1.git synced 2026-07-12 18:44:22 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
sui-feng-cb
2026-07-10 00:42:24 +08:00
parent 5ba9b755e9 ffe67f285e
commit ac473abac0
62 changed files with 561 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/retire/assets.py
View File

@@ -15,6 +15,7 @@ DOCK_FIRST_NPC = Button(area={'cn': (96, 111, 123, 123), 'en': (96, 111, 123, 12
DOCK_SCROLL = Button(area={'cn': (1239, 76, 1248, 641), 'en': (1239, 76, 1248, 641), 'jp': (1237, 78, 1250, 628), 'tw': (1239, 76, 1248, 641)}, color={'cn': (47, 46, 37), 'en': (47, 46, 37), 'jp': (180, 156, 66), 'tw': (47, 46, 37)}, button={'cn': (1239, 76, 1248, 641), 'en': (1239, 76, 1248, 641), 'jp': (1237, 78, 1250, 628), 'tw': (1239, 76, 1248, 641)}, file={'cn': './assets/cn/retire/DOCK_SCROLL.png', 'en': './assets/en/retire/DOCK_SCROLL.png', 'jp': './assets/jp/retire/DOCK_SCROLL.png', 'tw': './assets/tw/retire/DOCK_SCROLL.png'})
DOCK_SELECTED = Button(area={'cn': (582, 662, 647, 685), 'en': (597, 658, 655, 691), 'jp': (603, 662, 655, 685), 'tw': (582, 662, 647, 685)}, color={'cn': (75, 75, 83), 'en': (64, 62, 73), 'jp': (84, 83, 92), 'tw': (75, 75, 83)}, button={'cn': (582, 662, 647, 685), 'en': (597, 658, 655, 691), 'jp': (603, 662, 655, 685), 'tw': (582, 662, 647, 685)}, file={'cn': './assets/cn/retire/DOCK_SELECTED.png', 'en': './assets/en/retire/DOCK_SELECTED.png', 'jp': './assets/jp/retire/DOCK_SELECTED.png', 'tw': './assets/tw/retire/DOCK_SELECTED.png'})
DOCK_SHIP_DOWN = Button(area={'cn': (164, 152, 195, 204), 'en': (164, 152, 195, 204), 'jp': (164, 152, 195, 204), 'tw': (164, 152, 195, 204)}, color={'cn': (106, 107, 108), 'en': (106, 107, 108), 'jp': (106, 107, 108), 'tw': (106, 107, 108)}, button={'cn': (90, 74, 223, 269), 'en': (90, 74, 223, 269), 'jp': (90, 74, 223, 269), 'tw': (90, 74, 223, 269)}, file={'cn': './assets/cn/retire/DOCK_SHIP_DOWN.png', 'en': './assets/cn/retire/DOCK_SHIP_DOWN.png', 'jp': './assets/cn/retire/DOCK_SHIP_DOWN.png', 'tw': './assets/cn/retire/DOCK_SHIP_DOWN.png'})
DOCK_UNMOUNT = Button(area={'cn': (161, 141, 225, 216), 'en': (161, 141, 225, 216), 'jp': (161, 141, 225, 216), 'tw': (161, 141, 225, 216)}, color={'cn': (111, 111, 112), 'en': (111, 111, 112), 'jp': (111, 111, 112), 'tw': (111, 111, 112)}, button={'cn': (161, 141, 225, 216), 'en': (161, 141, 225, 216), 'jp': (161, 141, 225, 216), 'tw': (161, 141, 225, 216)}, file={'cn': './assets/cn/retire/DOCK_UNMOUNT.png', 'en': './assets/en/retire/DOCK_UNMOUNT.png', 'jp': './assets/jp/retire/DOCK_UNMOUNT.png', 'tw': './assets/tw/retire/DOCK_UNMOUNT.png'})
EMPTY_ENHANCE_SLOT_PLUS = Button(area={'cn': (737, 402, 773, 437), 'en': (747, 402, 782, 437), 'jp': (737, 402, 773, 437), 'tw': (747, 401, 782, 437)}, color={'cn': (46, 46, 46), 'en': (38, 38, 38), 'jp': (46, 46, 46), 'tw': (43, 43, 43)}, button={'cn': (737, 402, 773, 437), 'en': (747, 402, 782, 437), 'jp': (737, 402, 773, 437), 'tw': (747, 401, 782, 437)}, file={'cn': './assets/cn/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'en': './assets/en/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'jp': './assets/jp/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'tw': './assets/tw/retire/EMPTY_ENHANCE_SLOT_PLUS.png'})
ENHANCE_CONFIRM = Button(area={'cn': (1126, 602, 1256, 645), 'en': (1226, 605, 1262, 641), 'jp': (1126, 601, 1257, 646), 'tw': (1215, 606, 1253, 641)}, color={'cn': (203, 149, 81), 'en': (212, 167, 100), 'jp': (189, 139, 78), 'tw': (216, 169, 99)}, button={'cn': (1126, 602, 1256, 645), 'en': (1226, 605, 1262, 641), 'jp': (1126, 601, 1257, 646), 'tw': (1215, 606, 1253, 641)}, file={'cn': './assets/cn/retire/ENHANCE_CONFIRM.png', 'en': './assets/en/retire/ENHANCE_CONFIRM.png', 'jp': './assets/jp/retire/ENHANCE_CONFIRM.png', 'tw': './assets/tw/retire/ENHANCE_CONFIRM.png'})
ENHANCE_FILLED = Button(area={'cn': (728, 440, 781, 454), 'en': (728, 440, 781, 454), 'jp': (722, 387, 789, 400), 'tw': (728, 440, 781, 454)}, color={'cn': (156, 138, 127), 'en': (156, 138, 127), 'jp': (146, 153, 211), 'tw': (156, 138, 127)}, button={'cn': (728, 440, 781, 454), 'en': (728, 440, 781, 454), 'jp': (722, 387, 789, 400), 'tw': (728, 440, 781, 454)}, file={'cn': './assets/cn/retire/ENHANCE_FILLED.png', 'en': './assets/en/retire/ENHANCE_FILLED.png', 'jp': './assets/jp/retire/ENHANCE_FILLED.png', 'tw': './assets/tw/retire/ENHANCE_FILLED.png'})

8
module/retire/retirement.py
View File

@@ -582,9 +582,9 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
while 1:
filter_obj.load(string)
common_cv = list(dict.fromkeys(
common_ship = list(dict.fromkeys(
[str(name[0]) for name in filter_obj.filter if name[0].upper() in templates]))
if not common_cv:
if not common_ship:
logger.warning(f'Invalid filter set: "{string}". Set to default filter.')
string = default
self.config.cross_set(keys=key, value=default)
@@ -592,8 +592,8 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
# End
if output:
logger.attr('Filter sort', ' > '.join(common_cv))
return common_cv
logger.attr('Filter sort', ' > '.join(common_ship))
return common_ship
def retirement_get_common_rarity_cv_in_page(self):
"""