From b5389cbf007e987c183fdad8de18e5a43d614b76 Mon Sep 17 00:00:00 2001 From: Windsland <86581225+Windsland52@users.noreply.github.com> Date: Sun, 17 Nov 2024 13:14:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=87=AA=E5=8A=A8=E6=B7=B1?= =?UTF-8?q?=E7=9C=A0=20(#246)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重构部分代码，增强深眠运行稳定性。 主要是为战斗失败后添加奖励领取（上半成功但下半失败）以及完善深眠片段上下半的判断逻辑。 --- .../ArtificialSleepwalkingCloseAwards.png | Bin 9297 -> 0 bytes ...tainedAwards.png => ObtainedAllAwards.png} | Bin .../base/image/Limbo/ObtainedAwards.png | Bin 0 -> 3070 bytes assets/resource/base/pipeline/limbo.json | 175 ++++++++++++++++-- 4 files changed, 158 insertions(+), 17 deletions(-) delete mode 100644 assets/resource/base/image/Limbo/ArtificialSleepwalkingCloseAwards.png rename assets/resource/base/image/Limbo/{LimboObtainedAwards.png => ObtainedAllAwards.png} (100%) create mode 100644 assets/resource/base/image/Limbo/ObtainedAwards.png diff --git a/assets/resource/base/image/Limbo/ArtificialSleepwalkingCloseAwards.png b/assets/resource/base/image/Limbo/ArtificialSleepwalkingCloseAwards.png deleted file mode 100644 index ad5ee00b0a310c0ab6b5c3a95c3ed9335647f833..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9297 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 Kq+6|RANfCCBDEy| diff --git a/assets/resource/base/image/Limbo/LimboObtainedAwards.png b/assets/resource/base/image/Limbo/ObtainedAllAwards.png similarity index 100% rename from assets/resource/base/image/Limbo/LimboObtainedAwards.png rename to assets/resource/base/image/Limbo/ObtainedAllAwards.png diff --git a/assets/resource/base/image/Limbo/ObtainedAwards.png b/assets/resource/base/image/Limbo/ObtainedAwards.png new file mode 100644 index 0000000000000000000000000000000000000000..cd8b3955e77a64616873293e02f13b7b4cbb20bc GIT binary patch literal 3070 zcmVr5|Yp)Eb=Ra`mR3L!LccjGoqL)s6Urqi@v z_tQ!H1Exunru{f+C&6tuF`*MZz6;utD`}fcLkOuGg6nz4b%X1=nfvLduh0Ck>m*IT zP$V7?=O6#=?*kB$5CVh{NQf>8AwY=hB*aEyqW}?d00XYE#=+RA-D=Xj)Z(6RM%f%s z;JPlZ8^O!~0|Xd`ff+`~Ff+g~3^T(pT=0>E5TZ*$2qBON3DF}VLSi65+(g_UKwRTS z0U~sz)4}sRE?sWn4n=t2zATRGG9ZK`3Zfo9f?(ezyUVJV|+V0j3k6uWgvt@ z$Or%j(IW^991IY`FoXcZ2nk{Ixk7*lNn(}g5}^R`br>>Z$Rc2X8AyCp0m8x9ND^iS z0+}$nL`Z~$KtlATlQ|F|2!H?xfB+F7ZYPikBmxtGiNJ&mWFSBi0k;+a0U|&IKmY`E z2@nJb5E4B?^a&vl7!n}FMq=COAMq!L{)VS^|A^lk&hn)M2m--@JwIVvVHfKKhyW2F z0*M|00>lmOPmgk2;yM9hK&)}a8X-UoWK(&P@f4%EB6EvVgmUSJh{fXElITedXPDTw zpTbCki0d-FaFn}c7>|uV&G?qbIW}{c>G`AFi3DaKgkd0oflHU@lIRf#Vdj#}3D5MG6gF2PiZVy*eDPz_pW)^~XcJoz%d?-N>XR#|Ur{<{wZuKFE%%!tR6%#!sXtu~w zb)LD!6NKJ7`6{_|o=hsoP^mAGh^KJPWzY7fiACeQJM}8{uw|skmXRW%N5=LM z@_nEGdi!6wC38u{lk6-$g=;S06LF)2YRgMFGCbeMb)#HfX%ccU60szqQe~EFzK4Tx z6M-wyB|-vH$t?No7;hhcg=%Ao{kxwh5l`~wi`99K&%Qw} z^B}F2i!@txl8FqN;XK)No|)1SZc9GRR+D4XuhCv)~mLQ$X z&}deu);|LQMxOwqM}V=x_AQUnUTO0F$yYgBK25vbU}teZTk_u}bk+A*@0#zkXZryT z?EVRRwjadk^L-!ByTX^b)NbPY9-eoFjaE8sl8Foh>E!*ShI7;!6)vx|xD#WYk<5dn zlR4f!`6>ggc9WHrHoot3JHC9z@)LMo2T6PtL#|7Y85_0Q4Pwzao8!ZTGN~M)a;?Oj zn1Sm80$hwOBjZdj9N|K<#z47NqFgUgYnm9J55G&MLJ%G%y6D^ zwM4B^#=*D~SBTL3;wc1d8{I*>(*&__l~&a+b7&&0NU z%$6pZTRefoZAf5-0mcUT>_hAse~NF#Q-qR?O`tPP4}7F;=;(XMhY4?@hl(K08KXq{u|``~2qE%M8qx zKEMI~U~~tCk#S}gj&N-HH3}mSv$MFLl}?*Zr$f1RhJk8*k@|9lR3gL4g?E`i0av{amoB&1`rtUxNQ}`3wsGIR4-mU2LAAaFjuCPg!oe8Y|Lm@x zJ9GsQ1OW~K0RaTC+&WL@+gXOp<<$I9B%jd3gs+-!@K%_ zeCPMaxj!|+x&J-G7p(@N_R2-hFIOP|9Qs60JeFj~*b~^05xZwI=jtUsoP7%ihk@mb zpL1!YNh+CUYVJMeK0QvWy-cg!guuZZ!*Boxms>J0;rShAN>fB!m#eluFi9zS;L_(V2xvd;D73$;+O%3(Pf5VfB^<(xLjv|7%)H}R(-N`iut7z z+^x?WOMKo~;%=Q^uJF>~f8wg|aaRNwT?PUS3^4j!y37nogbYIn17wCH2oM-JVpV_< zau5SD?pi>f0f8Vu$m|FLGed3pf}KhJ*3g_JbIPVHk#C7{-pVCwSq&&u|20h6A+Q%RIa9 zMSQi%X0mLGCHSi!{{xA5iU9b-!lV4?z+dCI#(>dh7?@!gYYYSaAH^DYU^q5|h5!Hn M07*qoM6N<$g4~syI{*Lx literal 0 HcmV?d00001 diff --git a/assets/resource/base/pipeline/limbo.json b/assets/resource/base/pipeline/limbo.json index cfbcfbac..27c59f59 100644 --- a/assets/resource/base/pipeline/limbo.json +++ b/assets/resource/base/pipeline/limbo.json @@ -3,14 +3,15 @@ "doc": "深眠任务开始", "next": [ "LimboEnd", + "LimboStageFlag", "LimboStageRightest" ], "interrupt": [ "LimboEntry", "ObtainedAwards", - "ArtificialSleepwalkingCloseAwards", "ArtificialSleepwalkingAwards", "EnterTheShow", + "ClickBlank", "ArtificialSleepwalking", "ReturnMain" ] @@ -40,15 +41,21 @@ ], "action": "Click" }, - "ArtificialSleepwalkingCloseAwards": { - "recognition": "TemplateMatch", - "template": "Limbo/ArtificialSleepwalkingCloseAwards.png", + "ClickBlank": { + "doc": "点击空白关闭", + "recognition": "OCR", + "expected": [ + "点击", + "空白", + "关闭" + ], "roi": [ - 511, - 578, - 248, - 142 + 569, + 660, + 121, + 27 ], + "only_rec": true, "action": "Click" }, "LimboEntry": { @@ -106,8 +113,44 @@ "LimboStageFlag" ] }, + "LimboStageFlag_AfterFailed": { + "doc": "判断当前位于深眠片段(After Failed)", + "recognition": "OCR", + "expected": "本层酬劳", + "roi": [ + 146, + 676, + 67, + 21 + ], + "only_rec": true, + "action": "Click", + "next": [ + "LimboStarsMainFlag_AfterFailed", + "LimboStageFlag_AfterFailed" + ] + }, "LimboStarsMainFlag": { - "doc": "判断当前位于深眠试验酬劳界面,后续进行上下半判断", + "doc": "判断当前位于深眠试验酬劳界面,查看是否有奖励未领取", + "recognition": "OCR", + "expected": "深眠试验", + "roi": [ + 161, + 96, + 163, + 43 + ], + "only_rec": true, + "next": [ + "LimboStarsMainNoAwards" + ], + "interrupt": [ + "LimboStarsMainAwards", + "ObtainedAwards" + ] + }, + "LimboStarsMainFlag_AfterFailed": { + "doc": "判断当前位于深眠试验酬劳界面(After Failed)", "recognition": "OCR", "expected": "深眠试验", "roi": [ @@ -117,13 +160,97 @@ 43 ], "only_rec": true, + "next": [ + "LimboStarsMainNoAwards_AfterFailed" + ], + "interrupt": [ + "LimboStarsMainAwards", + "ObtainedAwards" + ] + }, + "LimboStarsMainNoAwards": { + "doc": "深眠试验酬劳界面，没有奖励未领取", + "recognition": "OCR", + "expected": [ + "已领取", + "未达成" + ], + "roi": [ + 1007, + 204, + 70, + 28 + ], + "only_rec": true, "next": [ "LimboStageFlag_up", "LimboStageFlag_down", - "LimboStageFlag_failed", - "LimboStageFlag" + "LimboStageFlag_failed" ] }, + "LimboStarsMainNoAwards_AfterFailed": { + "doc": "深眠试验酬劳界面，没有奖励未领取(After Failed)", + "recognition": "OCR", + "expected": [ + "已领取", + "未达成" + ], + "roi": [ + 1007, + 204, + 70, + 28 + ], + "only_rec": true, + "target": [ + 681, + 707, + 85, + 43 + ], + "action": "Click", + "next": [ + "LimboMain", + "LimboStarsMainNoAwards_AfterFailed" + ] + }, + "LimboStarsMainAwards": { + "doc": "深眠试验酬劳界面，点击全部领取/领取", + "recognition": "TemplateMatch", + "template": [ + "Limbo/ObtainedAllAwards.png", + "Limbo/ObtainedAwards.png" + ], + "roi": [ + 941, + 132, + 205, + 176 + ], + "action": "Click", + "next": [ + "LimboStarsMainNoAwardsFlag", + "LimboStarsMainAwards" + ], + "interrupt": [ + "ObtainedAwards" + ] + }, + "LimboStarsMainNoAwardsFlag": { + "doc": "判断当前位于深眠试验酬劳界面,奖励已领取完毕", + "recognition": "OCR", + "expected": [ + "已领取", + "未达成" + ], + "roi": [ + 1007, + 204, + 70, + 28 + ], + "only_rec": true + }, "LimboStageFlag_up": { "doc": "判断当前位于深眠片段上半部分", "recognition": "OCR", @@ -148,9 +275,10 @@ ] }, "LimboStageFlag_down": { - "doc": "判断当前位于深眠片段下半部分", + "doc": "判断当前位于深眠片段下半部分，未开始战斗/已完成战斗", + "_doc": "虽有上下半共3星的情况，考虑到一般情况下不会进入上下已通过（且未满星）深眠片段再运行m9a，而在外该深眠片段上下半通过便会解锁新的深眠，执行时不会进入该深眠，故此时识别的3星可视为上半3星，即下半战斗未开始状态", "recognition": "OCR", - "expected": "3/6", + "expected": "[36]/6", "roi": [ 1028, 101, @@ -173,9 +301,11 @@ }, "LimboStageFlag_failed": { "doc": "判断当前位于深眠片段上半部分未满星，结束任务", + "_doc": "经测试，上下半各一星时，会解锁下一深眠", + "__doc": "参考LimboStageFlag_down _doc，虽已确定不会出现检测到[45]/6的情况，但为了以防万一，还是决定加上该情况的识别", "todo_doc": "后续可在这里添加重打当前深眠片段的操作", "recognition": "OCR", - "expected": "[1-2]/6", + "expected": "[1245]/6", "roi": [ 1028, 101, @@ -189,7 +319,11 @@ 85, 43 ], - "action": "Click" + "action": "Click", + "next": [ + "LimboMain", + "LimboStageFlag_failed" + ] }, "LimboStageLightest_1": { "doc": "最靓的位置，要多点几次", @@ -313,7 +447,11 @@ 78 ], "only_rec": true, - "action": "Click" + "action": "Click", + "next": [ + "LimboStageFlag_AfterFailed", + "LimboFailed" + ] }, "LimboVictory_1": { "doc": "深眠战斗成功_1", @@ -518,7 +656,10 @@ }, "LimboObtainedAwards_1": { "recognition": "TemplateMatch", - "template": "Limbo/LimboObtainedAwards.png", + "template": [ + "Limbo/ObtainedAllAwards.png", + "Limbo/ObtainedAwards.png" + ], "roi": [ 941, 132,