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

fix: combat support COMBAT_SUPPORT_LIST repeat triggering (#251)

Browse Source 
* fix: combat support COMBAT_SUPPORT_LIST repeat triggering

* fix: combat support_set select complete to skip search_support
This commit is contained in:
Lo Mu 2023-12-31 01:51:47 +08:00 committed by GitHub
parent ae07b19d07
commit c45cea69fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/combat/support.py
View File

@ -20,7 +20,8 @@ def get_position_in_original_image(position_in_croped_image, crop_area):
tuple: (x, y) of position in original image tuple: (x, y) of position in original image
""" """
return ( return (
position_in_croped_image[0] + crop_area[0], position_in_croped_image[1] + crop_area[1]) if position_in_croped_image else None position_in_croped_image[0] + crop_area[0],
position_in_croped_image[1] + crop_area[1]) if position_in_croped_image else None
class SupportCharacter: class SupportCharacter:
@ -194,6 +195,7 @@ class CombatSupport(UI):
""" """
logger.hr("Combat support") logger.hr("Combat support")
skip_first_screenshot = True skip_first_screenshot = True
selected_support = False
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@ -217,9 +219,10 @@ class CombatSupport(UI):
self.interval_reset(POPUP_CANCEL) self.interval_reset(POPUP_CANCEL)
continue continue
if self.appear(COMBAT_SUPPORT_LIST, interval=1): if self.appear(COMBAT_SUPPORT_LIST, interval=1):
if support_character_name != "FirstCharacter": if not selected_support and support_character_name != "FirstCharacter":
self._search_support( self._search_support(
support_character_name) # Search support support_character_name) # Search support
selected_support = True
self.device.click(COMBAT_SUPPORT_ADD) self.device.click(COMBAT_SUPPORT_ADD)
self.interval_reset(COMBAT_SUPPORT_LIST) self.interval_reset(COMBAT_SUPPORT_LIST)
continue continue