sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-15 07:37:19 +08:00
Code Activity

Fix: RESEARCH_RUNNING detection

Browse Source
This commit is contained in:
LmeSzinc
2021-11-15 02:05:35 +08:00
parent 29e356c6f1
commit 88b4fe01b6
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
module/research/research.py
View File

@@ -9,7 +9,8 @@ from module.research.project import ResearchSelector, RESEARCH_ENTRANCE, get_res
from module.ui.page import *
from module.ocr.ocr import Duration
OCR_DURATION = Duration(RESEARCH_LAB_DURATION_REMAIN, letter=(255, 255, 255), threshold=64, name='RESEARCH_LAB_DURATION_REMAIN')
OCR_DURATION = Duration(RESEARCH_LAB_DURATION_REMAIN, letter=(255, 255, 255), threshold=64,
name='RESEARCH_LAB_DURATION_REMAIN')
class RewardResearch(ResearchSelector):
@@ -311,19 +312,20 @@ class RewardResearch(ResearchSelector):
out: page_reward
"""
logger.hr('Research get remain')
self.ui_click(click_button=RESEARCH_LAB, check_button=RESEARCH_RUNNING)
# Check if button is still moving
while 1:
self.appear(RESEARCH_RUNNING)
self.device.screenshot()
if RESEARCH_RUNNING.match_appear_on(self.device.image):
if self.appear(RESEARCH_RUNNING, offset=(3, 3)):
break
else:
self.device.screenshot()
continue
remain = OCR_DURATION.ocr(self.device.image)
logger.info(f'Research project remain: {remain}')
if remain.total_seconds() >= 0:
if remain.total_seconds() >= 0:
research_duration_remain = remain.total_seconds() / 3600
return research_duration_remain
else:
@@ -367,4 +369,4 @@ class RewardResearch(ResearchSelector):
else:
self.config.task_delay(success=False)
# Close page_reward to avoid bug
self.ui_goto_main()
self.ui_goto_main()