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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2020-07-28 03:30:51 +08:00
parent c3660219cf c50aa24d19
commit 8ac6ab6034
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/research/research.py
View File

@@ -89,7 +89,7 @@ class RewardResearch(ResearchSelector):
# End # End
if executed and self._in_research(): if executed and self._in_research():
self.ensure_no_info_bar() # Refresh success self.ensure_no_info_bar(timeout=3) # Refresh success
self.ensure_research_stable() self.ensure_research_stable()
break break
@@ -187,7 +187,7 @@ class RewardResearch(ResearchSelector):
# End # End
if self.appear(RESEARCH_STOP): if self.appear(RESEARCH_STOP):
self.research_select_quit() self.research_select_quit()
self.ensure_no_info_bar() # Research started self.ensure_no_info_bar(timeout=3) # Research started
return True return True
if self.appear(RESEARCH_UNAVAILABLE): if self.appear(RESEARCH_UNAVAILABLE):
logger.info('Not enough resources to start this project') logger.info('Not enough resources to start this project')
@@ -265,10 +265,10 @@ class RewardResearch(ResearchSelector):
logger.info('No research has finished') logger.info('No research has finished')
self._research_project_offset = 0 self._research_project_offset = 0
self.research_detect(self.device.image)
priority = self.research_sort_filter()
for _ in range(2): for _ in range(2):
self.research_detect(self.device.image)
priority = self.research_sort_filter()
result = self.research_select(priority, save_get_items=self.config.ENABLE_SAVE_GET_ITEMS) result = self.research_select(priority, save_get_items=self.config.ENABLE_SAVE_GET_ITEMS)
if result: if result:
break break