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

Merge pull request #1125 from SaiCateDoan/tech

Browse Source 
Fix: Added support for filters that lack reset
This commit is contained in:
LmeSzinc
2022-05-16 22:37:29 +08:00
committed by GitHub
parent 826a27def2 abf8617fab
commit 17ccfea8b5
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
module/research/research.py
View File

@@ -93,6 +93,18 @@ class RewardResearch(ResearchSelector):
self._research_project_offset = 0 self._research_project_offset = 0
return True return True
def research_enforce(self):
if (not self.enforce) \
and (self.config.Research_UseCube == 'only_no_project'
or self.config.Research_UseCube == 'only_05_hour'
or self.config.Research_UseCoin == 'only_no_project'
or self.config.Research_UseCoin == 'only_05_hour'
or self.config.Research_UsePart == 'only_no_project'
or self.config.Research_UsePart == 'only_05_hour'):
logger.info('Enforce choosing research project')
self.enforce = True
self.research_select(self.research_sort_filter(self.enforce))
def research_select(self, priority): def research_select(self, priority):
""" """
Args: Args:
@@ -104,6 +116,7 @@ class RewardResearch(ResearchSelector):
""" """
if not len(priority): if not len(priority):
logger.info('No research project satisfies current filter') logger.info('No research project satisfies current filter')
self.research_enforce()
return True return True
for project in priority: for project in priority:
# priority example: ['reset', 'shortest'] # priority example: ['reset', 'shortest']
@@ -130,16 +143,7 @@ class RewardResearch(ResearchSelector):
continue continue
logger.info('No research project started') logger.info('No research project started')
if (not self.enforce) \ self.research_enforce()
and (self.config.Research_UseCube == 'only_no_project'
or self.config.Research_UseCube == 'only_05_hour'
or self.config.Research_UseCoin == 'only_no_project'
or self.config.Research_UseCoin == 'only_05_hour'
or self.config.Research_UsePart == 'only_no_project'
or self.config.Research_UsePart == 'only_05_hour'):
logger.info('Enforce choosing research project')
self.enforce = True
self.research_select(self.research_sort_filter(self.enforce))
return True return True
def research_project_start(self, project, skip_first_screenshot=True): def research_project_start(self, project, skip_first_screenshot=True):