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

Fix: Raise error when failed to start a research project

Browse Source
This commit is contained in:
LmeSzinc
2022-08-26 00:31:51 +08:00
parent 78b1444736
commit 0a568ee2b3
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/research/research.py
View File

@@ -4,6 +4,7 @@ import numpy as np
from module.base.timer import Timer from module.base.timer import Timer
from module.base.utils import rgb2gray from module.base.utils import rgb2gray
from module.exception import GameTooManyClickError
from module.logger import logger from module.logger import logger
from module.ocr.ocr import Duration from module.ocr.ocr import Duration
from module.research.assets import * from module.research.assets import *
@@ -191,6 +192,7 @@ class RewardResearch(ResearchSelector, ResearchQueue, StorageHandler):
self.popup_interval_clear() self.popup_interval_clear()
available = False available = False
click_timer = Timer(10) click_timer = Timer(10)
click_count = 0
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@@ -206,6 +208,7 @@ class RewardResearch(ResearchSelector, ResearchQueue, StorageHandler):
self.device.click(RESEARCH_ENTRANCE[i]) self.device.click(RESEARCH_ENTRANCE[i])
self._research_project_offset = (index - 2) % 5 self._research_project_offset = (index - 2) % 5
self.ensure_research_stable() self.ensure_research_stable()
click_count += 1
click_timer.reset() click_timer.reset()
continue continue
if max_rgb > 235 and self.appear_then_click(RESEARCH_START, offset=(5, 20), interval=10): if max_rgb > 235 and self.appear_then_click(RESEARCH_START, offset=(5, 20), interval=10):
@@ -215,6 +218,11 @@ class RewardResearch(ResearchSelector, ResearchQueue, StorageHandler):
continue continue
# End # End
if click_count >= 3:
logger.error('Unable to start a research project after 3 trail, '
'probably because there is a research running but requirements not satisfied, '
'or a research finished')
raise GameTooManyClickError
if self.appear(RESEARCH_STOP, offset=(20, 20)): if self.appear(RESEARCH_STOP, offset=(20, 20)):
# RESEARCH_STOP is a semi-transparent button, # RESEARCH_STOP is a semi-transparent button,
# color will vary depending on the background. # color will vary depending on the background.