sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-15 05:17:24 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2025-10-21 17:19:41 +00:00
parent 5bc232fb6b fc7f5a1882
commit 8de57e187e
15 changed files with 216 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
module/commission/project.py
View File

@@ -39,22 +39,6 @@ class SuffixOcr(Ocr):
return image
class TwOcr(Ocr):
def after_process(self, result):
"""
Args:
result (str): '第二行'
Returns:
str:
"""
# There no letter `艦` in training dataset
result = result.replace('鑑', '艦').replace('盤', '艦')
# 支援土蒙爾島
result = result.replace('土蒙爾', '土豪爾')
return result
class Commission:
# Button to enter commission start
button: Button
@@ -115,12 +99,15 @@ class Commission:
def commission_parse(self):
# Name
# This is different from CN, EN has longer names
area = area_offset((176, 23, 420, 53), self.area[0:2])
area = area_offset((131, 23, 409, 53), self.area[0:2])
button = Button(area=area, color=(), button=area, name='COMMISSION')
ocr = Ocr(button, lang='cnocr')
self.button = button
self.name = ocr.ocr(self.image)
self.genre = self.commission_name_parse(self.name.upper())
result = ocr.ocr(self.image).upper()
# DALY RESOURCE EXTRACTION -> DAILY RESOURCE EXTRACTION
result = result.replace('DALY', 'DAILY')
self.name = result
self.genre = self.commission_name_parse(self.name)
# Suffix
ocr = SuffixOcr(button, lang='azur_lane', letter=(255, 255, 255), threshold=128, alphabet='IV')
@@ -163,9 +150,10 @@ class Commission:
button = Button(area=area, color=(), button=area, name='COMMISSION')
ocr = Ocr(button, letter=(201, 201, 201), lang='jp')
self.button = button
self.name = ocr.ocr(self.image)
result = ocr.ocr(self.image).upper()
# NB装備輸送 -> NYB装備輸送
self.name = self.name.replace('NB', 'BYB').replace('BW', 'BIW')
result = result.replace('NB', 'BYB').replace('BW', 'BIW')
self.name = result
self.genre = self.commission_name_parse(self.name)
# Suffix
@@ -207,9 +195,14 @@ class Commission:
# Name
area = area_offset((176, 23, 420, 53), self.area[0:2])
button = Button(area=area, color=(), button=area, name='COMMISSION')
ocr = TwOcr(button, lang='tw', threshold=256)
ocr = Ocr(button, lang='tw', threshold=256)
self.button = button
self.name = ocr.ocr(self.image)
result = ocr.ocr(self.image).upper()
# There no letter `艦` in training dataset
result = result.replace('鑑', '艦').replace('盤', '艦')
# 支援土蒙爾島
result = result.replace('土蒙爾', '土豪爾')
self.name = result
self.genre = self.commission_name_parse(self.name)
# Suffix
@@ -253,7 +246,8 @@ class Commission:
button = Button(area=area, color=(), button=area, name='COMMISSION')
ocr = Ocr(button, lang='cnocr', threshold=256)
self.button = button
self.name = ocr.ocr(self.image)
result = ocr.ocr(self.image).upper()
self.name = result
self.genre = self.commission_name_parse(self.name)
# Suffix

4
module/commission/project_data.py
View File

@@ -18,8 +18,8 @@ dictionary_cn = {
# major_comm needs to be after extra_cube,
# because `Fleet Cargo Transport` is `extra_cube` and `Cargo Transport I` is major_comm
dictionary_en = {
'daily_resource': ['AILY RESOURCE EXTRACTION'],
'daily_chip': ['AKENING TACTICAL RESEARCH'],
'daily_resource': ['DAILY RESOURCE EXTRACTION'],
'daily_chip': ['AWAKENING TACTICAL RESEARCH'],
'extra_drill': ['SAILING', 'BUOY', 'FRONTIER', 'COASTAL', 'SALING'],
'extra_part': ['VEIN', 'FOREST'],
'extra_cube': ['FLEET ESCORT EXERCISE', 'FLEET EXERCISE', 'FLEET CARGO TRANSPORT', 'FLEET COMBAT EXERCISE'],