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

merge alas

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/os_handler/os_status.py
View File

@@ -9,10 +9,7 @@ from module.map.map_grids import SelectedGrids
from module.ocr.ocr import Digit
from module.os_handler.assets import *
from module.ui.ui import UI
<<<<<<< HEAD
from module.log_res.log_res import LogRes
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
OCR_SHOP_YELLOW_COINS = Digit(SHOP_YELLOW_COINS, letter=(239, 239, 239), threshold=160, name='OCR_SHOP_YELLOW_COINS')
OCR_SHOP_PURPLE_COINS = Digit(SHOP_PURPLE_COINS, letter=(255, 255, 255), name='OCR_SHOP_PURPLE_COINS')
@@ -75,17 +72,11 @@ class OSStatus(UI):
continue
else:
break
<<<<<<< HEAD
LogRes(self.config).YellowCoin = yellow_coins
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return yellow_coins
def get_purple_coins(self) -> int:
amount = OCR_SHOP_PURPLE_COINS.ocr(self.device.image)
<<<<<<< HEAD
LogRes(self.config).PurpleCoin = amount
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return amount