LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:09:25 +08:00
Code Activity

fix: log oil resources when battle

Browse Source
This commit is contained in:
0O0o0oOoO00
2025-09-14 20:03:48 +08:00
parent 45e2df51ca
commit 66301a68f5
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cn/campaign/my_OCR_OIL_LIMIT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

35
module/campaign/campaign_status.py
View File

@@ -180,6 +180,41 @@ class CampaignStatus(CampaignStatus):
return ocr.ocr(self.device.image)
def _get_oil(self):
return self.get_oil()
def get_oil(self, skip_first_screenshot=True, update=False):
amount = 0
limit = 0
timeout = Timer(1, count=2).start()
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if not self.appear(OCR_OIL_CHECK, offset=(10, 2)):
logger.info('No oil icon')
self.device.sleep(1)
if timeout.reached():
logger.warning('Get oil timeout')
break
amount = self._get_num(OCR_OIL, 'OCR_OIL')
limit = self._get_num(my_OCR_OIL_LIMIT, 'OCR_OIL_LIMIT')
if amount >= 100:
break
self.config.log_res.Oil = {
'Value': amount,
'Limit': limit
}
if update:
self.config.update()
return amount
def get_coin(self, skip_first_screenshot=True, update=False):
"""
Returns:

1
module/campaign/my_assets.py
View File

@@ -15,3 +15,4 @@ my_FLEET_ENTER_HARD_2 = Button(area={'cn': (705, 291, 788, 374), 'en': (705, 291
my_FLEET_ENTER_HARD_2_3 = Button(area={'cn': (910, 288, 996, 374), 'en': (910, 288, 996, 374), 'jp': (910, 288, 996, 374), 'tw': (910, 288, 996, 374)}, color={'cn': (52, 56, 64), 'en': (52, 56, 64), 'jp': (52, 56, 64), 'tw': (52, 56, 64)}, button={'cn': (910, 288, 996, 374), 'en': (910, 288, 996, 374), 'jp': (910, 288, 996, 374), 'tw': (910, 288, 996, 374)}, file={'cn': './assets/cn/campaign/my_FLEET_ENTER_HARD_2_3.png', 'en': './assets/cn/campaign/my_FLEET_ENTER_HARD_2_3.png', 'jp': './assets/cn/campaign/my_FLEET_ENTER_HARD_2_3.png', 'tw': './assets/cn/campaign/my_FLEET_ENTER_HARD_2_3.png'})
my_OCR_COIN = Button(area={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, color={'cn': (61, 61, 73), 'en': (61, 61, 73), 'jp': (61, 61, 73), 'tw': (61, 61, 73)}, button={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, file={'cn': './assets/cn/campaign/my_OCR_COIN.png', 'en': './assets/cn/campaign/my_OCR_COIN.png', 'jp': './assets/cn/campaign/my_OCR_COIN.png', 'tw': './assets/cn/campaign/my_OCR_COIN.png'})
my_OCR_COIN_LIMIT = Button(area={'cn': (807, 0, 944, 19), 'en': (807, 0, 944, 19), 'jp': (807, 0, 944, 19), 'tw': (807, 0, 944, 19)}, color={'cn': (206, 206, 206), 'en': (206, 206, 206), 'jp': (206, 206, 206), 'tw': (206, 206, 206)}, button={'cn': (807, 0, 944, 19), 'en': (807, 0, 944, 19), 'jp': (807, 0, 944, 19), 'tw': (807, 0, 944, 19)}, file={'cn': './assets/cn/campaign/my_OCR_COIN_LIMIT.png', 'en': './assets/cn/campaign/my_OCR_COIN_LIMIT.png', 'jp': './assets/cn/campaign/my_OCR_COIN_LIMIT.png', 'tw': './assets/cn/campaign/my_OCR_COIN_LIMIT.png'})
my_OCR_OIL_LIMIT = Button(area={'cn': (608, 0, 736, 19), 'en': (608, 0, 736, 19), 'jp': (608, 0, 736, 19), 'tw': (608, 0, 736, 19)}, color={'cn': (202, 202, 202), 'en': (202, 202, 202), 'jp': (202, 202, 202), 'tw': (202, 202, 202)}, button={'cn': (608, 0, 736, 19), 'en': (608, 0, 736, 19), 'jp': (608, 0, 736, 19), 'tw': (608, 0, 736, 19)}, file={'cn': './assets/cn/campaign/my_OCR_OIL_LIMIT.png', 'en': './assets/cn/campaign/my_OCR_OIL_LIMIT.png', 'jp': './assets/cn/campaign/my_OCR_OIL_LIMIT.png', 'tw': './assets/cn/campaign/my_OCR_OIL_LIMIT.png'})