sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-05-22 22:52:40 +08:00
Code Activity

Merge pull request #1401 from LmeSzinc/bug_fix

Browse Source 
Bug fix
This commit is contained in:
LmeSzinc
2022-07-22 15:52:58 +08:00
committed by GitHub
parent 8032124e45 b4e3388125
commit 32e3fb9d8c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/research/rqueue.py
View File

@@ -25,15 +25,16 @@ class ResearchQueue(ResearchUI):
else: else:
self.device.screenshot() self.device.screenshot()
if self.appear_then_click(RESEARCH_QUEUE_ADD, offset=(20, 20), interval=3):
continue
if self.handle_popup_confirm('RESEARCH_QUEUE'):
continue
# End # End
if self.is_in_research() and 'detail' in self.get_research_status(self.device.image): if self.is_in_research() and 'detail' in self.get_research_status(self.device.image):
break break
if self.appear_then_click(RESEARCH_QUEUE_ADD, offset=(20, 20), interval=5):
continue
if self.handle_popup_confirm('RESEARCH_QUEUE'):
self.interval_reset(RESEARCH_QUEUE_ADD)
continue
self.ensure_research_center_stable() self.ensure_research_center_stable()
@cached_property @cached_property
@@ -52,7 +53,7 @@ class ResearchQueue(ResearchUI):
Status icons on the left Status icons on the left
""" """
return ButtonGrid( return ButtonGrid(
origin=(8, 259), delta=(0, 40.5), button_shape=(25, 25), grid_shape=(1, 5), name='QUEUE_STATUS') origin=(18, 259), delta=(0, 40.5), button_shape=(25, 25), grid_shape=(1, 5), name='QUEUE_STATUS')
@cached_property @cached_property
@Config.when(SERVER=None) @Config.when(SERVER=None)