From 6f1248d7b32c8373dd410f7570ed72941853ed60 Mon Sep 17 00:00:00 2001 From: status102 Date: Sat, 7 Oct 2023 12:14:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96StartUp=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E9=A6=96=E9=A1=B5=E5=B1=95=E5=BC=80=E7=90=86?= =?UTF-8?q?=E6=99=BA=E9=A1=B5=E6=97=B6StartUp=E4=BC=9A=E5=85=B3=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 27 +++++++++++++++++++++ resource/template/CloseHomeSanity.png | Bin 0 -> 2602 bytes resource/template/StartWithSanity.png | Bin 0 -> 14701 bytes src/MaaCore/Task/Interface/StartUpTask.cpp | 3 ++- 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 resource/template/CloseHomeSanity.png create mode 100644 resource/template/StartWithSanity.png diff --git a/resource/tasks.json b/resource/tasks.json index 4b3b3a56a5..c316438a75 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -3308,6 +3308,33 @@ "StartUpConnectingFlag@LoadingIcon" ] }, + "StartWithSanity": { + "roi": [ + 700, + 130, + 140, + 120 + ], + "maskRange": [ + 100, + 255 + ], + "next": [ + "CloseHomeSanity" + ] + }, + "CloseHomeSanity": { + "action": "ClickSelf", + "roi": [ + 750, + 610, + 140, + 70 + ], + "next": [ + "Home" + ] + }, "StartUp": { "template": [ "Terminal.png", diff --git a/resource/template/CloseHomeSanity.png b/resource/template/CloseHomeSanity.png new file mode 100644 index 0000000000000000000000000000000000000000..b32c4d827374126481ed380ae91d55a96e760c3f GIT binary patch literal 2602 zcmV+_3f1+AP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D3BO51K~!i%?OJ`lP)&o({ewFt5>t;(BL1Krtw@SU z_>;I-Xt+#KOazGtqT>!l(9$YeuhKQ&xAwR8S$mzed-ge1W0LvtJA3W5zV-NiXRWor zwNDeeb?YV|3K9|$I2DG>34cfk5w)oZ7)^LUttFU+YAmWNOI^|0$|;6r{3fIY+PRjt zI_O^_IccK~TX`$7mDuXs)0J$UDuJQfr=)a++}vE}h8r{cB{3xVA7*-KgK49a+HgO^ zSGz6h*tKg{Clwf|yz@Uk@HeOGr=+C7@B8(G?CIH%ot+Kee3L5kdiU-Psi~=uoSY0T zEiLf)@ng7t{W_dHc@hpBIKZ_D)RNZ)64nD_wzM^NcQx^B(_5nZgcOTlZ8aDbmZ|L5 zURqij%$P9)^78T^Jv|*hefk8UP>4&tAQ9fYc>^^yHE`j=1vql#2%JBEo=d%m5G)#u zFVVIIxi-yHwFlo{x_$){G+lGnwpxNC8@O^Z%?wGAsY4eY*Lyr8{j(V|5% zWM~h%ckd2s)~tbH!-sQ@9p?CafxZxR-@=hTl`~D~WqvjecyeQVWW*O3i%&y}w@gsK z_4W0zc*znteE2Zz*s%keo13}R9~4Ghym*oCycjlY7;N0IK|VcQ-wfghTL*-yhX~Iw z)esl@c7SRBHLuwzY0*A+&K%q>B5S>P@dDPaT??mw{T1G0Y_$*Ls-J)Pg-h+It*wQU zk`h>gBHz7x*BPGy+9yYU`z_!30PC54N>UNi1eGV^r>soWD?~uq$)whSBIRpTpd(J! zv}t_j1wGMdrpQei+i1r7!oL>6wQJYd!i%?W-@@+QyJ6qHeNgk@0j&DzCn=x_>N6Yr z?1W*5IWB!{R^T`kZGMIl`6(IrNfG0dW%~5#ax=EgFghnv)J{(}Iu;RVN#4102c}G! zBKJN8605wt9JXxP0+_~;JblTu)+oa}a z0>&@lJ74e&!HeHi^#i?@>C>kV-}&R%v171&`Eqzd2WcD;O-ecuEMB}=3ij~fL$-84 z$Dv)jc0pEFmR#B^89!C@z~gaiUD?V+#VeKZD*S884^}rfOKF z>3|#r6gTBzs4#2hOwJ()XM@-9hqN>(MG@&`W9QDDIX4m{JoP_@_c7aiiN|v}!<3VL zG(kC(9i&6GaR&h{v*O}n7&K@Q=Y&Ch4IDTSReZ{TZrwWf zY^X@DY$#4sp#5;urcF>;S;;wVgW8aLsMe;HWXtyIJ_498k&u`u5!B2|~YQ{jI1-;E_m*y>jJBk6`2go=-)6eLc5i2Zki# z%$YN;(;Z5g|@oM4{B|ixeyxQ3xyBn3?#b z5_lG5H@u)_Mdc(`ety2dFoa9Iz|C8fmX-<(6FdUv6E69S$v(5zNZU5=~7_ z>{9%|*iM`~caHBOLCcqBBF#cmkoFS&ushdLEGa2rw>l1|PoI{vgEndR0i+Whk2hRG zAMB2G6npgOA@{6~LQPGL$ocL&>prSz6;Wp*@hcIGn3|dzC{m9V6uJ~)z{`Jz>Lm&h zlvWX$*p|`o7h*<6hPZX>7Q5PhG&eVky?gh{eaqHgRFW7$7*X*HlA`?b@^W@Lemr^d zL~P%_-P*@z{J!ny6n)Z(-YuuU4=iz*tKPhKG30>3IB43-;eYz#nq|4+jAM0a}q9r<09AQvd(} M07*qoM6N<$f{w`LGXMYp literal 0 HcmV?d00001 diff --git a/resource/template/StartWithSanity.png b/resource/template/StartWithSanity.png new file mode 100644 index 0000000000000000000000000000000000000000..9a0c396b39c7f270544603adb2c4781eeabff160 GIT binary patch literal 14701 zcmV-zIg-YSP)^bS200001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>DIRZ&UK~#8N&7B8; zRMpkT@67D7%Pwt^woBQi31UYqhy_GZY%#Xjacx)<8`da-NyHiyO%yZ{jV1P8k{C6{ z7&}%JP(Ty}l-_pPHsAku?z_8h$61PyeEI8RX5PHH<@9szeQy&7?7Me*)yicqkw`d~ zOu0ld>C$y|u1-gFO|?s>om*Q~>xxUdIzH&5olB?d?3JG-a&n!ktEvBF%dDQ9ZbnN@2&Ty^~^mQugzb5`bHdft|E7V+{@~m>w{Z^!{XFWTkpOKd8Z)#3;auah|D%AI z;$0E~7!h>TN&9MHsNUD=ebOc*&SwzG7#%~pPM;f{Lh_?_GhhsjF{MsSZuqP**pYN& z#$4_8+;QMra0YBrKu9W^yIx;E{qF~6O=*?H&%^P7f9k<&~UiFxX% zNv)BENJQ(#lA#a%o>gkYYtBVsD3 zt=2zrqBJ1TDxFBW)hk!H7A;!3$&>GKB_$>Piyr|5phELtKDoKMZr;3kHs)o^m%Hy^ zxIX9P8)WMfb&|jEz9XpozcJy7- z<_(CcDFseqRtTQ5Ax?Ypb3NM0wJMKLIR9i@Z$|* zX8dw7I-e3Pl8OWPuF;G(c6#DRU?yOU-+ue8F*c4=ubyRNVIDpe<%;*i;0b~fi5%Cw zpwPbKTvpf*{jZsfHD=t@M55m?XPdV^@`{Fx9zDkGu)_}aeZW^=edQ)in&@`hZJ@48 zxO?uIEZ_OPTeWJX5wc2S<*2Nzw29Hq=0+-|DBT9@$Jx7gZ+FNchq&#x+s=I>O-?B$ zXx*xnYty>5D=cX4@^uZ@5zJxwn>A~ufG%ZYgub45%-a*eTK3JaAJDJfZ}KBKNqw9@ zf4*FX;-Cy94pN|0p^jl{G8qLF3UV;R_!cBFm6Pv^incHo*#Mh_@7S1%364JdM&+29 zPxO(wU2(-|x7S{K`D)Nzw<65?CC9BeoT+Q|B+0&S@Nn@s_NJ!Q%ickjLT znt5Iqpx4ayP zr6~F#=?$9DEU$%Y-MVN!OpSHSU{eH38H0hbI)?<08g-EyI&@!uUSRUGX3cWlyLWeI zopq+0`q@-F-@pG(?$!ynx(`46z+H6lMJD-(hEHiiSSLg;2vjxNtZ_G2v|QY&lQDs# zprF7lU$Me^#TPYZD8O%>dTO~l{`eEzEfa1rCWHCk&UcFzFLnnV zbg=8ytC#!7Yp-b>4T1$N0zGWJ5=a=DE26dALe@p+LTrG^o}- z%{Se1&p$6>Epx*UIKa&RfikuKlpkHL$a$xoc8Ypv479C_gk$K?p{|Prg+ObO+yr!F z416Cjw|ey& zd#w>+AzItEMKKeCf*)o~g56pV>?9szC4PTiFG>*u9 z$dDoSI#0qf^|Q~6c36u5#siHDWihY@wbJw&rHv-Q8jI0g|NHzslenZVl}0P9=em&U zC8jb#qBrOhMeOEN`L9NkD=27Xg!%!vHnVTRqTej%%TF$M2OT&(`s9Ihj~H>H%;HM7 z^MC=;iUICdzxq`@Ltz5fO!?pg30J;5bL2>w;*Z>`ue|COe)qjwzHGU)e3jLY$urlk zt+Jp6217*Vg#Y0)%&Zb2dF49<05f>U?YFx<_88M9vClAcXWtU&-=FOd_$uD!4TylwfS3c^A$DfFS2=U+jG}08T`MF!LLk;6n~N$o=ByKezV*n6~rfTjzc~N5?mA?!0+c z<~!${bKGN(J+3R%zb2NhACm{4{`%Lyy4`o*-R-~s{_c%`|6AQ-hJEnSFbAKs z{`qd$e*3xh?b}B^Wyf1@z2zoOn&dwD^ix+TfoP?42*k(B9AF$~o+=SQ`xh@p7?<1U z4MAc*F|~pQ)FAcybXqnZziRwTxaBLCD6dTI`qsP)3k%(8 z8uM@D8qWE}FWd)8X$Zt9K~~8{m7hGq9evbMroHO|ZsZ=NLhrx-z6mI~ZqVES`Xdg2 zkysbp&&D7zbgzMFGrus*ghu8}1gX)HtDt20$`vvpeU0a=Vm3k`bPUE+wSx&8I_v;< ziL@~eOwr|6UgL;qXL}PO6c3PX)W!UX_88WiJz<1!8jp0esQX# z9)@hW<(3vizyOE=Ltze|4SEm5$Ybxh=N=1a%FD~$<4-(cZP_fCi>?nEO+SID@p-=f z`s*%NLPZ3>SZ1Dpig<(HwP@MG9jd6g{N$5mPMgk$5w_2#O>?*1daK;XC)NjZt{-m% zTn2PvJ{yBnS+~w(YiolBrWGiq)T#em5kO;hGYLTc{s;QSdjq@gG#tz!}fQh zE*#ZpprlT}6hny&@q05gF%u^BcftwBD_GgX-FV}TuDH09nLfgQ(u~!sS4k^7x)y~6 z3NBi>LJ&#CeeRVR!OO~v#0e9`z zTc4Q|+T1We(@I^RuBnPX`|q|>B0p~2bw3FIe2$BFYNaTw7>#f}N+H0@1s?i8($TA5_QWhqqaRV&Q!Sd;sTzs)H{&J;M zFb2?nO?8z8gJ=W!u4|Xh7N{|1 zEC6H1+|T&p3-@#RVp1*&{RrtQxhY%%f*c55QBi3^{Njr*T7b2!qHTmT6VM6)IQZa$ z-JW~yX~GAs%!*|J?K5|npY57dS!w67p0b|6Om?B9Jx`NJY0@=Pi&iqf9{xH&4bw-r zm`~5to;`cI@#AkX0tC?M4Zr=ZRcF>noA9CWfly39J27c@-F2skFvAK0aX_e4D#wC` zYB8*&bBXz&fNvF8y*K3pcY;zT76)FHV32Z*8+WalT2@!CyY5<NU9+(cZ5wH~qjp&k} z-`r>dXn&fb?B}0<-WDbZ2D332x*<>qC}tTKg;2yno5UaFxLA^`n%cdz+gQH9v>Kl@ zjzSU9G*iGNHTYD>Ap|Y8Pdd`I8t7Ic+zr-Q0PVuiS6+S9RcZjAX=1b&wPKUNe?r8Q zPC7}yzg~o0Yf_kr+*~E;VgN-3{4G8cK*%MF7mLvI-K?3j+;Pe`d-Uv~faOqY_u6a6 znf9(&v0SbnVe*WG7R(9XHCN^s!RapZj>bX@`ohE$*(Op+F>Zym*Gj?!liz;(ZA)jE zBi6;!kYY`>F?pr>Lj&`1K~c_$rTJ9B-M^KF%~#%8TwL5pIO8C)|LISE>K=ahVN3r4 zuv+|vz7Q5(Gm#j)$8Krc;h-;*@~Mz}tsFi~#S~%cI(NmVdNvz7q%|I%ImI2?NgM96 z4&%7*fd|}u_up?C@WFfUMP~uOOS?{DC|g&MT-H>3^yqGTlHwC(&=8n5TDNXfzk`8@ zx21?o`7fdG@uRsSV*3v5ZHbOVpI*H5cQEE7<$MmV;R~5jv>#@bbnR-)CTR2#v1bzC zcZ&oku9qHmYUAhacch zJn=*e;IiSu3oo=SK7jVnWaa>G7E74pRxcp2cf?ftknkpnQW|TzFqc%Ji}F+kq|r)h zDFH^K7ujISO*dTsgVl_??z+o8s+0k#p8D~}HV6;T&<>Ks?q%Jq3`wMXn4;L7cOGC- zY9I>QNIC;Ecags&P*qa!3lvBz7~cNrOur@ z*Cc%_1!uSs`ea?Sg^1lu+KQRC$W!gm76H=-$}thRzFTc&3llKrjyvu!OMr#oI)Et- z0s$BY)`zjeT;K(5xzU9*jyWOFnPAzGLJ2~R-wnYhpUGddGIg&(yQqK6jjv6@V5@!V zJ^AX|%C%x@FJEa9LyV~rVB}3V+|X#F7??QmcK5`SPbsfVyAP+lZ-n&BG#W`mi(R*} z?$WRto9r)t`Ab(+)YkpuAODa~+}_^PHq1i%nK%r<$2=hI$9z$lL0j-`v;mQgfqI3w zgnmS%L9!u0N|K6zz%1Iw{B7B%j|mUUZbZ|(r_T#6xWKARaj>#OBtBrkfOiWKS2KW-NNsT zP?#2^5F#=e4oncHDQFdfM12#DVsa30-n_YHY8Ne9Y}dkAG-&R;`L0ko>`_M?VbY5! zrp>?{gke*FSt~Cu&q}a&-+kAF1d9^DVmZE<>J-E$WrDH6%m)PK;%8mNd8KL1GtWHZMvNF?*8`Z2Hc+SS(xq#C zv^anMw{j1)Hu-xePquTL8>Cjh|NZanJ^qs707L}LffR~76#)X|*W}9l=Kd&#KseE) z@H;dV7XtIPlKDo{o{)RG>86`R^RyLMxPIKYaqcXoVR0bLEG8g00h}X%%F5Jz2Jexs zuC6o(o?ttRI$-5v*{U_JMP4%_U~x&ANtuT?YmYtlcq5IVoJFY5;9h_IUp7G26&EWI zA#hm{nI+757zm*|i9A{f(;!qJLIBc^Uq#dDkGe3yhT{?&+tWwjeG1 zp3);=<%#x>KKkf-{|U}G;|%vNrG)|OWa_^A?44e_Hj)6PCTJ(?tJH&~xR$4OLQ~No z`d1sQ^j~`EW&Sq;WxoqAx>#yitzhCqA7DfvXyCVKUL2T9axgR(=He&GDJc@v4^v|a z<{52F#8&_3xEng(D9Yok~O#*Dd#8AQ_%nfGWi3?Ltdxlca% zq?uJ1bG&kAqF-`KOfHKE0p#BBl=;ywWz9KrzB1-xx#EEn+h!P70Q;0FdNj$@s;V_+ zcJZVZcI$u<95pp!sx;NiuYQjYz5DLTjW%7MtFZnvN!VwSZgwmL;QvSwg6Rxk!Z44$ zLi-u^pGY@z7d?x+pMLyFBZlIW zvoRE0am5w3--!H+au`zjh=Q)e4?o;YT^xa-jDczmrngr-1b`^Fn@ zxa+UK-h3m~t8>pi*ZuRK|FrJ_LP#V`+(012T;G%cV_iUj0?aM9>|^CrtQa5&#Uk-L zQW&ar1V`a}!1o6obdbxD3(8f>1zoZ+6eJ;hO-=A~5YQ8ms5cNafKMlvpW;8nz;1%I z+=mmvmh#kYrpX0FsOOz`p4|_F??SRU9)J9CdyVe_4v{ruV}cw(LNUkx2~3+dEqb?Z z;NQ_!0;5TjCYfo)=K|(2{^px4#?U0Jer)p;O;UQ_p+kEMN_&g3-MW>UQm$ro(5^Lq~-+=x*~DU!Y4uwgpS8J}-v zGr6?M(h@bzi!Qpzgn_^#_#w2AK!dPU)Q3j!)kc>Bl# zL2-i4OdNT{;p!J*X_~D`I+d;%6WPWB%>v&dPbwr`N_PB&<4>?p0k_?Dn|nvecn2{D z=^-%kufDt(v<#EUCNKQY3opE2fdtnOL596I{Eli7%w>gw;s*W|0inVJLt$*de}bu` z82~}cv@%VBg>G`~+i$#7NzTXj97MptUk|hOhQfpfMm31Z z2B4t?1LRc@9BqS9m=Ipk*f2o+4+$Pf|JoS&+H0@b010qH6^H|-@yar^_E0U71Lt|Ub7e7pS5v71uY=eOh_;~~>fVpS- z+Ds&gd_5!mRu+Q@7yiSq7PV<@ky#wncmZaX3FXM?BOpjwUaM*)*3n|+ju*SHqa-op+()XoLmdh4wktiR)oau^a_+^O+O zO#sZK;(}%ez&w6~He=QUIEM*DD_E(B7a{7QbJSW9pv?(14iLx%AUybW+zuPQVK4_8 z%8tZi5Vg0aLARHH_WI7#zufqXUsTDgPT{PUmxY*Dda zq?d5X%Gn(CgW&4}VCV@aG>&iLz$43)kdyKb&G3`SNueD|Z4|MQM8`2QLr@$vt5l(P1!cXdc%CsxzjE0#YB|Po6y4?yG4k7v=K>7$hFvFN~mgM3<=$nEx9H%V5nnayFQ2`J2ptD_e-L+8>fjpB^RRFmy zRUzu5aU6BjQC1^n?@@eR60^%-Df!WUV0K_CzKRMBpZC@8>&JET*!r3EX^(--yS3Kn?J&W#~RbY^jkbn7E># zpwQR=&2ekYm$BU(6(s_&C{57;j_O6ZXkFOm=?Mr4A@J#EoMGn!D0}(fB_Xrq3ji>h zyexnLk#mN7Hvsb6=6FC?*Jx(mckU6&MOE^MVcTApE;g?;dwLrZ1rGl zVZ{PMY|0Z{GJ%x|z=dQ3R(r(0$BO5cS$dISD#> zD)}wz&)nXLK*3b#LMN=$lf8ynJ`$k;g@6JlM7YU`~T( z`UIVhiR7rFu$m9ks1tKQ5QqlTcHVhsD>}ePzyJ{?t=zd6^Ug_iV37TlnHr81lvh-o8`LJYL_}OW5fbx7WrAK%tW#-k>eIEULlh} zIm??uZi5&ybXcQYkbN^jN*nwd&fb~%MH*QXrDG&Ifb#@OtVN>D*?@^Li4~FQ6ElS$ z!XG09?9U0i1o*zGsCZ+6-@}B`ZZ?zNzkh#=GTH6GjZtxM>m|E7AbOiNMW$Wc#fMqN z%AsK_I&d2Z%-%xQh4knKX)D6dPKF-RS~jauu|l(XKE<--E9^E9@_uem!<1VgLWD+0 z5W+a1PbLyY?b@YN@~K<*?I{NMT?+WrXPTdwC7Jq2m=@=CX~k)aK8-?!(@JF7tCZ{+_J%MxN(@f*cUEX;JPWd?$dWGx9v7t zyFt+n)66Ywn}PArg5UW^>iOkH&SBzlMbM7x4?Wc1eGq_kWH&}YqNr0@I#spQ9#dD; zCf{x|_|3Q*-G2M+A6?=Dh2W%-PMC_ul$W1sX$PqbOv8^-X<_2jGQ*%441*4yDf(Jlo+z0EM)L28M zDS)xEFwt3>$7ZpXEvXVUEP}7CQXU>%3kd244IHTWI;Uop%a>CwEA8k~vg5D5_Ez+@ z&n;;rNb7dnZELB<$dPB7$z*E>`4Za7>PjfHA!#s|YqEiWfSvC6PBbrQIpBBrJ0^zd zCUoavRDdc}d{^C%1(7`Ch9PXu#^(dJXR;CQ;)^f-!7d24(y))JD@4`r%!cUIa}iJK z_c38ghiJ^)<;FTI7KfXQp(9L&IjmOQa?34lmV!(cIxx?Sg+^(a-@r&tp&Z{vJ{+sU zqI_Iau`2QXOh(DtRGzDl`C$L)0mBcrF9KNmgrPJ}-Sc<1{mz|#{soo{mzNVnJYs|4 zCLv(vCo-pKUQ=LA5FmwI8wYoXVP^5$W_}d%2ZU5;Q$g?p@+0d2Fo`gfTPZRbia#e- zK!dR!_&fxWgIHm}P6OOIXPxbyd*&JUpsd?1?lzdh}E~6km*|b`alS{xRXumwD3{!WL&J8XxYp2}ram>6uQ+G3Qh*bEVxn zyBGh){hwjY|SL%C9+2Hu^3E>6bC`u6i`bgO~Q9~=+IH7ueS*hfe}$Yi~n(8 zb(j-*H~|}<887J?CY4u;B)A+>4zA@DK_Ipu(1I@1w8xGeYv~SY3TfL*M89%9r<``0 z^#wys#`TZaeQ&uqxVw*?mvN>tRxD&3IjCx#q^>TRYs*7%hJGU7wSxi(>^>4YapE1O zMGylp0M-N9MUO@yQA~~ruZy7|Ec5X@fJwp}5d^Sn4n||TU?vmdI+&VSWBxIC`Q?|* znt;MW<%Y5flmH1h(9$^QA10xlC25BAE3x)?^YH61-Um;Wfmlt0& zLCtSoV0)7=r`KM0ox4@SRMM%~eZzXJ_!u646qu=hjJ+)3#TiQQ1kEyGq~($4E|ss2 z8*h$g1%lNG{0Pz2v(G*!;`;53z8nAG3miU-#y_&ay)LsG0D}O`L>M3n3>`LXn56-n zgQ;jgW{5sHHb;r@si&SYVqr~K4kIw45AJ3UMUH?Fq){Jc%L=;&F{}7^u0QtJW3Avq z9vf#UxirNZeBha9p6OoZ8525Bp9|)HYe5xzfO$Ryv>QG8N~49jqbMLk@TrkQ&sL&w z*klku4VpkR6NwI;%hHuD-?eR>?`BVJyx|JdK>?pz50Fr9$w!J{D4W%A=(Tk<79mcZ z`kA}$zWXdtU=vjU%*h6#Sj;L>DCU*|16x8ct^5X}(;kx~a%6uG(I&|^zVF9^IiY2| z;-~13h#h93aS#x}zuUB+d5{Pm4dMo3s#usztOj6_pX-QLi7=`DGzA#J!Z|4*1pamp16! zxx^Z`;)8io?@y_qeD?V?ncZ*YLz`Jr&Y-dTHYg2-iJH{G{TT3RVVetPjJv(U07Fm& zA@Hp*AZSMLV?P$;+w{ZuumJSOE&_Jklegk;F{h+X)P0GP2?{Zh2m`;%rlrh}021c2 z$&MWlXd)UJ@^gNVD+}dT#(}>M8{3Ins4tWEbI>mbn+!sP4j4jD}If$>cck2VAI5C$}dN)|yAgeLIf940Wn1!iM`S*6TKB+I=i2oMK^A&9{& z6LG@~G%CoV-85ERWkrWf0i`XN!j23I|M=_>2ha}fav;dzx6FmlST@cFXuq2^wjG3E0eVXN-)ThxPTm(KIZM0`Qn57BUhBeNH&Ex@8a;Uo!7*T;js4
?|L-t(Q`ob4>~#;+0#lJ*dg@nrHiL-`FcP8`rBj$}>6as@w0 zD?Z$PTjOvZELpNt_WM$MlJ+!Bc=lJ`$6=njm3C9~>$fs;&niy?#plGs?o1%fm?zB6 zaf%#aU>pn@DJKX(dtd@Yg}?+>5ah=q1Yxw*s#R;#1VC_y)MNVieuo`*uvdH@!o^k< z3Iv&vH&%q)7Qc@VMngaT_#-iDp~hZg!a*>GCWqL9m;eD_-V`k;te|jQ8@9+$)$-M} zR&Jkt_KAA)ASdM>;DA7zI5fljbZ*;Tu0?KzE3T<_FTC^5MjN}HdFE-`c|Lyp%@*a} ze9O(!p6ND72E*o32*6|8rhPu$0ujo7r=51H805`E08C+d4qrorhycLE0N&$wXb(R} zz=Fn5lzFe!FwzLgy$R@5Dq{Pg!P~e?s}&X!m1QO z9+nHnu$2Wy=H>at?TU&uvIcWCw_4jN!d$}msTz?oF%}k4@NFlLINAEaB@yxROo;&6 zLqMQW2==f5KV)i7K{}^RcUP3R+PP&*-H9Vlk-Z)teeHLy6F~IaYAZMH+HtP8LVSu6 zS6ul^^}^stZ<3DZ@N@46rikjv(4qS%+-|rjmdUVoNYFqM9}gD7D;f&WMshHiNSztR z^5`F4DTMrgfI2Y(1wC*tY(ZhKFhL$dfOSF>G3#tbW8U~@%sU_mYA%Lj);v!=V{vDg zYbsTkSu7O0FxlLe8S#?KBj^C8f^3#cVX5bG($%;M1p<@qoK)}Q0E1i!N|W#Lz#TIaW+URljjH;isZpy{0U|a^M@oC zwJmaelwbaT0P91Pj=x2lskKs2Kud8$SRlra#^8gQ4~)W3GavF|EC88`qX-*(I~KXWVf zJz~a6%++JBcHLz%kly?6yU+XxPt`^XpLpU)CEWvUa%k~wA_zGrDGY=GOpeM4yDfs$ zL4aTakyH|WCPVoS4dEeD+}rx!1m>27j8G_GCj@f{yZe|U4B=)b9?8e%_BnIDwxvYq zL?FdnG4+^n=15vbX%bV4)+6-1;uhjTQ5@vRScL#+)>M3va4pNy`7NYnOTX3tMdW0i z%gfJm3+I1V?@Iu6-zT_tGV-C|*kg}#$NcOVyO)&P0RJGPMV6Dxb)&n-53P`0r-ofjy_63g1^Jun%6%}bj(#_Oww5AJmr*A ztg>{~Ril-+4zS&BS1Dp+*8&|}XBWB+t<{z})Ovc`S6Vu9_8!DKSXIgyhO;Ew|Mk`^otwIzSAD379} z-WjxrRD?k1DQP#`9x+9|d-Zl5JNYMXBN#B5!LaDddMrfbFGU=ssFJ~R4gQ5mVQwfo z&@O-bg{3QC0;X#Lj0{I$E)(UzO&~xU18%P%^7LEjy7n&DeY|+K@ry4Z$ZyAwcOw-L1aN-%fd|wRF*yFfUL={~G_02BzT zk%>l3E$G}Y-7hEU@^TVxbzY5|DJO4C)t8vm_oqy$H!BeB#v5<2vR#-U45jc)z_Z)H z-IQOR=u;38mj_?Hp+PNNxImpQx3pxQn1YWeRomop;Yn(I=82>4y#2O4Mu5km6PPdt zKzo={4r7?kc~NNC#K!qxg6*2%?XvwcbBkyImIh+Nl)x}FjUr887*R0e33>VY0KJH`sZqnwz${zg3OC7Pg`uA3rKcF@si04A3EN601lvmQKBj_8Y9 zBOZP95lMBa)pj2gqhJI;GRZsfi%20H;jb#fRFZg}0mynGL_rcsX_y#Hg;A{f?Tu8g`_ZH z>j!x%g=`o!bLJP4;0mknLRd^GQi_it0_CP42tZoHy6Tx{on;X&%S+)-a|TXn63r)- zKtef3TST6e7$I()aRGcr06CZgY1xKq3ED;K!SyheesMiSxnX4p0imeSw=Z{d|FFQn zv0%J_{s42L4`>qy){I<#Ly$}~lljb31gXK%K{F9!i`K0y0;W4ULo?%G;;iSf0s-M! zP=|m_&lk#T+_PdTyCrB7$?j;0c30CP@?iYjFliP&!V7+{_t0vnXey7SOV9_!9C5PemO@*@TQ*QAw97IOm=@ktPX z&vC}#pAazCYuRuWqFJu-hkZ1_RL-#rVMBnMut(+y)~60=00ToHhL1#Jd8k$3C;eb~ zEW(#B#J4hTOf?!unuburEUXppaYKC1Jo!z?0ywe(EzL|})`e7QY020cX+D8b3JaiD zyhF8oB)1ZvSxl03&G>T$u~f-M8P)cT1KovFgcp-+gcQl(2iB?^i5e=G&75 zvKI}`w%^p;n3=E;G1b< zeSU~BG7fGj4BSFK&`?|k;Pwd?C}1GthjB0&%?<|w%y%5LiC`k&LBM_t5G;H<^V?7) z_8holx=QY|vbN48(@B@3&Z`uyCN!AoGiTL5hn5Xk@q7sr0TG!TTO2?5@B{OSoM*`m zZDuP7CU{FCHVux2W(GHT@;zq4i86WE1q>jHjP6N>}0a{6hf86&P%$j>&*eTVL=&%Ry^aaqx^Qko>5zc~tX z_**dqItT(9$afG9#-f4zjGzgz16|<0wHbysm8+Z7P^y^KeDU7U%##GuMNUn2#TZ=05FNc zgZDNwO3FfQ7>1zLz8hah#BE1~F56c*$Ld8k6HA`E zF3=7|2JQq8W|D20q!YLg=77(`%+g;VZk))R_lych1Nc1x2*cR&6Y9m7baHRziUlP1 zMBuqopsch^ma3Blcm$oS{A?_Ez z#rDrmor-M^tTy3tNPBqfK_4*=2J!%EEEWvII`P-3SX77cCJ>EeB71)uf<*tFwoCiF z$Vq2>(w?jK$T|6&Z(C@B_$P;10I1|Y?=o4}<_u{pW{34eBooc%&rW0FY@X@|K|xa>QeY_HRs*gxXbe~ogo$W7m~?zC z*P*4KefGJz0E7X0@Y?|ccJjZ^0!%GywBbS3fhm~!R?;BG1F#qf2g1tuS-Cset_tasks({ "StartUpBegin" }) + // 前两项认为用户已手动启动至首页 + m_start_up_task_ptr->set_tasks({ "Home", "StartWithSanity", "StartUpBegin" }) .set_times_limit("BlackReturn", 0) .set_task_delay(Config.get_options().task_delay * 2) .set_retry_times(30); From af351a644d8fb0a339b0b6ce33bf9a3e4b5c3b6d Mon Sep 17 00:00:00 2001 From: status102 Date: Sat, 7 Oct 2023 16:56:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BA=8C=E6=AC=A1=E6=A3=80=E6=B5=8B=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BF=9D=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 24 ++++++++++++++++++++++ src/MaaCore/Task/Interface/StartUpTask.cpp | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/resource/tasks.json b/resource/tasks.json index c316438a75..93b7b97caf 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -3308,6 +3308,30 @@ "StartUpConnectingFlag@LoadingIcon" ] }, + "StartAtHome": { + "baseTask": "Home", + "action": "DoNothing", + "template": [ + "Terminal.png", + "TerminalDark.png", + "TerminalSami.png" + ], + "next": [ + "StartAtHome2", + "StartUpBegin" + ], + "postDelay_Doc": "等待以防万一(StartUp还有双倍的任务延迟等待,默认0.5s x2", + "postDelay": 2000 + }, + "StartAtHome2": { + "baseTask": "Home", + "action": "Stop", + "template": [ + "Terminal.png", + "TerminalDark.png", + "TerminalSami.png" + ] + }, "StartWithSanity": { "roi": [ 700, diff --git a/src/MaaCore/Task/Interface/StartUpTask.cpp b/src/MaaCore/Task/Interface/StartUpTask.cpp index f689978093..6fd40485ea 100644 --- a/src/MaaCore/Task/Interface/StartUpTask.cpp +++ b/src/MaaCore/Task/Interface/StartUpTask.cpp @@ -17,7 +17,7 @@ asst::StartUpTask::StartUpTask(const AsstCallback& callback, Assistant* inst) LogTraceFunction; // 前两项认为用户已手动启动至首页 - m_start_up_task_ptr->set_tasks({ "Home", "StartWithSanity", "StartUpBegin" }) + m_start_up_task_ptr->set_tasks({ "StartAtHome", "StartWithSanity", "StartUpBegin" }) .set_times_limit("BlackReturn", 0) .set_task_delay(Config.get_options().task_delay * 2) .set_retry_times(30); From fb36389eb5a341750637ce755443b720593e628d Mon Sep 17 00:00:00 2001 From: status102 Date: Sat, 7 Oct 2023 19:56:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96task?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/resource/tasks.json b/resource/tasks.json index 93b7b97caf..48a6f00d11 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -3317,21 +3317,12 @@ "TerminalSami.png" ], "next": [ - "StartAtHome2", + "Home", "StartUpBegin" ], "postDelay_Doc": "等待以防万一(StartUp还有双倍的任务延迟等待,默认0.5s x2", "postDelay": 2000 }, - "StartAtHome2": { - "baseTask": "Home", - "action": "Stop", - "template": [ - "Terminal.png", - "TerminalDark.png", - "TerminalSami.png" - ] - }, "StartWithSanity": { "roi": [ 700, From 16dab34b4af9410dcd102a59449e00c97d1e46aa Mon Sep 17 00:00:00 2001 From: status102 Date: Sat, 7 Oct 2023 19:58:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?perf:=20=E5=87=8F=E5=B0=8F=E5=BB=B6?= =?UTF-8?q?=E8=BF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/tasks.json b/resource/tasks.json index 48a6f00d11..ab27beb8e7 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -3321,7 +3321,7 @@ "StartUpBegin" ], "postDelay_Doc": "等待以防万一(StartUp还有双倍的任务延迟等待,默认0.5s x2", - "postDelay": 2000 + "postDelay": 1000 }, "StartWithSanity": { "roi": [