From d65cde757482cd69e7090fccb5da4734ee1d73c7 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Thu, 1 May 2025 18:08:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=E6=96=B0=E5=9F=BA?= =?UTF-8?q?=E5=BB=BA=20(#12500)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 适配新基建 * chore: Auto update by pre-commit hooks [skip changelog] * fix: 卡在会客室 * chore: Auto update by pre-commit hooks [skip changelog] --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- resource/tasks/tasks.json | 16 ++++++++++++---- resource/template/ControlCenter.png | Bin 73566 -> 33505 bytes resource/template/ControlCenterMini.png | Bin 44599 -> 20211 bytes resource/template/InfrastOverview.png | Bin 6154 -> 743 bytes resource/template/InfrastProcessing.png | Bin 7365 -> 4886 bytes resource/template/InfrastProcessingMini.png | Bin 6608 -> 3069 bytes resource/template/Office.png | Bin 7688 -> 4090 bytes resource/template/OfficeMini.png | Bin 4100 -> 2624 bytes resource/template/Reception.png | Bin 29685 -> 3990 bytes resource/template/ReceptionMini.png | Bin 3212 -> 1825 bytes resource/template/Training.png | Bin 7285 -> 4959 bytes resource/template/TrainingMini.png | Bin 3901 -> 2532 bytes .../Task/Infrast/InfrastAbstractTask.cpp | 6 ++++++ .../Task/Infrast/InfrastAbstractTask.h | 2 ++ src/MaaCore/Task/Infrast/InfrastDormTask.cpp | 6 +++++- .../Task/Infrast/InfrastOfficeTask.cpp | 8 ++++++-- .../Task/Infrast/InfrastProcessingTask.cpp | 8 ++++++-- .../Task/Infrast/InfrastReceptionTask.cpp | 7 +++++-- .../Task/Infrast/InfrastTrainingTask.cpp | 7 +++++-- 19 files changed, 47 insertions(+), 13 deletions(-) diff --git a/resource/tasks/tasks.json b/resource/tasks/tasks.json index da06b54efb..e0d03aee02 100644 --- a/resource/tasks/tasks.json +++ b/resource/tasks/tasks.json @@ -2402,6 +2402,7 @@ }, "InfrastEnteredFlag": { "template": "InfrastOverview.png", + "templThreshold": 0.95, "roi": [0, 100, 300, 150], "next": ["InfrastNotification", "Stop"], "postDelay": 5000 @@ -2429,6 +2430,8 @@ }, "InfrastEnterRotation": { "template": "InfrastOverviewEnter.png", + "method": "RGBCount", + "colorScales": [[250, 255]], "roi": [120, 50, 160, 160], "postDelay": 1000, "action": "ClickSelf", @@ -2639,7 +2642,7 @@ "InfrastOffice": { "template": "Office.png", "maskRange": [1, 255], - "roi": [378, 94, 589, 529], + "roi": [378, 94, 900, 529], "templThreshold": 0.9 }, "InfrastOfficeMini": { @@ -2650,7 +2653,7 @@ }, "InfrastProcessing": { "maskRange": [1, 255], - "roi": [378, 94, 589, 529], + "roi": [378, 94, 900, 529], "templThreshold": 0.95 }, "InfrastProcessingMini": { @@ -2668,7 +2671,7 @@ "InfrastReception": { "template": "Reception.png", "maskRange": [1, 255], - "roi": [378, 94, 589, 529], + "roi": [378, 94, 900, 529], "templThreshold": 0.95 }, "InfrastReceptionMini": { @@ -2757,7 +2760,7 @@ "InfrastTraining": { "template": "Training.png", "maskRange": [1, 255], - "roi": [378, 94, 589, 529], + "roi": [378, 94, 900, 529], "templThreshold": 0.95 }, "InfrastTrainingMini": { @@ -4162,6 +4165,11 @@ "specificRect": [1000, 350, 20, 20], "rectMove": [400, 350, 20, 20] }, + "InfrastSwipeToRightOfMainUi": { + "baseTask": "SlowlySwipeToTheRight", + "specificRect": [1080, 4, 1, 1], + "rectMove": [650, 4, 1, 1] + }, "InfrastOperListSwipeToTheLeft": { "baseTask": "SwipeToTheLeft", "specificRect": [400, 350, 20, 20], diff --git a/resource/template/ControlCenter.png b/resource/template/ControlCenter.png index 15901bd545d1d8f86252da09ddacd82fb02ead55..fe0f1bdd48287fabb9ea9974cb0f037a4bf0e4b8 100644 GIT binary patch literal 33505 zcmV)FK)=6
Px#32;bRa{vGxh5!H^h5=oo6M+B#f`&;%K~#9!jCxsc9oLy&pVOz8yI<@eNB{&t
zfTReK;s$UNMM@Mklt^2OB}djn%9TpZlv9&T5?3Xa$5bBjFiFkB)YOdaq@0@Z*e;JK
zYZ;5AD2XCzE?T(nAPHjMx4Yk7&wQu5aqk5Lj^_}(OW*E3|M}PN|4x%5hhKI%mlg+=
zBqlp5bzDvgw(K|#V``yTn3 r+Ie9xT*%k?d2;g%Zr{3`d9T6j)_r8^yVA?4TC;(4Zx$cgZ!S7X(YN!
zrSo$$CqDWZL|0-UN1CX&-+EIB-dUXMF3 L5gd>(BF&sW#!_l$19e5()D)#@inA{bi`3_2yM>$h)QjvO`Q~P}y
zU@z7kB&gMiaStRsvIHE{9VP+@Zp49Y72W3Hj@Vg~T~eBcHBrS?VYAafBJ#LYl28Mn
zp8<`Evtlpjf%!FC771UL6j9YgB;OKEQdG)oTXQqtMz~?>lgrhopFeRxJXTezx{4oT
z|Jz>l$D1~ $tA46n~rJG3DXk-!Ehe3_}GcwA=a=g($^3ihOuv0#{5CYEQB(GbLzzu~x&OHrVGy
z)h|7@_mx*(f~EWB$ 6C`|lEfl)cZr2auah0kGDJbs~;75&Jp&S9@chduuLj
z=V7>@P8J(VTB6g|@dyGMM|ax+0|Wx*rqEHfL5Y{%D&ay3(*e6d8v?`}%F~05?qucX
zDFnd3&Y2%uS#$m*=rVl+0@OQta64Ejl5puTb;HI$>B|HezB@nq_)=H{!#^aoccb)9
z@)+dmn8hf|Zrr7h?@HZhW~J23F!NPaCH39_W`cah>+zNDVlu@Pi!met0*po@g!Ke@
zt1XmQ88m#w92g6$lhA6O)_%P?OaOVib5+t(tsXWzFAgA6y$2uy(E(^ErwD7!>j}fJ
zf147_?C1ACK~!c&Ms%g%&yi8|APHhAjvuB&c1*%%1S@haA{&RnBGj7j$J3f>;dZpG
zk1QJ!sh&^8_c;^0-SJPj)avGt0I2tDEkb>csbgyM<8h>MG)~s7E*k+*oKz7x)#lG6Nu6u9QyBypr(*u3LD>+z$
zsIe>`FK7@Hk~NA~v$xLiEuS-5^ZRWhEK6+L(>qMV-1q*wC^b6LZ!r=zBGcYqwP|!F
z(Gq(}U8Tl7ZSoP5&_zbfTWrfsBaIV?r20GDT@}F5ZR|~2L>7~tld{&WYiSx4@(x@5
z
~kDO=Yog@taun?+dTIG;Z>Oo1J5?
z)Y$EXpN5Ox!LlaXckYq1CjX`|ySlb3eD0sxYYPL0Vh>?`*4zW+so&sQuxQEr1q&2K
z3{;-VD*Z>Zr~1>ozV~kUYU4r{&n>V6VM5wqO~(}v8
-%gZ!
zd;5BsZTYpKD`#M!fHymK7zNRz7QqAYy2reV^1yJW-{fHCDA$yCG>#2WX@K|;w4f?pE`{8b|`|Mf&?0XOhtsdOG?R%0FIg8jgjRz
z;1@o`!!kEEOI3QFmrW=7{P5^dt*OX|Pje)3g@cu5A_A6hfPx?c>R`PqIwTMvpanxq
zprI5n(Bi8(L&8q`HxLoqI(R9)cUYuHar92hxUOvnF~{mXvCujw0?6mk