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

Fix: Check selected arrow left to character avatar

Browse Source
This commit is contained in:
LmeSzinc 2024-05-13 16:00:04 +08:00
parent f7b48efc7a
commit f45c8a4dd6
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/share/combat/support/COMBAT_SUPPORT_SELECTED.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

10
tasks/combat/assets/assets_combat_support.py
View File

@ -43,16 +43,6 @@ COMBAT_SUPPORT_LIST_SCROLL = ButtonWrapper(
button=(472, 162, 476, 598), button=(472, 162, 476, 598),
), ),
) )
COMBAT_SUPPORT_SELECTED = ButtonWrapper(
name='COMBAT_SUPPORT_SELECTED',
share=Button(
file='./assets/share/combat/support/COMBAT_SUPPORT_SELECTED.png',
area=(69, 114, 91, 116),
search=(49, 94, 111, 136),
color=(254, 254, 254),
button=(69, 114, 91, 116),
),
)
SUPPORT_SELECTED = ButtonWrapper( SUPPORT_SELECTED = ButtonWrapper(
name='SUPPORT_SELECTED', name='SUPPORT_SELECTED',
share=[ share=[

15
tasks/combat/support.py
View File

@ -9,7 +9,7 @@ from module.ui.scroll import AdaptiveScroll
from tasks.base.assets.assets_base_popup import POPUP_CANCEL from tasks.base.assets.assets_base_popup import POPUP_CANCEL
from tasks.base.ui import UI from tasks.base.ui import UI
from tasks.combat.assets.assets_combat_support import COMBAT_SUPPORT_ADD, COMBAT_SUPPORT_LIST, \ from tasks.combat.assets.assets_combat_support import COMBAT_SUPPORT_ADD, COMBAT_SUPPORT_LIST, \
COMBAT_SUPPORT_LIST_GRID, COMBAT_SUPPORT_LIST_SCROLL, COMBAT_SUPPORT_SELECTED, SUPPORT_SELECTED COMBAT_SUPPORT_LIST_GRID, COMBAT_SUPPORT_LIST_SCROLL, SUPPORT_SELECTED
from tasks.combat.assets.assets_combat_team import COMBAT_TEAM_DISMISSSUPPORT, COMBAT_TEAM_SUPPORT from tasks.combat.assets.assets_combat_team import COMBAT_TEAM_DISMISSSUPPORT, COMBAT_TEAM_SUPPORT
@ -79,8 +79,8 @@ class SupportCharacter:
Returns: Returns:
tuple: (x1, y1, x2, y2) of selected icon search area tuple: (x1, y1, x2, y2) of selected icon search area
""" """
return ( # Check the left of character avatar
self.button[0], self.button[1] - 5, self.button[0] + 30, self.button[1]) if self.button else None return 0, self.button[1], self.button[0], self.button[3]
class NextSupportCharacter: class NextSupportCharacter:
@ -227,7 +227,7 @@ class CombatSupport(UI):
out: COMBAT_SUPPORT_LIST out: COMBAT_SUPPORT_LIST
""" """
logger.hr("Combat support select") logger.hr("Combat support select")
COMBAT_SUPPORT_SELECTED.matched_button.search = character.selected_icon_search() logger.info(f'Select: {character}')
skip_first_screenshot = False skip_first_screenshot = False
interval = Timer(2) interval = Timer(2)
while 1: while 1:
@ -237,7 +237,10 @@ class CombatSupport(UI):
self.device.screenshot() self.device.screenshot()
# End # End
if self.appear(COMBAT_SUPPORT_SELECTED, similarity=0.75): area = character.selected_icon_search()
image = self.image_crop(area, copy=False)
if SUPPORT_SELECTED.match_template(image, similarity=0.75, direct_match=True):
logger.info('Character support selected')
return True return True
if interval.reached(): if interval.reached():
@ -274,6 +277,7 @@ class CombatSupport(UI):
in: COMBAT_SUPPORT_LIST in: COMBAT_SUPPORT_LIST
out: COMBAT_SUPPORT_LIST out: COMBAT_SUPPORT_LIST
""" """
logger.hr("Next support select")
skip_first_screenshot = True skip_first_screenshot = True
scroll = AdaptiveScroll(area=COMBAT_SUPPORT_LIST_SCROLL.area, scroll = AdaptiveScroll(area=COMBAT_SUPPORT_LIST_SCROLL.area,
name=COMBAT_SUPPORT_LIST_SCROLL.name) name=COMBAT_SUPPORT_LIST_SCROLL.name)
@ -288,6 +292,7 @@ class CombatSupport(UI):
# End # End
if next_support is not None and next_support.is_next_support_character_selected(self.device.image): if next_support is not None and next_support.is_next_support_character_selected(self.device.image):
logger.info('Next support selected')
return return
if interval.reached(): if interval.reached():