xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-25 10:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Clicking None in select_row() if keyword2button() failed

Browse Source
This commit is contained in:
LmeSzinc 2023-06-28 02:25:54 +08:00
parent 2ae3dac16d
commit a745c6607d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
module/ui/draggable_list.py
View File

@ -169,11 +169,7 @@ class DraggableList:
return True
def is_row_selected(self, row: Keyword, main: ModuleBase) -> bool:
button = self.keyword2button(row)
if not button:
return False
def is_row_selected(self, button: OcrResultButton, main: ModuleBase) -> bool:
# Having gold letters
if main.image_color_count(button, color=self.active_color, threshold=221, count=50):
return True
@ -194,6 +190,9 @@ class DraggableList:
row, main=main, skip_first_screenshot=skip_first_screenshot)
if not result:
return False
button = self.keyword2button(row)
if not button:
return False
logger.info(f'Select row: {row}')
skip_first_screenshot = True
@ -205,11 +204,11 @@ class DraggableList:
main.device.screenshot()
# End
if self.is_row_selected(row, main=main):
if self.is_row_selected(button, main=main):
logger.info('Row selected')
break
return True
# Click
if interval.reached():
main.device.click(self.keyword2button(row))
main.device.click(button)
interval.reset()