sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-05 15:30:59 +08:00
Code Activity

Fix: Wrong research_project_started if no research started

Browse Source
This commit is contained in:
LmeSzinc
2021-08-13 00:59:39 +08:00
parent ec9bc7f511
commit 96936943cc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/research/research.py
View File

@@ -146,7 +146,6 @@ class RewardResearch(ResearchSelector):
logger.info(f'Research project: {index}') logger.info(f'Research project: {index}')
available = False available = False
click_timer = Timer(10) click_timer = Timer(10)
self.research_project_started = project
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@@ -175,10 +174,12 @@ class RewardResearch(ResearchSelector):
# RESEARCH_STOP is a semi-transparent button, color will vary depending on the background. # RESEARCH_STOP is a semi-transparent button, color will vary depending on the background.
self.research_detail_quit() self.research_detail_quit()
# self.ensure_no_info_bar(timeout=3) # Research started # self.ensure_no_info_bar(timeout=3) # Research started
self.research_project_started = project
return True return True
if not available and max_rgb <= 235 and self.appear(RESEARCH_UNAVAILABLE, offset=(5, 20)): if not available and max_rgb <= 235 and self.appear(RESEARCH_UNAVAILABLE, offset=(5, 20)):
logger.info('Not enough resources to start this project') logger.info('Not enough resources to start this project')
self.research_detail_quit() self.research_detail_quit()
self.research_project_started = None
return False return False
def research_receive(self, skip_first_screenshot=True, save_get_items=False): def research_receive(self, skip_first_screenshot=True, save_get_items=False):