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

Fix: gacha coin ocr

Browse Source
This commit is contained in:
sui-feng-cb
2025-08-26 09:03:35 +08:00
parent cdfebcb50c
commit 6c0ca9596d
2 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
module/campaign/campaign_status.py
View File

@@ -76,8 +76,8 @@ class CampaignStatus(UI):
break break
_coin = { _coin = {
'Value': self._get_num(OCR_COIN, 'OCR_COIN'), 'Value': self._get_num(OCR_COIN, 'OCR_COIN', (239, 239, 239)),
'Limit': self._get_num(OCR_COIN_LIMIT, 'OCR_COIN_LIMIT') 'Limit': self._get_num(OCR_COIN_LIMIT, 'OCR_COIN_LIMIT', (239, 239, 239))
} }
if _coin['Value'] >= 100: if _coin['Value'] >= 100:
break break
@@ -87,7 +87,7 @@ class CampaignStatus(UI):
return _coin['Value'] return _coin['Value']
def _get_oil(self): def _get_num(self, _button, name, letter):
# Update offset # Update offset
_ = self.appear(OCR_OIL_CHECK) _ = self.appear(OCR_OIL_CHECK)
@@ -95,27 +95,7 @@ class CampaignStatus(UI):
if color_similar(color, OCR_OIL_CHECK.color): if color_similar(color, OCR_OIL_CHECK.color):
# Original color # Original color
if server.server != 'jp': if server.server != 'jp':
ocr = Digit(OCR_OIL, name='OCR_OIL', letter=(247, 247, 247), threshold=128) ocr = Digit(_button, name=name, letter=letter, threshold=128)
else:
ocr = Digit(OCR_OIL, name='OCR_OIL', letter=(201, 201, 201), threshold=128)
elif color_similar(color, (59, 59, 64)):
# With black overlay
ocr = Digit(OCR_OIL, name='OCR_OIL', letter=(165, 165, 165), threshold=128)
else:
logger.warning(f'Unexpected OCR_OIL_CHECK color')
ocr = Digit(OCR_OIL, name='OCR_OIL', letter=(247, 247, 247), threshold=128)
return ocr.ocr(self.device.image)
def _get_num(self, _button, name):
# Update offset
_ = self.appear(OCR_OIL_CHECK)
color = get_color(self.device.image, OCR_OIL_CHECK.button)
if color_similar(color, OCR_OIL_CHECK.color):
# Original color
if server.server != 'jp':
ocr = Digit(_button, name=name, letter=(247, 247, 247), threshold=128)
else: else:
ocr = Digit(_button, name=name, letter=(201, 201, 201), threshold=128) ocr = Digit(_button, name=name, letter=(201, 201, 201), threshold=128)
elif color_similar(color, (59, 59, 64)): elif color_similar(color, (59, 59, 64)):
@@ -149,8 +129,8 @@ class CampaignStatus(UI):
break break
_oil = { _oil = {
'Value': self._get_num(OCR_OIL, 'OCR_OIL'), 'Value': self._get_num(OCR_OIL, 'OCR_OIL', (247, 247, 247)),
'Limit': self._get_num(OCR_OIL_LIMIT, 'OCR_OIL_LIMIT') 'Limit': self._get_num(OCR_OIL_LIMIT, 'OCR_OIL_LIMIT', (247, 247, 247))
} }
if _oil['Value'] >= 100: if _oil['Value'] >= 100:
break break

8
module/gacha/gacha_reward.py
View File

@@ -1,5 +1,7 @@
import module.config.server as server
from module.base.timer import Timer from module.base.timer import Timer
from module.campaign.campaign_status import OCR_COIN from module.campaign.assets import OCR_COIN
from module.combat.assets import GET_SHIP from module.combat.assets import GET_SHIP
from module.exception import ScriptError from module.exception import ScriptError
from module.gacha.assets import * from module.gacha.assets import *
@@ -12,6 +14,10 @@ from module.log_res.log_res import LogRes
RECORD_GACHA_OPTION = ('RewardRecord', 'gacha') RECORD_GACHA_OPTION = ('RewardRecord', 'gacha')
RECORD_GACHA_SINCE = (0,) RECORD_GACHA_SINCE = (0,)
if server.server != 'jp':
OCR_COIN = Digit(OCR_COIN, name='OCR_COIN', letter=(239, 239, 239), threshold=128)
else:
OCR_COIN = Digit(OCR_COIN, name='OCR_COIN', letter=(201, 201, 201), threshold=128)
OCR_BUILD_CUBE_COUNT = Digit(BUILD_CUBE_COUNT, letter=(255, 247, 247), threshold=64) OCR_BUILD_CUBE_COUNT = Digit(BUILD_CUBE_COUNT, letter=(255, 247, 247), threshold=64)
OCR_BUILD_TICKET_COUNT = Digit(BUILD_TICKET_COUNT, letter=(255, 247, 247), threshold=64) OCR_BUILD_TICKET_COUNT = Digit(BUILD_TICKET_COUNT, letter=(255, 247, 247), threshold=64)
OCR_BUILD_SUBMIT_COUNT = Digit(BUILD_SUBMIT_COUNT, letter=(255, 247, 247), threshold=64) OCR_BUILD_SUBMIT_COUNT = Digit(BUILD_SUBMIT_COUNT, letter=(255, 247, 247), threshold=64)