From 616c12951bb3525396730f043b034b25ff756bcf Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:47:37 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E6=A8=A1=E6=9D=BF=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 4 ++-- resource/template/StartToVisit.png | Bin 457 -> 723 bytes resource/template/StartToVisitDetermine.png | Bin 383 -> 0 bytes resource/template/StartToVisitSportsman.png | Bin 843 -> 0 bytes tools/MaskRangeTool/main.py | 12 ++++++------ tools/OptimizeTemplates/optimize_templates.json | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 resource/template/StartToVisitDetermine.png delete mode 100644 resource/template/StartToVisitSportsman.png diff --git a/resource/tasks.json b/resource/tasks.json index ea9e94be25..febe51b81d 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -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 diff --git a/resource/template/StartToVisit.png b/resource/template/StartToVisit.png index b6f0422aedf64778378e175db15e2e06f89346f4..42799698ff04ae8a7f45a481983742808c8c08d8 100644 GIT binary patch literal 723 zcmV;^0xbQBP)Ss0?vm(2{OoscWq@^9y0(G$K4YgftV8eW=LN zYHGSB52h>2_$|J~(x6XAaK3E<=X>VdUt+F=|; zz6baHZyvZ(wJUl$y-TC>kvHrWeyT<}^%KLYBxB zoUy_Bc8CS|8fnAxi1242qLoM_f`JUr(*~{a02^v-C;7!~$xX>_DwQgq%Xb%ivQ_)@ z*We?OPB(5pt=qpwZ?SB)X>8R7dTm>LUe>BjB$`{+Q~MNBs>k;57|!6hWE(%|F`Pho zKWyD{2{Di*iy$Ek<(;=_m5N3a5G_z@0Tjj?bx%s~M`U%`{)7L;CfB-aK|KgudE`tD+)l1pEq>2Q9;}~rKD5-RT`)4zeA_yYz2tg%Dq7Wfw zvnkoHE&_56bwt%vOBb0uYd@R{l+(fmkRQis$wD2aM?_@kn;|U1T?7GwaE~abst-BK zoqKr(WY6A3Xy;_r-ev2stcd`G>~uNEl3XeL-G*B^san=9=12AChSQD5r*dkzX1_OXCFaUFy zrU@g-fK1~|W*A0cMzaPT76F=JB8^x(7!AOJ$uQsugwdE_pa~}c8cj41fCB&_5P-k| d006>hfd9}fw)sgqtyBO2002ovPDHLkV1k_Jl$Zbj diff --git a/resource/template/StartToVisitSportsman.png b/resource/template/StartToVisitSportsman.png deleted file mode 100644 index a39902f4d245e2a94aa91294d23a83dbfd4c474f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 843 zcmV-R1GM~!P)~vR)ucdOc3_2H_VCnXDGf!;br3h#52hDhEUostyz4RZdbw!1dp{QjoinMBMG!9t0%y#w4-cmodaO;=q4`Mw zqT$)>lC!2Sw_PEb=#Ka1>g}g}HaDH`fabjr0KKAB&2fo=g{J^`KSBZslr~y19o_;6 zDkQjb<0He)5tMg;ubJDoV8^TRJbW`nPRqLm5*l@ejgf) z<|;%bAo1A+;KTaXo$qriMQg0rUAy>STm>D}gf{^LPjBzIKZXYX86B$MmmXMem3=v1 zMz6Jh3=d59_15obtF2(NCIUX#G6+`z&}c&O=bA_4BMKP=l;(5M*sQU@171J{a5`fh zfB=E2Wj7Odo;){{F5kL9D&t0gI6)ToTBTs6D6YT$*qd8@Pqym9BoYn4RvFCY zTTgS7Im-^@z^GsYpm719orD0=wP)p)!Kzv3mFSvu0K7;*jMa`8&vNyUpdmtaHPtag zOcaJ>#+pN-NE0G0W@;@&Vj!X&S8B3>k--3nCXvX8VNkHF%tj^M@` Vlf;t+c8mZ3002ovPDHLkV1nb5h=>3H diff --git a/tools/MaskRangeTool/main.py b/tools/MaskRangeTool/main.py index 84cdd27010..99d0c00786 100644 --- a/tools/MaskRangeTool/main.py +++ b/tools/MaskRangeTool/main.py @@ -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]]] diff --git a/tools/OptimizeTemplates/optimize_templates.json b/tools/OptimizeTemplates/optimize_templates.json index f1b5c114c1..f0feae8e94 100644 --- a/tools/OptimizeTemplates/optimize_templates.json +++ b/tools/OptimizeTemplates/optimize_templates.json @@ -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" -} +} \ No newline at end of file