sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Fix: SKILL_LEVEL_GRIDS may move for unknown reason

Browse Source
This commit is contained in:
LmeSzinc 2022-10-14 01:09:44 +08:00
parent cf216c2162
commit a47cf1dd0f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
module/tactical/tactical_class.py
View File

@ -222,9 +222,6 @@ class RewardTacticalClass(Dock):
books from self.books based on current books from self.books based on current
progress of the tactical skill. progress of the tactical skill.
""" """
# Shorthand referencing
first, last = self.books[0], self.books[-1]
# Read 'current' and 'remain' will be inaccurate # Read 'current' and 'remain' will be inaccurate
# since first exp_value is factored into it # since first exp_value is factored into it
current, remain, total = SKILL_EXP.ocr(self.device.image) current, remain, total = SKILL_EXP.ocr(self.device.image)
@ -495,7 +492,8 @@ class RewardTacticalClass(Dock):
else: else:
break break
def check_skill_selected(self, button, image): @staticmethod
def check_skill_selected(button, image):
area = button.area area = button.area
check_area = tuple([area[0], area[3] + 2, area[2], area[3] + 4]) check_area = tuple([area[0], area[3] + 2, area[2], area[3] + 4])
im = rgb2gray(crop(image, check_area)) im = rgb2gray(crop(image, check_area))
@ -584,8 +582,12 @@ class RewardTacticalClass(Dock):
skill_level_list = skill_level_ocr.ocr(self.device.image) skill_level_list = skill_level_ocr.ocr(self.device.image)
for skill_button, skill_level in list(zip(SKILL_GRIDS.buttons, skill_level_list)): for skill_button, skill_level in list(zip(SKILL_GRIDS.buttons, skill_level_list)):
level = skill_level.upper().replace(' ', '') level = skill_level.upper().replace(' ', '')
logger.attr('LEVEL', 'EMPTY' if len(level) == 0 else level) # Use 'MA' as a part of `MAX`.
if 'NEXT' in level and 'MAX' not in level: # SKILL_LEVEL_GRIDS may move a little lower for unknown reason, OCR results are like:
# ['NEXT:MA', 'NEXT:/1D]', 'NEXT:MA'] (Actually: `NEXT:MAX, NEXT:0/100, NEXT:MAX`)
# ['NEXT:MA', 'NEX T:/ 14[]]', 'NEXT:MA'] (Actually: `NEXT:MAX, NEXT:150/1400, NEXT:MAX`)
if 'NEXT' in level and 'MA' not in level:
logger.attr('LEVEL', 'EMPTY' if len(level) == 0 else level)
return skill_button return skill_button
return None return None