From d3eb5fa774a101635b89d9305a7f584b8d36c5b5 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:14:53 +0800 Subject: [PATCH 1/2] Revert "tmp: [JP] opsi beacon page color and assets" This reverts commit 402a0083ef9b904ec7625ac678769863e1557d64. --- assets/jp/os_ash/META_BEACON_DATA.png | Bin 8646 -> 7133 bytes assets/jp/os_ash/META_DAMAGE.png | Bin 8924 -> 8473 bytes assets/jp/os_ash/META_DOSSIER_DATA.png | Bin 8837 -> 7458 bytes module/os_ash/assets.py | 6 +++--- module/os_ash/meta.py | 10 ++-------- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/assets/jp/os_ash/META_BEACON_DATA.png b/assets/jp/os_ash/META_BEACON_DATA.png index 135e96d5979f8bd09c03fdf4e2c743922d5a438b..8a4b35bff836da9f2c3394d09a7972d234c09586 100644 GIT binary patch delta 4558 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 diff --git a/assets/jp/os_ash/META_DAMAGE.png b/assets/jp/os_ash/META_DAMAGE.png index 8effce22512e8233421ab3d0842028674a5c865a..fb53fab222e8ab388267e7ae2c50a6de12d8a06f 100644 GIT binary patch delta 5944 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 literal 8837 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 UH(945B+*!z+mf#QbMJ5e1IHI7=l}o! diff --git a/module/os_ash/assets.py b/module/os_ash/assets.py index 1f322e76d9..82e196a229 100644 --- a/module/os_ash/assets.py +++ b/module/os_ash/assets.py @@ -27,11 +27,11 @@ META_AUTO_ATTACK_CONFIRM = Button(area={'cn': (717, 493, 884, 547), 'en': (736, 494, 861, 544), 'jp': (717, 493, 884, 547), 'tw': (717, 493, 884, 547)}, color={'cn': (185, 98, 88), 'en': (190, 109, 99), 'jp': (185, 98, 88), 'tw': (185, 98, 88)}, button={'cn': (717, 493, 884, 547), 'en': (736, 494, 861, 544), 'jp': (717, 493, 884, 547), 'tw': (717, 493, 884, 547)}, file={'cn': './assets/cn/os_ash/META_AUTO_ATTACK_CONFIRM.png', 'en': './assets/en/os_ash/META_AUTO_ATTACK_CONFIRM.png', 'jp': './assets/cn/os_ash/META_AUTO_ATTACK_CONFIRM.png', 'tw': './assets/cn/os_ash/META_AUTO_ATTACK_CONFIRM.png'}) META_AUTO_ATTACK_START = Button(area={'cn': (746, 648, 777, 683), 'en': (718, 653, 742, 677), 'jp': (746, 648, 777, 683), 'tw': (746, 648, 777, 683)}, color={'cn': (77, 63, 61), 'en': (103, 86, 85), 'jp': (77, 63, 61), 'tw': (77, 63, 61)}, button={'cn': (746, 648, 777, 683), 'en': (718, 653, 742, 677), 'jp': (746, 648, 777, 683), 'tw': (746, 648, 777, 683)}, file={'cn': './assets/cn/os_ash/META_AUTO_ATTACK_START.png', 'en': './assets/en/os_ash/META_AUTO_ATTACK_START.png', 'jp': './assets/cn/os_ash/META_AUTO_ATTACK_START.png', 'tw': './assets/cn/os_ash/META_AUTO_ATTACK_START.png'}) META_AUTO_CONFIRM = Button(area={'cn': (608, 506, 674, 535), 'en': (584, 510, 698, 530), 'jp': (563, 498, 717, 540), 'tw': (608, 506, 674, 535)}, color={'cn': (208, 148, 141), 'en': (216, 168, 162), 'jp': (187, 103, 92), 'tw': (208, 148, 141)}, button={'cn': (608, 506, 674, 535), 'en': (584, 510, 698, 530), 'jp': (563, 498, 717, 540), 'tw': (608, 506, 674, 535)}, file={'cn': './assets/cn/os_ash/META_AUTO_CONFIRM.png', 'en': './assets/en/os_ash/META_AUTO_CONFIRM.png', 'jp': './assets/jp/os_ash/META_AUTO_CONFIRM.png', 'tw': './assets/cn/os_ash/META_AUTO_CONFIRM.png'}) -META_BEACON_DATA = Button(area={'cn': (840, 22, 951, 45), 'en': (840, 22, 951, 45), 'jp': (865, 21, 923, 44), 'tw': (840, 22, 951, 45)}, color={'cn': (49, 53, 52), 'en': (49, 53, 52), 'jp': (63, 61, 62), 'tw': (49, 53, 52)}, button={'cn': (840, 22, 951, 45), 'en': (840, 22, 951, 45), 'jp': (865, 21, 923, 44), 'tw': (840, 22, 951, 45)}, file={'cn': './assets/cn/os_ash/META_BEACON_DATA.png', 'en': './assets/en/os_ash/META_BEACON_DATA.png', 'jp': './assets/jp/os_ash/META_BEACON_DATA.png', 'tw': './assets/tw/os_ash/META_BEACON_DATA.png'}) +META_BEACON_DATA = Button(area={'cn': (840, 22, 951, 45), 'en': (840, 22, 951, 45), 'jp': (840, 22, 951, 45), 'tw': (840, 22, 951, 45)}, color={'cn': (49, 53, 52), 'en': (49, 53, 52), 'jp': (49, 53, 52), 'tw': (49, 53, 52)}, button={'cn': (840, 22, 951, 45), 'en': (840, 22, 951, 45), 'jp': (840, 22, 951, 45), 'tw': (840, 22, 951, 45)}, file={'cn': './assets/cn/os_ash/META_BEACON_DATA.png', 'en': './assets/en/os_ash/META_BEACON_DATA.png', 'jp': './assets/jp/os_ash/META_BEACON_DATA.png', 'tw': './assets/tw/os_ash/META_BEACON_DATA.png'}) META_BEACON_FLAG = Button(area={'cn': (788, 22, 811, 45), 'en': (788, 22, 811, 45), 'jp': (788, 22, 811, 45), 'tw': (788, 22, 811, 45)}, color={'cn': (48, 111, 134), 'en': (48, 111, 134), 'jp': (48, 111, 134), 'tw': (48, 111, 134)}, button={'cn': (788, 22, 811, 45), 'en': (788, 22, 811, 45), 'jp': (788, 22, 811, 45), 'tw': (788, 22, 811, 45)}, file={'cn': './assets/cn/os_ash/META_BEACON_FLAG.png', 'en': './assets/en/os_ash/META_BEACON_FLAG.png', 'jp': './assets/jp/os_ash/META_BEACON_FLAG.png', 'tw': './assets/tw/os_ash/META_BEACON_FLAG.png'}) META_BEGIN_ENTRANCE = Button(area={'cn': (651, 348, 706, 372), 'en': (646, 359, 706, 370), 'jp': (652, 348, 706, 371), 'tw': (650, 348, 706, 372)}, color={'cn': (99, 99, 98), 'en': (100, 104, 103), 'jp': (101, 102, 101), 'tw': (95, 97, 99)}, button={'cn': (546, 115, 748, 503), 'en': (546, 115, 748, 503), 'jp': (546, 115, 748, 503), 'tw': (546, 115, 748, 503)}, file={'cn': './assets/cn/os_ash/META_BEGIN_ENTRANCE.png', 'en': './assets/en/os_ash/META_BEGIN_ENTRANCE.png', 'jp': './assets/jp/os_ash/META_BEGIN_ENTRANCE.gif', 'tw': './assets/tw/os_ash/META_BEGIN_ENTRANCE.png'}) -META_DAMAGE = Button(area={'cn': (1196, 380, 1276, 416), 'en': (1196, 380, 1276, 416), 'jp': (1217, 378, 1276, 407), 'tw': (1196, 380, 1276, 416)}, color={'cn': (58, 59, 58), 'en': (58, 59, 58), 'jp': (59, 60, 59), 'tw': (58, 59, 58)}, button={'cn': (1196, 380, 1276, 416), 'en': (1196, 380, 1276, 416), 'jp': (1217, 378, 1276, 407), 'tw': (1196, 380, 1276, 416)}, file={'cn': './assets/cn/os_ash/META_DAMAGE.png', 'en': './assets/en/os_ash/META_DAMAGE.png', 'jp': './assets/jp/os_ash/META_DAMAGE.png', 'tw': './assets/tw/os_ash/META_DAMAGE.png'}) -META_DOSSIER_DATA = Button(area={'cn': (1050, 22, 1161, 46), 'en': (1050, 22, 1161, 46), 'jp': (1070, 21, 1141, 44), 'tw': (1050, 22, 1161, 46)}, color={'cn': (53, 56, 56), 'en': (53, 56, 56), 'jp': (66, 65, 65), 'tw': (53, 56, 56)}, button={'cn': (1050, 22, 1161, 46), 'en': (1050, 22, 1161, 46), 'jp': (1070, 21, 1141, 44), 'tw': (1050, 22, 1161, 46)}, file={'cn': './assets/cn/os_ash/META_DOSSIER_DATA.png', 'en': './assets/en/os_ash/META_DOSSIER_DATA.png', 'jp': './assets/jp/os_ash/META_DOSSIER_DATA.png', 'tw': './assets/tw/os_ash/META_DOSSIER_DATA.png'}) +META_DAMAGE = Button(area={'cn': (1196, 380, 1276, 416), 'en': (1196, 380, 1276, 416), 'jp': (1196, 380, 1276, 416), 'tw': (1196, 380, 1276, 416)}, color={'cn': (58, 59, 58), 'en': (58, 59, 58), 'jp': (58, 59, 58), 'tw': (58, 59, 58)}, button={'cn': (1196, 380, 1276, 416), 'en': (1196, 380, 1276, 416), 'jp': (1196, 380, 1276, 416), 'tw': (1196, 380, 1276, 416)}, file={'cn': './assets/cn/os_ash/META_DAMAGE.png', 'en': './assets/en/os_ash/META_DAMAGE.png', 'jp': './assets/jp/os_ash/META_DAMAGE.png', 'tw': './assets/tw/os_ash/META_DAMAGE.png'}) +META_DOSSIER_DATA = Button(area={'cn': (1050, 22, 1161, 46), 'en': (1050, 22, 1161, 46), 'jp': (1050, 22, 1161, 46), 'tw': (1050, 22, 1161, 46)}, color={'cn': (53, 56, 56), 'en': (53, 56, 56), 'jp': (53, 56, 56), 'tw': (53, 56, 56)}, button={'cn': (1050, 22, 1161, 46), 'en': (1050, 22, 1161, 46), 'jp': (1050, 22, 1161, 46), 'tw': (1050, 22, 1161, 46)}, file={'cn': './assets/cn/os_ash/META_DOSSIER_DATA.png', 'en': './assets/en/os_ash/META_DOSSIER_DATA.png', 'jp': './assets/jp/os_ash/META_DOSSIER_DATA.png', 'tw': './assets/tw/os_ash/META_DOSSIER_DATA.png'}) META_DOSSIER_FLAG = Button(area={'cn': (999, 22, 1022, 45), 'en': (999, 22, 1022, 45), 'jp': (999, 22, 1022, 45), 'tw': (999, 22, 1022, 45)}, color={'cn': (123, 70, 44), 'en': (123, 70, 44), 'jp': (123, 70, 44), 'tw': (123, 70, 44)}, button={'cn': (999, 22, 1022, 45), 'en': (999, 22, 1022, 45), 'jp': (999, 22, 1022, 45), 'tw': (999, 22, 1022, 45)}, file={'cn': './assets/cn/os_ash/META_DOSSIER_FLAG.png', 'en': './assets/en/os_ash/META_DOSSIER_FLAG.png', 'jp': './assets/jp/os_ash/META_DOSSIER_FLAG.png', 'tw': './assets/tw/os_ash/META_DOSSIER_FLAG.png'}) META_ENTRANCE = Button(area={'cn': (578, 463, 623, 493), 'en': (578, 463, 623, 493), 'jp': (578, 463, 623, 493), 'tw': (578, 463, 623, 493)}, color={'cn': (106, 134, 169), 'en': (106, 134, 169), 'jp': (106, 134, 169), 'tw': (106, 134, 169)}, button={'cn': (578, 463, 623, 493), 'en': (578, 463, 623, 493), 'jp': (578, 463, 623, 493), 'tw': (578, 463, 623, 493)}, file={'cn': './assets/cn/os_ash/META_ENTRANCE.png', 'en': './assets/en/os_ash/META_ENTRANCE.png', 'jp': './assets/jp/os_ash/META_ENTRANCE.png', 'tw': './assets/tw/os_ash/META_ENTRANCE.png'}) META_INNER_PAGE_DAMAGE = Button(area={'cn': (936, 105, 1029, 128), 'en': (938, 108, 1073, 125), 'jp': (937, 109, 1088, 128), 'tw': (936, 105, 1029, 128)}, color={'cn': (148, 105, 105), 'en': (144, 103, 103), 'jp': (115, 78, 77), 'tw': (148, 105, 105)}, button={'cn': (936, 105, 1029, 128), 'en': (938, 108, 1073, 125), 'jp': (937, 109, 1088, 128), 'tw': (936, 105, 1029, 128)}, file={'cn': './assets/cn/os_ash/META_INNER_PAGE_DAMAGE.png', 'en': './assets/en/os_ash/META_INNER_PAGE_DAMAGE.png', 'jp': './assets/jp/os_ash/META_INNER_PAGE_DAMAGE.png', 'tw': './assets/cn/os_ash/META_INNER_PAGE_DAMAGE.png'}) diff --git a/module/os_ash/meta.py b/module/os_ash/meta.py index b1312d4dad..8d854926a5 100644 --- a/module/os_ash/meta.py +++ b/module/os_ash/meta.py @@ -23,10 +23,7 @@ class MetaState(Enum): OCR_BEACON_TIER = Digit(BEACON_TIER, name='OCR_ASH_TIER') -if server.server != 'jp': - OCR_META_DAMAGE = Digit(META_DAMAGE, name='OCR_META_DAMAGE') -else: - OCR_META_DAMAGE = Digit(META_DAMAGE, letter=(201, 201, 201), name='OCR_META_DAMAGE') +OCR_META_DAMAGE = Digit(META_DAMAGE, name='OCR_META_DAMAGE') class MetaDigitCounter(DigitCounter): @@ -47,10 +44,7 @@ def after_process(self, result): class Meta(UI, MapEventHandler): def digit_ocr_point_and_check(self, button: Button, check_number: int): - if server.server != 'jp': - point_ocr = MetaDigitCounter(button, letter=(235, 235, 235), threshold=160, name='POINT_OCR') - else: - point_ocr = MetaDigitCounter(button, letter=(192, 192, 192), threshold=160, name='POINT_OCR') + point_ocr = MetaDigitCounter(button, letter=(235, 235, 235), threshold=160, name='POINT_OCR') point, _, _ = point_ocr.ocr(self.device.image) if point >= check_number: return True From 99363a3c14314cd198d3f00c0fa90a262cd443c4 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:20:34 +0800 Subject: [PATCH 2/2] upd: [JP] opsi beacon page color --- module/os_ash/meta.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/module/os_ash/meta.py b/module/os_ash/meta.py index 8d854926a5..b1312d4dad 100644 --- a/module/os_ash/meta.py +++ b/module/os_ash/meta.py @@ -23,7 +23,10 @@ class MetaState(Enum): OCR_BEACON_TIER = Digit(BEACON_TIER, name='OCR_ASH_TIER') -OCR_META_DAMAGE = Digit(META_DAMAGE, name='OCR_META_DAMAGE') +if server.server != 'jp': + OCR_META_DAMAGE = Digit(META_DAMAGE, name='OCR_META_DAMAGE') +else: + OCR_META_DAMAGE = Digit(META_DAMAGE, letter=(201, 201, 201), name='OCR_META_DAMAGE') class MetaDigitCounter(DigitCounter): @@ -44,7 +47,10 @@ def after_process(self, result): class Meta(UI, MapEventHandler): def digit_ocr_point_and_check(self, button: Button, check_number: int): - point_ocr = MetaDigitCounter(button, letter=(235, 235, 235), threshold=160, name='POINT_OCR') + if server.server != 'jp': + point_ocr = MetaDigitCounter(button, letter=(235, 235, 235), threshold=160, name='POINT_OCR') + else: + point_ocr = MetaDigitCounter(button, letter=(192, 192, 192), threshold=160, name='POINT_OCR') point, _, _ = point_ocr.ocr(self.device.image) if point >= check_number: return True