sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-13 00:57:01 +08:00
Code Activity

Add: [EN] research queue support TEMPLATE_* assets

Browse Source 
Fix: [EN] enlarge search area for status; EN assets on the bigger side
This commit is contained in:
nEEtdo0d
2022-07-18 00:18:18 -04:00
parent cac3119514
commit 77cc057603
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/en/research/TEMPLATE_DETAIL.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 563 B

BIN
assets/en/research/TEMPLATE_RUNNING.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 887 B

BIN
assets/en/research/TEMPLATE_WAITING.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 487 B

6
module/research/assets.py
View File

@@ -59,6 +59,6 @@ STATUS_2 = Button(area={'cn': (330, 570, 336, 576), 'en': (330, 570, 336, 576),
STATUS_3 = Button(area={'cn': (549, 598, 556, 605), 'en': (549, 598, 556, 605), 'jp': (549, 598, 556, 605), 'tw': (549, 598, 556, 605)}, color={'cn': (115, 166, 222), 'en': (115, 166, 222), 'jp': (115, 166, 222), 'tw': (115, 166, 222)}, button={'cn': (549, 598, 556, 605), 'en': (549, 598, 556, 605), 'jp': (549, 598, 556, 605), 'tw': (549, 598, 556, 605)}, file={'cn': './assets/cn/research/STATUS_3.png', 'en': './assets/en/research/STATUS_3.png', 'jp': './assets/jp/research/STATUS_3.png', 'tw': './assets/tw/research/STATUS_3.png'})
STATUS_4 = Button(area={'cn': (790, 570, 796, 576), 'en': (790, 570, 796, 576), 'jp': (790, 570, 796, 576), 'tw': (790, 570, 796, 576)}, color={'cn': (115, 166, 222), 'en': (115, 166, 222), 'jp': (115, 166, 222), 'tw': (115, 166, 222)}, button={'cn': (790, 570, 796, 576), 'en': (790, 570, 796, 576), 'jp': (790, 570, 796, 576), 'tw': (790, 570, 796, 576)}, file={'cn': './assets/cn/research/STATUS_4.png', 'en': './assets/en/research/STATUS_4.png', 'jp': './assets/jp/research/STATUS_4.png', 'tw': './assets/tw/research/STATUS_4.png'})
STATUS_5 = Button(area={'cn': (1031, 541, 1037, 547), 'en': (1031, 541, 1037, 547), 'jp': (1031, 541, 1037, 547), 'tw': (1031, 541, 1037, 547)}, color={'cn': (115, 166, 222), 'en': (115, 166, 222), 'jp': (115, 166, 222), 'tw': (115, 166, 222)}, button={'cn': (1031, 541, 1037, 547), 'en': (1031, 541, 1037, 547), 'jp': (1031, 541, 1037, 547), 'tw': (1031, 541, 1037, 547)}, file={'cn': './assets/cn/research/STATUS_5.png', 'en': './assets/en/research/STATUS_5.png', 'jp': './assets/jp/research/STATUS_5.png', 'tw': './assets/tw/research/STATUS_5.png'})
TEMPLATE_DETAIL = Template(file={'cn': './assets/cn/research/TEMPLATE_DETAIL.png', 'en': './assets/cn/research/TEMPLATE_DETAIL.png', 'jp': './assets/cn/research/TEMPLATE_DETAIL.png', 'tw': './assets/cn/research/TEMPLATE_DETAIL.png'})
TEMPLATE_RUNNING = Template(file={'cn': './assets/cn/research/TEMPLATE_RUNNING.png', 'en': './assets/cn/research/TEMPLATE_RUNNING.png', 'jp': './assets/cn/research/TEMPLATE_RUNNING.png', 'tw': './assets/cn/research/TEMPLATE_RUNNING.png'})
TEMPLATE_WAITING = Template(file={'cn': './assets/cn/research/TEMPLATE_WAITING.png', 'en': './assets/cn/research/TEMPLATE_WAITING.png', 'jp': './assets/cn/research/TEMPLATE_WAITING.png', 'tw': './assets/cn/research/TEMPLATE_WAITING.png'})
TEMPLATE_DETAIL = Template(file={'cn': './assets/cn/research/TEMPLATE_DETAIL.png', 'en': './assets/en/research/TEMPLATE_DETAIL.png', 'jp': './assets/cn/research/TEMPLATE_DETAIL.png', 'tw': './assets/cn/research/TEMPLATE_DETAIL.png'})
TEMPLATE_RUNNING = Template(file={'cn': './assets/cn/research/TEMPLATE_RUNNING.png', 'en': './assets/en/research/TEMPLATE_RUNNING.png', 'jp': './assets/cn/research/TEMPLATE_RUNNING.png', 'tw': './assets/cn/research/TEMPLATE_RUNNING.png'})
TEMPLATE_WAITING = Template(file={'cn': './assets/cn/research/TEMPLATE_WAITING.png', 'en': './assets/en/research/TEMPLATE_WAITING.png', 'jp': './assets/cn/research/TEMPLATE_WAITING.png', 'tw': './assets/cn/research/TEMPLATE_WAITING.png'})

2
module/research/ui.py
View File

@@ -91,7 +91,7 @@ class ResearchUI(UI):
"""
out = []
for index, status, scaling in zip(range(5), RESEARCH_STATUS, TEMPLATE_SCALING):
info = status.crop((55, -40, 190, 0))
info = status.crop((0, -40, 200, 0))
piece = rgb2gray(crop(image, info.area))
if TEMPLATE_WAITING.match(piece, scaling=scaling):
out.append('waiting')