From 3ed07d0ba13bbe1a90fea461676dee0fe8fc64e4 Mon Sep 17 00:00:00 2001 From: sui-feng-cb Date: Thu, 20 Feb 2025 22:45:40 +0800 Subject: [PATCH] Add: 15-1 daemon Add: plane statistics method Upd: config MoveDownTime for 15-1 daemon and battle time in plane statistics Opt: StopCondition RunCount for daemon 15-1 Opt: save screenshot in quit menu Fix: use uiautomator2 long_click and pause retry --- alas.py | 4 + assets/cn/combat/BATTLE_TIME.png | Bin 0 -> 5578 bytes assets/cn/combat/MOVE_LEFT.png | Bin 0 -> 4411 bytes config/template.json | 12 ++ dev_tools/plane_statistics.py | 143 ++++++++++++++++++++++++ module/combat/assets.py | 2 + module/config/argument/args.json | 32 ++++++ module/config/argument/argument.yaml | 6 + module/config/argument/menu.json | 1 + module/config/argument/task.yaml | 2 + module/config/config_generated.py | 7 ++ module/config/i18n/en-US.json | 30 +++++ module/config/i18n/ja-JP.json | 30 +++++ module/config/i18n/zh-CN.json | 30 +++++ module/config/i18n/zh-TW.json | 30 +++++ module/daemon/daemon_15_1.py | 157 +++++++++++++++++++++++++++ module/submodule/utils.py | 1 + 17 files changed, 487 insertions(+) create mode 100644 assets/cn/combat/BATTLE_TIME.png create mode 100644 assets/cn/combat/MOVE_LEFT.png create mode 100644 dev_tools/plane_statistics.py create mode 100644 module/daemon/daemon_15_1.py diff --git a/alas.py b/alas.py index bbc34638a..9df02d3b0 100644 --- a/alas.py +++ b/alas.py @@ -418,6 +418,10 @@ class AzurLaneAutoScript: GemsFarming(config=self.config, device=self.device).run( name=self.config.Campaign_Name, folder=self.config.Campaign_Event, mode=self.config.Campaign_Mode) + def daemon_15_1(self): + from module.daemon.daemon_15_1 import AzurLaneDaemon + AzurLaneDaemon(config=self.config, device=self.device, task="Daemon_15_1").run() + def daemon(self): from module.daemon.daemon import AzurLaneDaemon AzurLaneDaemon(config=self.config, device=self.device, task="Daemon").run() diff --git a/assets/cn/combat/BATTLE_TIME.png b/assets/cn/combat/BATTLE_TIME.png new file mode 100644 index 0000000000000000000000000000000000000000..e3fd5d6ef9b16d020ec8d71d0deede67312570a0 GIT binary patch literal 5578 zcmeHJc~nzZ8h_ZTg9@}AYZb7>Kn29?AS4=)P1Yy}Py(X(NFMNn4@8*8LZ~J}U{qlBu ztaj3xr8^6PAT1YX2Tur^4z|-O|27RgRvNf!fQP2U*%ybP*?%WK8c=fTdob2wGvIkiddaL`Dikf>AM-+;^pzOhScRvX2Fi&Xd?9A*ged z6!D5$?JbB36|jY58*9=E1qT=qAu^bx5QT|xj)F^8+vR{gaZDqV)DT%HmuyQoB=LD3 zBzsJXkl0iPML?%BNS16WY$Y_ev|ueIG3iVejn1MmSrobz$6^_WWl0)eWZ+IJ4B~h? ztQvO)esRemGMR)!qsirRs+>i|q`@=>o6V-tnKUMo0uU5DQY?cN6ftf%VZi~x1yWQZ zLoqRlum}fY;W926ggTakNHS?wjF0mK7^5j*35`Le6FI4YLct_X5-tr>I~NLQNEjkQ z#4;RU8IxE^2qweu5bRG(Pm14j0J!DxCVhM`7LjPu1uk=p0BMX9@V$PoltFobZBCB=dzfGL5N=4=WaXvLr~0+$7v3oV&UI*d%{J79uvqF*NT zh5x1g8Yv1cEFAXN?GW|l05c#6n79;NGJ{M~AM%M-2@4-Pv}Dr3qA`f?ak=kD3N#AF)FgZA$!s%3weViRyM8j0=XPzFCH$2uYgvs?;>cKu6Q3Iyp$ zTpVn@6{$Tl#*;4Rv(Y}pZeb~eJ5J?;HMC@?dR^{1k1tbSpkn;<=Au& z&V3sdBPcc|0zBf;(5DHWx1Ia_+cxqZxECglL`C&n#IjWirPJXdvm{YwvvYi}Uz8jl zjqtQa>e?QkGfRu^SgKPtkW{{*wEMDWhHHFm{!n8@Ms3A2$!FU%pl!R4BO`wEa@U$F z51UtHg@2Rr&blYg$R$fUv`RPoWQuNf{884RU!qvq(tvlDWGETSV^R8?YXeDJ+vTRZ zhJwZSSV_?ox8nH~&HCY&R(=BFtn|P0i{6!->ow=!zLAI`MmqVwHC0(9>@etIzj}Rl zVTb%?Ntd8Q?#4*)iA8uX6rU4uxXf?*sd4>1rxv%qemKvhsvy}2Z{O)t$}}iWSQDE* zXBlR5w9q`D{=x}sR{ZgqzQ2Vh#;(tsxBp>q`cq>`o#r(Nx@Kgayf(i$@rRBx`!5## zU{um(C(chF*<5h&B;@a|)iSFYjWE>HIeCBmrJQ$(qizL;IeBwSE)37mW@~^ql4IYW zIQ;5>vfy*^-g^G7j_SK1D;FB&y)0HXJNLWC%f8NR9QyI}LY*ZUb)^r2ZY+l&y5@lK z&V&1(tDZbM>z8Zn(lv0>J|EPi)3{2pMS=XP=Yt>Jc`j(6+P(N(OkMBh((`_86kV4X zVYzK-Gi&rSZ5rX$%A|LzM?x3tMrM;%+AbHSe9`O_)4`wn7Uz|xt%;vgm7ntH0F=s< zHMED>L#aT>%+J1-YX@U85ret zIzPR&+r2`mdK-B!<=fTZ{SMMj9CAa`b5H7svx+%Ok9)8K z-ZMH*8#&Iql>6{BWI&rnhakxz_ssAd*ClDu`EmH*fs(fNf3WTh$>aAe>}Y%k$`vt=g0^O!M(^#Il*T(rlU4fq{w)w=K+&uFNF(xWE%8~VQd#;loYOFzV}|8x@sZTh0V4Beo+>d>vQjRub!{Bzr{2gL7-Q7y?U zFZ8S7=v*$I(-`0uCmLR0vv9$MBlioHiOrpD4Cg%m;a0`y#!``?M9H2>bm@1!g8{Y%21UH#>16&Y{$ym~BfiD`9ccA4Oo`E>*q@iYQl4EjP$28W?*1=4@p^nQ@=+ja_oi-2K8sQf}dB7J%p8WW4+( zb`2OgR;Bj?BKyr6n?|d+UBAj}22J|H-Qq{UgyJ@ITZNq_2%EX?UB`xWY3;_=_JO59 zXKGC`FvY+W15*r4F)+oz6a!NX{GTxJHu;^wv6dA@dL~{l5t57JYKL6AP22wk`gO59 literal 0 HcmV?d00001 diff --git a/assets/cn/combat/MOVE_LEFT.png b/assets/cn/combat/MOVE_LEFT.png new file mode 100644 index 0000000000000000000000000000000000000000..3f37d0a81df9b23990d7bb1f3ac896006c519c7d GIT binary patch literal 4411 zcmeHKPly{;7@rm^c9+$Iq9W)%rw1)MnSYs0GBkGAoz?NzV^zc-moyRvn$hkD6_WZrw< z?|pxM@B6+<&MYlHIW=+Lgdhl0^_sOT2!~*L@ZxO;;W0aX;s87j2eq|G5GL>Bp98|# zbN33utpaVf;#T7+(`H@)JFHC#i5CD`5RM&B0&K677_~{4`c?7Lg|9?JovOHMG?Yd# zPkOYr6_S;$#iqTrZdV-f_+#i;VuAvX#26)>>qll%6;r(?%=xw~q7)LZSH(GQ5Vaah zXr6@xRSK$PD~gIrl>#n1#gd^viZn&jWkr`YT~f-XF=Of_lnoKgg-*v@ww}n0!Ky0u z;y5s6c`z6h26};oU0JPEDzc)8ELRcWQR0}Df1E6h}*0mS4D7j z7=st&YW*nV2^f4b1tF;FyI?#@x~UFO7&mTCq?<53f?+VT0%>cOyGMEF6=n2)STLiY94FQ&UW} zVyeYQASo1O2yHNjb~g8d0@~OOg-mpCjQ0gQw%K8!hk-`w;VzK_zbm5ra?E+=vJeb| zcY5kYqhZ$lD8{}`>Q+^R5DJt!CMg*+wqX>dGS=Htv0StzT$-_^wu-e%$7qw1nxD6r z-RJo-I`90)^G}Bq3KqLJu7}^R32MLz%!{Hbsv=4^TRc_V{&2ITDKKP}e`oTwedJfg z&-fHb)kMTIWXR(RG#nsu#xQgv+h3vyaa$GzKBA!`S{ZDmXHwbPH8SvrS9Dq=W{pOW zXq#D&SRtpfnM+Yx7bdocQP?~si6ds)^oDP5sCLjJz}LT|>JS#OPCURNnd<_{`<8+X z&da&>HzPZ_2R9+dA=~mxs`_zx>mO_r%1{b!)DfocsO93x~HA zVRr7&d#B`kg1es^L{o3xwQ&Ny^x;Rr>Z_M)f1w5bJ{gZO17ilp42&5VGcaag%)m`$ zVD{bcf$zQP^RHa_#(p9E_3X|=@RQ{0E1!@rp5OWQBK-N?p8oiq&wqKN