WindyMadman/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/LmeSzinc/AzurLaneAutoScript.git synced 2025-01-08 12:47:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "tmp: [JP] opsi beacon page color and assets"

Browse Source 
This reverts commit 402a0083ef.
This commit is contained in:
guoh064 2024-10-21 10:14:53 +08:00
parent 98e6d1397c
commit d3eb5fa774
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/jp/os_ash/META_BEACON_DATA.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
assets/jp/os_ash/META_DAMAGE.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
assets/jp/os_ash/META_DOSSIER_DATA.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

6
module/os_ash/assets.py
View File

@ -27,11 +27,11 @@ META_AUTO_ATTACKING = Button(area={'cn': (746, 649, 778, 680), 'en': (746, 649,
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'})

10
module/os_ash/meta.py
View File

@ -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 @@ class MetaDigitCounter(DigitCounter):
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