diff --git a/assets/share/combat/support/COMBAT_SUPPORT_ADD.png b/assets/share/combat/support/COMBAT_SUPPORT_ADD.png index 586c9e0e5..48f0e0e63 100644 Binary files a/assets/share/combat/support/COMBAT_SUPPORT_ADD.png and b/assets/share/combat/support/COMBAT_SUPPORT_ADD.png differ diff --git a/assets/share/combat/support/COMBAT_SUPPORT_LIST.png b/assets/share/combat/support/COMBAT_SUPPORT_LIST.png index d22e1c0d1..9917bea76 100644 Binary files a/assets/share/combat/support/COMBAT_SUPPORT_LIST.png and b/assets/share/combat/support/COMBAT_SUPPORT_LIST.png differ diff --git a/assets/share/combat/support/COMBAT_SUPPORT_LIST_GRID.png b/assets/share/combat/support/COMBAT_SUPPORT_LIST_GRID.png index 3029cfbb8..a9839d371 100644 Binary files a/assets/share/combat/support/COMBAT_SUPPORT_LIST_GRID.png and b/assets/share/combat/support/COMBAT_SUPPORT_LIST_GRID.png differ diff --git a/assets/share/combat/support/COMBAT_SUPPORT_LIST_SCROLL.png b/assets/share/combat/support/COMBAT_SUPPORT_LIST_SCROLL.png index aea5bb872..1e4779af3 100644 Binary files a/assets/share/combat/support/COMBAT_SUPPORT_LIST_SCROLL.png and b/assets/share/combat/support/COMBAT_SUPPORT_LIST_SCROLL.png differ diff --git a/tasks/combat/assets/assets_combat_support.py b/tasks/combat/assets/assets_combat_support.py index c5a3d4ecd..c27e78bcc 100644 --- a/tasks/combat/assets/assets_combat_support.py +++ b/tasks/combat/assets/assets_combat_support.py @@ -7,40 +7,40 @@ COMBAT_SUPPORT_ADD = ButtonWrapper( name='COMBAT_SUPPORT_ADD', share=Button( file='./assets/share/combat/support/COMBAT_SUPPORT_ADD.png', - area=(1032, 649, 1132, 680), - search=(1012, 629, 1152, 700), - color=(228, 228, 228), - button=(1032, 649, 1132, 680), + area=(1057, 649, 1112, 678), + search=(1037, 629, 1132, 698), + color=(213, 214, 214), + button=(1057, 649, 1112, 678), ), ) COMBAT_SUPPORT_LIST = ButtonWrapper( name='COMBAT_SUPPORT_LIST', share=Button( file='./assets/share/combat/support/COMBAT_SUPPORT_LIST.png', - area=(57, 637, 100, 680), - search=(37, 617, 120, 700), - color=(212, 213, 215), - button=(57, 637, 100, 680), + area=(67, 645, 93, 669), + search=(47, 625, 113, 689), + color=(204, 205, 205), + button=(67, 645, 93, 669), ), ) COMBAT_SUPPORT_LIST_GRID = ButtonWrapper( name='COMBAT_SUPPORT_LIST_GRID', share=Button( file='./assets/share/combat/support/COMBAT_SUPPORT_LIST_GRID.png', - area=(64, 115, 159, 634), - search=(44, 95, 179, 654), - color=(119, 108, 132), - button=(64, 115, 159, 634), + area=(64, 158, 155, 627), + search=(44, 138, 175, 647), + color=(117, 107, 124), + button=(64, 158, 155, 627), ), ) COMBAT_SUPPORT_LIST_SCROLL = ButtonWrapper( name='COMBAT_SUPPORT_LIST_SCROLL', share=Button( file='./assets/share/combat/support/COMBAT_SUPPORT_LIST_SCROLL.png', - area=(448, 112, 452, 610), - search=(428, 92, 472, 630), - color=(127, 133, 150), - button=(448, 112, 452, 610), + area=(448, 156, 452, 592), + search=(428, 136, 472, 612), + color=(130, 133, 153), + button=(448, 156, 452, 592), ), ) COMBAT_SUPPORT_SELECTED = ButtonWrapper( diff --git a/tasks/combat/support.py b/tasks/combat/support.py index 57f0c86df..8ea5523ba 100644 --- a/tasks/combat/support.py +++ b/tasks/combat/support.py @@ -1,5 +1,6 @@ import cv2 import numpy as np +from py import log from scipy import signal from module.base.button import Button, ButtonWrapper @@ -55,7 +56,7 @@ class SupportCharacter: return SupportCharacter._image_cache[self.name] img = load_image(f"assets/character/{self.name}.png") - scaled_img = cv2.resize(img, (85, 82)) + scaled_img = cv2.resize(img, (86, 81)) SupportCharacter._image_cache[self.name] = scaled_img logger.info(f"Character {self.name} image cached") return scaled_img @@ -301,7 +302,7 @@ class CombatSupport(UI): self.device.screenshot() # End - if self.match_template(COMBAT_SUPPORT_SELECTED): + if self.appear(COMBAT_SUPPORT_SELECTED, similarity=0.75): return True if interval.reached():