sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 04:37:44 +08:00
Code Activity

Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil

Browse Source 
- Add Digit OCR
This commit is contained in:
LmeSzinc
2020-07-15 00:15:21 +08:00
parent b55abd1178
commit 0cc2fe2946
38 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/daily/assets.py
View File

@@ -14,5 +14,5 @@ DAILY_MISSION_2 = Button(area={'cn': (482, 300, 701, 415), 'en': (584, 363, 701,
DAILY_MISSION_3 = Button(area={'cn': (482, 460, 701, 575), 'en': (583, 522, 701, 534), 'jp': (482, 460, 701, 575)}, color={'cn': (75, 106, 146), 'en': (73, 101, 139), 'jp': (75, 106, 146)}, button={'cn': (482, 460, 701, 575), 'en': (583, 522, 701, 534), 'jp': (482, 460, 701, 575)}, file={'cn': './assets/cn/daily/DAILY_MISSION_3.png', 'en': './assets/en/daily/DAILY_MISSION_3.png', 'jp': './assets/jp/daily/DAILY_MISSION_3.png'})
DAILY_NEXT = Button(area={'cn': (821, 161, 996, 604), 'en': (811, 151, 1004, 612), 'jp': (821, 161, 996, 604)}, color={'cn': (71, 48, 43), 'en': (66, 44, 39), 'jp': (71, 48, 43)}, button={'cn': (821, 161, 996, 604), 'en': (811, 151, 1004, 612), 'jp': (821, 161, 996, 604)}, file={'cn': './assets/cn/daily/DAILY_NEXT.png', 'en': './assets/en/daily/DAILY_NEXT.png', 'jp': './assets/jp/daily/DAILY_NEXT.png'})
DAILY_PREV = Button(area={'cn': (282, 163, 456, 600), 'en': (282, 163, 456, 600), 'jp': (282, 163, 456, 600)}, color={'cn': (60, 73, 71), 'en': (57, 70, 69), 'jp': (60, 73, 71)}, button={'cn': (282, 163, 456, 600), 'en': (282, 163, 456, 600), 'jp': (282, 163, 456, 600)}, file={'cn': './assets/cn/daily/DAILY_PREV.png', 'en': './assets/en/daily/DAILY_PREV.png', 'jp': './assets/jp/daily/DAILY_PREV.png'})
OCR_DAILY_FLEET_INDEX = Button(area={'cn': (524, 615, 562, 658), 'en': (531, 614, 556, 659), 'jp': (531, 614, 556, 658)}, color={'cn': (66, 102, 158), 'en': (73, 118, 188), 'jp': (74, 119, 191)}, button={'cn': (524, 615, 562, 658), 'en': (531, 614, 556, 659), 'jp': (531, 614, 556, 658)}, file={'cn': './assets/cn/daily/OCR_DAILY_FLEET_INDEX.png', 'en': './assets/en/daily/OCR_DAILY_FLEET_INDEX.png', 'jp': './assets/jp/daily/OCR_DAILY_FLEET_INDEX.png'})
OCR_REMAIN = Button(area={'cn': (532, 119, 545, 141), 'en': (532, 119, 545, 141), 'jp': (532, 119, 545, 141)}, color={'cn': (123, 151, 175), 'en': (123, 151, 175), 'jp': (123, 151, 175)}, button={'cn': (532, 119, 545, 141), 'en': (532, 119, 545, 141), 'jp': (532, 119, 545, 141)}, file={'cn': './assets/cn/daily/OCR_REMAIN.png', 'en': './assets/en/daily/OCR_REMAIN.png', 'jp': './assets/jp/daily/OCR_REMAIN.png'})
OCR_DAILY_FLEET_INDEX = Button(area={'cn': (525, 605, 561, 667), 'en': (525, 605, 561, 667), 'jp': (525, 605, 561, 667)}, color={'cn': (60, 90, 139), 'en': (60, 90, 139), 'jp': (60, 90, 139)}, button={'cn': (525, 605, 561, 667), 'en': (525, 605, 561, 667), 'jp': (525, 605, 561, 667)}, file={'cn': './assets/cn/daily/OCR_DAILY_FLEET_INDEX.png', 'en': './assets/en/daily/OCR_DAILY_FLEET_INDEX.png', 'jp': './assets/jp/daily/OCR_DAILY_FLEET_INDEX.png'})
OCR_REMAIN = Button(area={'cn': (526, 114, 546, 144), 'en': (526, 114, 546, 144), 'jp': (526, 114, 546, 144)}, color={'cn': (94, 132, 164), 'en': (94, 132, 164), 'jp': (94, 132, 164)}, button={'cn': (526, 114, 546, 144), 'en': (526, 114, 546, 144), 'jp': (526, 114, 546, 144)}, file={'cn': './assets/cn/daily/OCR_REMAIN.png', 'en': './assets/en/daily/OCR_REMAIN.png', 'jp': './assets/jp/daily/OCR_REMAIN.png'})

7
module/daily/daily.py
View File

@@ -1,17 +1,16 @@
import numpy as np
from module.base.ocr import Digit
from module.base.utils import get_color
from module.combat.combat import Combat
from module.daily.assets import *
from module.equipment.fleet_equipment import DailyEquipment
from module.logger import logger
from module.ocr.ocr import Digit
from module.ui.ui import page_daily, page_campaign, BACK_ARROW, DAILY_CHECK
DAILY_MISSION_LIST = [DAILY_MISSION_1, DAILY_MISSION_2, DAILY_MISSION_3]
OCR_REMAIN = Digit(OCR_REMAIN, letter=(255, 255, 255), back=(127, 127, 127), length=1, white_list='0123')
OCR_DAILY_FLEET_INDEX = Digit(OCR_DAILY_FLEET_INDEX, letter=(90, 154, 255), back=(24, 32, 49), length=1,
white_list='123456')
OCR_REMAIN = Digit(OCR_REMAIN, threshold=128, alphabet='0123')
OCR_DAILY_FLEET_INDEX = Digit(OCR_DAILY_FLEET_INDEX, letter=(90, 154, 255), threshold=128, alphabet='123456')
RECORD_OPTION = ('DailyRecord', 'daily')
RECORD_SINCE = (0,)