mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-19 02:23:01 +08:00
perf: 优化访问好友模板匹配
This commit is contained in:
@@ -3422,9 +3422,9 @@
|
||||
"next": ["Home@ReturnButtons#next"]
|
||||
},
|
||||
"StartToVisit": {
|
||||
"method": "RGBCount",
|
||||
"action": "ClickSelf",
|
||||
"template": ["StartToVisit.png", "StartToVisitDetermine.png", "StartToVisitSportsman"],
|
||||
"templThreshold": [0.9, 0.9, 0.9],
|
||||
"colorScales": [[250, 255]],
|
||||
"roi": [990, 90, 195, 165],
|
||||
"next": ["VisitNext", "VisitNext@LoadingText", "VisitNextBlack", "VisitNextOcr"],
|
||||
"postDelay": 2000
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 457 B After Width: | Height: | Size: 723 B |
Binary file not shown.
|
Before Width: | Height: | Size: 383 B |
Binary file not shown.
|
Before Width: | Height: | Size: 843 B |
@@ -16,22 +16,22 @@ if __name__ == '__main__':
|
||||
rgb_base_mask_range_ignore_dark = [[[20, 20, 20], [255, 255, 255]]] # 忽略暗色背景
|
||||
|
||||
# 自动判断图片的合适 mask_ranges
|
||||
# image = cv2.imread(str(maa_dir / "resource" / "template" / "BattleQuickFormationRole-Pioneer.png"))
|
||||
# image = cv2.imread(str(maa_dir / "resource" / "template" / "StartToVisit.png"))
|
||||
# generate_mask_ranges(image, 'luv', luv_base_mask_range_ignore_light_dark)
|
||||
# generate_mask_ranges(image, 'hsv', hsv_base_mask_range_ignore_dark)
|
||||
# generate_mask_ranges(image, 'rgb', rgb_base_mask_range_ignore_dark)
|
||||
|
||||
# 在给定的 mask_ranges 下展示一张图
|
||||
image = cv2.imread(str(maa_dir / "resource" / "template" / "BattleQuickFormationRole-Pioneer.png"))
|
||||
mask_ranges = [[[90, 90, 90], [150, 150, 150]]]
|
||||
image = cv2.imread(str(maa_dir / "resource" / "template" / "StartToVisit.png"))
|
||||
mask_ranges = [[[250, 250, 250], [255, 255, 255]]]
|
||||
show_image_mask(image, calc_mask_from_ranges(image, mask_ranges, 'rgb', True), 'rgb')
|
||||
# mask_ranges = [[[93, 81, 130], [102, 97, 142]], [[128, 100, 164], [134, 110, 169]], [[95, 85, 145], [105, 95, 155]]]
|
||||
# show_image_mask(image, calc_mask_from_ranges(image, mask_ranges, 'luv', True), 'luv')
|
||||
|
||||
# 在给定的 mask_ranges 下比较两张图
|
||||
image1 = cv2.imread(str(maa_dir / "resource" / "template" / "BattleQuickFormationRole-Pioneer.png"))
|
||||
image2 = cv2.imread(str(maa_dir / "resource" / "template" / "BattleQuickFormationRole-Tank.png"))
|
||||
mask_ranges = [[[90, 90, 90], [150, 150, 150]]]
|
||||
image1 = cv2.imread(str(maa_dir / "resource" / "template" / "StartToVisit.png"))
|
||||
image2 = cv2.imread(str(maa_dir / "resource" / "template" / "StartToVisitDetermine.png"))
|
||||
mask_ranges = [[[250, 250, 250], [255, 255, 255]]]
|
||||
compare_2_image_with_mask_ranges(image1, image2, mask_ranges, "rgb")
|
||||
compare_2_image_with_mask_ranges(image1, image2, mask_ranges, "rgb", True)
|
||||
# mask_ranges = [[[93, 81, 125], [102, 97, 150]], [[95, 85, 145], [105, 95, 155]]]
|
||||
|
||||
@@ -1924,7 +1924,7 @@
|
||||
"official/StartButton2": "771f0054fbce0b570b51655f4bbb95456fd28f648d76c946d5f1dcd84fa16475",
|
||||
"official/StartButton2Adverse": "4cb35dbdbbc9695707a83e67bd0089474d5cf9e7c7b7bcbcab916ff6e8f57f19",
|
||||
"official/StartLoginBServer": "f7f010df946cf3f8c48c6366005a1321d828dbfbafd5d6a92ea7a050326fc522",
|
||||
"official/StartToVisit": "08212415d5a28a25fdcad02eacb938e3413a6ec05928e961f5fd0a0a7fa182b9",
|
||||
"official/StartToVisit": "c63caecc7abcc7bd86a5ff2a42ac548cd6745c0c8af24f4ad0c7efc396c87c37",
|
||||
"official/StartToVisitDetermine": "ce73d7a28458f21d28182e66cc82bf49274375e99621b86031f819cc95261093",
|
||||
"official/StartToVisitSportsman": "19d0ffcb4b5ee1b540783c6debaea6cf6927c186d354cd792f853f104ff729bf",
|
||||
"official/StartToWakeUp": "b311e2871756741c41e79c2e15f0c8c45eb3b240cf084b65a68b33f70eae2db9",
|
||||
@@ -2908,4 +2908,4 @@
|
||||
"YoStarKR/ClueVacancyNo5": "f02a9279e06b113a21a7ed589fe5062ef41e287fc589b87e4d345cf8736ba54f",
|
||||
"YoStarKR/ClueVacancyNo6": "839c62b7a2d427a0abd9911b5e26cade51a7b5e25e4bcf2a8a143b749e00fc3a",
|
||||
"YoStarKR/ClueVacancyNo7": "49195fd37620ef0da977d28b22020e15163121d99648386ddd60341002c79da5"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user