1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-17 19:15:28 +08:00

prepare to merge

This commit is contained in:
Cyunmi
2021-08-09 16:50:36 +08:00
parent e61a2f1627
commit 4c4321777d
4 changed files with 46 additions and 2 deletions

View File

@@ -31,3 +31,7 @@ SHIP_DETAIL_CHECK = Button(area={'cn': (121, 15, 230, 40), 'en': (126, 16, 225,
SORTING_CLICK = Button(area={'cn': (1004, 14, 1096, 42), 'en': (1002, 12, 1058, 44), 'jp': (1005, 15, 1065, 37), 'tw': (1002, 12, 1098, 44)}, color={'cn': (49, 54, 67), 'en': (47, 51, 65), 'jp': (67, 73, 88), 'tw': (46, 51, 64)}, button={'cn': (1004, 14, 1096, 42), 'en': (1002, 12, 1058, 44), 'jp': (1005, 15, 1065, 37), 'tw': (1002, 12, 1098, 44)}, file={'cn': './assets/cn/retire/SORTING_CLICK.png', 'en': './assets/en/retire/SORTING_CLICK.png', 'jp': './assets/jp/retire/SORTING_CLICK.png', 'tw': './assets/tw/retire/SORTING_CLICK.png'})
SORT_ASC = Button(area={'cn': (1014, 22, 1019, 26), 'en': (1014, 22, 1019, 26), 'jp': (1013, 23, 1019, 25), 'tw': (1014, 22, 1019, 26)}, color={'cn': (189, 207, 231), 'en': (189, 207, 231), 'jp': (189, 207, 231), 'tw': (189, 207, 231)}, button={'cn': (1014, 22, 1019, 26), 'en': (1014, 22, 1019, 26), 'jp': (1013, 23, 1019, 25), 'tw': (1014, 22, 1019, 26)}, file={'cn': './assets/cn/retire/SORT_ASC.png', 'en': './assets/en/retire/SORT_ASC.png', 'jp': './assets/jp/retire/SORT_ASC.png', 'tw': './assets/tw/retire/SORT_ASC.png'})
SORT_DESC = Button(area={'cn': (1014, 29, 1019, 33), 'en': (1014, 29, 1019, 33), 'jp': (1013, 29, 1019, 32), 'tw': (1014, 29, 1019, 33)}, color={'cn': (189, 207, 231), 'en': (189, 207, 231), 'jp': (189, 207, 231), 'tw': (189, 207, 231)}, button={'cn': (1014, 29, 1019, 33), 'en': (1014, 29, 1019, 33), 'jp': (1013, 29, 1019, 32), 'tw': (1014, 29, 1019, 33)}, file={'cn': './assets/cn/retire/SORT_DESC.png', 'en': './assets/en/retire/SORT_DESC.png', 'jp': './assets/jp/retire/SORT_DESC.png', 'tw': './assets/tw/retire/SORT_DESC.png'})
TEMPLATE_BOGUE = Template(file={'cn': './assets/cn/retire/TEMPLATE_BOGUE.png', 'en': './assets/cn/retire/TEMPLATE_BOGUE.png', 'jp': './assets/cn/retire/TEMPLATE_BOGUE.png', 'tw': './assets/cn/retire/TEMPLATE_BOGUE.png'})
TEMPLATE_HERMES = Template(file={'cn': './assets/cn/retire/TEMPLATE_HERMES.png', 'en': './assets/cn/retire/TEMPLATE_HERMES.png', 'jp': './assets/cn/retire/TEMPLATE_HERMES.png', 'tw': './assets/cn/retire/TEMPLATE_HERMES.png'})
TEMPLATE_LANGLEY = Template(file={'cn': './assets/cn/retire/TEMPLATE_LANGLEY.png', 'en': './assets/cn/retire/TEMPLATE_LANGLEY.png', 'jp': './assets/cn/retire/TEMPLATE_LANGLEY.png', 'tw': './assets/cn/retire/TEMPLATE_LANGLEY.png'})
TEMPLATE_RANGER = Template(file={'cn': './assets/cn/retire/TEMPLATE_RANGER.png', 'en': './assets/cn/retire/TEMPLATE_RANGER.png', 'jp': './assets/cn/retire/TEMPLATE_RANGER.png', 'tw': './assets/cn/retire/TEMPLATE_RANGER.png'})

View File

@@ -66,7 +66,7 @@ class Dock(Equipment):
self.ui_back(check_button=self._dock_quit_check_func, skip_first_screenshot=True)
def dock_sort_method_dsc_set(self, enable=True):
if dock_sorting.set('on' if enable else 'off', main=self):
if dock_sorting.set('Descending' if enable else 'Ascending', main=self):
self.handle_dock_cards_loading()
def dock_filter_enter(self):