LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 08:59:29 +08:00
Code Activity

Merge branch master_GUI

Browse Source
This commit is contained in:
Zuosizhu
2023-02-08 01:37:18 +08:00
parent db3bdfdeef 28155a0f4e
commit db9443be2e
40 changed files with 1531 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/raid/raid.py
View File

@@ -279,6 +279,7 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
Pages:
in: page_raid
"""
from module.log_res.log_res import LogRes
skip_first_screenshot = True
timeout = Timer(1.5, count=5).start()
ocr = pt_ocr(self.config.Campaign_Event)
@@ -293,17 +294,13 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
pt = ocr.ocr(self.device.image)
if timeout.reached():
logger.warning('Wait PT timeout, assume it is')
from module.log_res.log_res import LogRes
LogRes(self.config).log_res(pt, 'Pt')
LogRes(self.config).log_res('Pt', {'Value': pt})
return pt
if pt in [70000, 70001]:
continue
else:
from module.log_res.log_res import LogRes
LogRes(self.config).log_res(pt, 'Pt')
LogRes(self.config).log_res('Pt', {'Value': pt})
return pt
else:
logger.info(f'Raid {self.config.Campaign_Event} does not support PT ocr, skip')
from module.log_res.log_res import LogRes
LogRes(self.config).log_res(0, 'Pt')
return 0