diff --git a/assets/tw/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png b/assets/tw/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png index ea6d536fc..cb6417170 100644 Binary files a/assets/tw/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png and b/assets/tw/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png differ diff --git a/module/shipyard/assets.py b/module/shipyard/assets.py index b777c4858..964a26037 100644 --- a/module/shipyard/assets.py +++ b/module/shipyard/assets.py @@ -20,7 +20,7 @@ SHIPYARD_PROGRESS_FATE = Button(area={'cn': (1141, 153, 1278, 190), 'en': (1141, SHIPYARD_RESEARCH_COMPLETE = Button(area={'cn': (548, 498, 740, 531), 'en': (548, 498, 740, 531), 'jp': (536, 494, 731, 538), 'tw': (548, 498, 740, 531)}, color={'cn': (214, 142, 124), 'en': (214, 142, 124), 'jp': (208, 120, 95), 'tw': (214, 142, 124)}, button={'cn': (548, 498, 740, 531), 'en': (548, 498, 740, 531), 'jp': (536, 494, 731, 538), 'tw': (548, 498, 740, 531)}, file={'cn': './assets/cn/shipyard/SHIPYARD_RESEARCH_COMPLETE.png', 'en': './assets/en/shipyard/SHIPYARD_RESEARCH_COMPLETE.png', 'jp': './assets/jp/shipyard/SHIPYARD_RESEARCH_COMPLETE.png', 'tw': './assets/tw/shipyard/SHIPYARD_RESEARCH_COMPLETE.png'}) SHIPYARD_RESEARCH_INCOMPLETE = Button(area={'cn': (616, 490, 740, 531), 'en': (616, 490, 740, 531), 'jp': (614, 493, 735, 521), 'tw': (616, 490, 740, 531)}, color={'cn': (229, 192, 121), 'en': (229, 192, 121), 'jp': (244, 219, 164), 'tw': (229, 192, 121)}, button={'cn': (616, 490, 740, 531), 'en': (616, 490, 740, 531), 'jp': (614, 493, 735, 521), 'tw': (616, 490, 740, 531)}, file={'cn': './assets/cn/shipyard/SHIPYARD_RESEARCH_INCOMPLETE.png', 'en': './assets/en/shipyard/SHIPYARD_RESEARCH_INCOMPLETE.png', 'jp': './assets/jp/shipyard/SHIPYARD_RESEARCH_INCOMPLETE.png', 'tw': './assets/tw/shipyard/SHIPYARD_RESEARCH_INCOMPLETE.png'}) SHIPYARD_RESEARCH_IN_PROGRESS = Button(area={'cn': (465, 479, 482, 501), 'en': (465, 479, 482, 501), 'jp': (465, 479, 482, 501), 'tw': (465, 479, 482, 501)}, color={'cn': (105, 135, 173), 'en': (105, 135, 173), 'jp': (105, 135, 173), 'tw': (105, 135, 173)}, button={'cn': (465, 479, 482, 501), 'en': (465, 479, 482, 501), 'jp': (465, 479, 482, 501), 'tw': (465, 479, 482, 501)}, file={'cn': './assets/cn/shipyard/SHIPYARD_RESEARCH_IN_PROGRESS.png', 'en': './assets/en/shipyard/SHIPYARD_RESEARCH_IN_PROGRESS.png', 'jp': './assets/jp/shipyard/SHIPYARD_RESEARCH_IN_PROGRESS.png', 'tw': './assets/tw/shipyard/SHIPYARD_RESEARCH_IN_PROGRESS.png'}) -SHIPYARD_SERIES_SELECT_CHECK = Button(area={'cn': (32, 62, 53, 100), 'en': (32, 62, 53, 100), 'jp': (32, 62, 53, 100), 'tw': (32, 62, 53, 100)}, color={'cn': (9, 61, 190), 'en': (9, 61, 190), 'jp': (9, 61, 190), 'tw': (9, 61, 190)}, button={'cn': (32, 62, 53, 100), 'en': (32, 62, 53, 100), 'jp': (32, 62, 53, 100), 'tw': (32, 62, 53, 100)}, file={'cn': './assets/cn/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'en': './assets/en/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'jp': './assets/jp/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'tw': './assets/tw/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png'}) +SHIPYARD_SERIES_SELECT_CHECK = Button(area={'cn': (32, 62, 53, 100), 'en': (32, 62, 53, 100), 'jp': (32, 62, 53, 100), 'tw': (565, 194, 715, 212)}, color={'cn': (9, 61, 190), 'en': (9, 61, 190), 'jp': (9, 61, 190), 'tw': (18, 28, 56)}, button={'cn': (32, 62, 53, 100), 'en': (32, 62, 53, 100), 'jp': (32, 62, 53, 100), 'tw': (565, 194, 715, 212)}, file={'cn': './assets/cn/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'en': './assets/en/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'jp': './assets/jp/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'tw': './assets/tw/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png'}) SHIPYARD_SERIES_SELECT_ENTER = Button(area={'cn': (33, 659, 161, 701), 'en': (34, 659, 160, 700), 'jp': (36, 674, 154, 696), 'tw': (33, 657, 157, 697)}, color={'cn': (91, 110, 155), 'en': (66, 87, 138), 'jp': (112, 126, 161), 'tw': (98, 117, 164)}, button={'cn': (33, 659, 161, 701), 'en': (34, 659, 160, 700), 'jp': (36, 674, 154, 696), 'tw': (33, 657, 157, 697)}, file={'cn': './assets/cn/shipyard/SHIPYARD_SERIES_SELECT_ENTER.png', 'en': './assets/en/shipyard/SHIPYARD_SERIES_SELECT_ENTER.png', 'jp': './assets/jp/shipyard/SHIPYARD_SERIES_SELECT_ENTER.png', 'tw': './assets/tw/shipyard/SHIPYARD_SERIES_SELECT_ENTER.png'}) SHIPYARD_TOTAL_DEV = Button(area={'cn': (1086, 429, 1147, 463), 'en': (1091, 426, 1142, 466), 'jp': (1086, 429, 1147, 463), 'tw': (1086, 429, 1147, 463)}, color={'cn': (39, 46, 55), 'en': (45, 48, 55), 'jp': (39, 46, 55), 'tw': (39, 46, 55)}, button={'cn': (1086, 429, 1147, 463), 'en': (1091, 426, 1142, 466), 'jp': (1086, 429, 1147, 463), 'tw': (1086, 429, 1147, 463)}, file={'cn': './assets/cn/shipyard/SHIPYARD_TOTAL_DEV.png', 'en': './assets/en/shipyard/SHIPYARD_TOTAL_DEV.png', 'jp': './assets/jp/shipyard/SHIPYARD_TOTAL_DEV.png', 'tw': './assets/tw/shipyard/SHIPYARD_TOTAL_DEV.png'}) SHIPYARD_TOTAL_FATE = Button(area={'cn': (1067, 457, 1126, 484), 'en': (1100, 449, 1165, 486), 'jp': (1067, 457, 1126, 484), 'tw': (1067, 457, 1126, 484)}, color={'cn': (43, 50, 59), 'en': (47, 51, 59), 'jp': (43, 50, 59), 'tw': (43, 50, 59)}, button={'cn': (1067, 457, 1126, 484), 'en': (1100, 449, 1165, 486), 'jp': (1067, 457, 1126, 484), 'tw': (1067, 457, 1126, 484)}, file={'cn': './assets/cn/shipyard/SHIPYARD_TOTAL_FATE.png', 'en': './assets/en/shipyard/SHIPYARD_TOTAL_FATE.png', 'jp': './assets/jp/shipyard/SHIPYARD_TOTAL_FATE.png', 'tw': './assets/tw/shipyard/SHIPYARD_TOTAL_FATE.png'}) diff --git a/module/shipyard/ui_globals.py b/module/shipyard/ui_globals.py index 3c2301ca3..185a93278 100644 --- a/module/shipyard/ui_globals.py +++ b/module/shipyard/ui_globals.py @@ -1,3 +1,4 @@ +import module.config.server as server from module.base.button import ButtonGrid from module.ocr.ocr import Digit from module.shipyard.assets import * @@ -10,9 +11,14 @@ SHIPYARD_BP_COUNT_GRID = ButtonGrid(origin=(324, 688), delta=(181, 0), button_shape=(45, 30), grid_shape=(6, 1), name='SHIPYARD_BP_COUNT_GRID') -SHIPYARD_SERIES_GRID = ButtonGrid(origin=(75, 133), delta=(399, 91), - button_shape=(337, 60), grid_shape=(3, 3), - name='SHIPYARD_SERIES_GRID') +if server.server == 'tw': + SHIPYARD_SERIES_GRID = ButtonGrid(origin=(450, 260), delta=(280, 90), + button_shape=(155, 40), grid_shape=(2, 3), + name='SHIPYARD_SERIES_GRID') +else: + SHIPYARD_SERIES_GRID = ButtonGrid(origin=(75, 133), delta=(399, 91), + button_shape=(337, 60), grid_shape=(3, 3), + name='SHIPYARD_SERIES_GRID') OCR_SHIPYARD_BP_COUNT_GRID = Digit(SHIPYARD_BP_COUNT_GRID.buttons, letter=(255, 247, 247),