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

Fix: Entered another research accidentally

Browse Source
This commit is contained in:
LmeSzinc
2022-07-02 14:47:51 +08:00
parent 4bb9a1c62b
commit 9b860b88bb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/research/research.py
View File

@@ -229,7 +229,7 @@ class RewardResearch(ResearchSelector):
with self.stat.new( with self.stat.new(
genre='research', method=self.config.DropRecord_ResearchRecord genre='research', method=self.config.DropRecord_ResearchRecord
) as record: ) as record:
# Take screenshots of project list # Take screenshots of project list
record.add(self.device.image) record.add(self.device.image)
@@ -243,7 +243,7 @@ class RewardResearch(ResearchSelector):
self.device.screenshot() self.device.screenshot()
if self.appear(RESEARCH_CHECK, interval=10): if self.appear(RESEARCH_CHECK, interval=10):
if self._research_has_finished_at(self._research_finished_index): if self.research_has_finished():
self.device.click(RESEARCH_ENTRANCE[self._research_finished_index]) self.device.click(RESEARCH_ENTRANCE[self._research_finished_index])
if self.appear(RESEARCH_STOP, offset=(20, 20)): if self.appear(RESEARCH_STOP, offset=(20, 20)):
@@ -251,6 +251,10 @@ class RewardResearch(ResearchSelector):
self.research_project_started = None self.research_project_started = None
self.research_detail_quit() self.research_detail_quit()
return False return False
# Entered another project accidentally
if self.appear(RESEARCH_START, offset=(20, 20), interval=5):
self.device.click(RESEARCH_DETAIL_QUIT)
continue
appear_button = get_items() appear_button = get_items()
if appear_button is not None: if appear_button is not None: