1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-28 04:19:43 +08:00

merge alas

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

View File

@@ -1,10 +1,7 @@
from module.ocr.ocr import Digit
from module.shop.assets import *
from module.ui.ui import UI
<<<<<<< HEAD
from module.log_res.log_res import LogRes
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
OCR_SHOP_GOLD_COINS = Digit(SHOP_GOLD_COINS, letter=(239, 239, 239), name='OCR_SHOP_GOLD_COINS')
OCR_SHOP_GEMS = Digit(SHOP_GEMS, letter=(255, 243, 82), name='OCR_SHOP_GEMS')
@@ -25,11 +22,8 @@ class ShopStatus(UI):
in:
"""
amount = OCR_SHOP_GOLD_COINS.ocr(self.device.image)
<<<<<<< HEAD
LogRes(self.config).Coin = amount
self.config.update()
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return amount
def status_get_gems(self):
@@ -41,11 +35,8 @@ class ShopStatus(UI):
in: page_shop, medal shop
"""
amount = OCR_SHOP_GEMS.ocr(self.device.image)
<<<<<<< HEAD
LogRes(self.config).Gem = amount
self.config.update()
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return amount
def status_get_medal(self):
@@ -57,11 +48,8 @@ class ShopStatus(UI):
in: page_shop, medal shop
"""
amount = OCR_SHOP_MEDAL.ocr(self.device.image)
<<<<<<< HEAD
LogRes(self.config).Medal = amount
self.config.update()
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return amount
def status_get_merit(self):
@@ -73,11 +61,8 @@ class ShopStatus(UI):
in: page_shop, merit shop
"""
amount = OCR_SHOP_MERIT.ocr(self.device.image)
<<<<<<< HEAD
LogRes(self.config).Merit = amount
self.config.update()
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return amount
def status_get_guild_coins(self):
@@ -89,11 +74,8 @@ class ShopStatus(UI):
in: page_shop, guild shop
"""
amount = OCR_SHOP_GUILD_COINS.ocr(self.device.image)
<<<<<<< HEAD
LogRes(self.config).GuildCoin = amount
self.config.update()
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return amount
def status_get_core(self):
@@ -105,11 +87,8 @@ class ShopStatus(UI):
in: page_shop, core shop
"""
amount = OCR_SHOP_CORE.ocr(self.device.image)
<<<<<<< HEAD
LogRes(self.config).Core = amount
self.config.update()
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return amount
def status_get_voucher(self):