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

Merge branch 'master' into app

Browse Source 
# Conflicts:
#	module/retire/retirement.py
This commit is contained in:
LmeSzinc
2021-09-22 11:38:48 +08:00
parent b4df3f8a9d 4bd1e07561
commit 4f0c07d1df
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/retire/retirement.py
View File

@@ -348,8 +348,8 @@ class Retirement(Enhancement):
sim, button = template.match_result(self.device.image.resize(size=(1189, 669))) sim, button = template.match_result(self.device.image.resize(size=(1189, 669)))
if sim > self.config.COMMON_CV_THRESHOLD: if sim > self.config.COMMON_CV_THRESHOLD:
return Button(button=tuple(_ * 155 // 144 for _ in button.button), area=button.area, return Button(button=tuple(_*155//144 for _ in button.button), area=button.area, color=button.color,
color=button.color) name=f'TEMPLATE_{commen_cv_name}_RETIRE')
return None return None
else: else:
@@ -358,7 +358,8 @@ class Retirement(Enhancement):
sim, button = template.match_result(self.device.image.resize(size=(1189, 669))) sim, button = template.match_result(self.device.image.resize(size=(1189, 669)))
if sim > self.config.COMMON_CV_THRESHOLD: if sim > self.config.COMMON_CV_THRESHOLD:
return Button(button=tuple(_ * 155 // 144 for _ in button.button), area=button.area, color=button.color) return Button(button=tuple(_*155//144 for _ in button.button), area=button.area, color=button.color,
name=f'TEMPLATE_{self.config.GemsFarming_CommonCV.upper()}_RETIRE')
return None return None