From 5c93d0f9cefd6b871745300c739a2260d2247673 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 23 Jul 2021 15:51:21 +0800 Subject: [PATCH] Fix: Guild operation BOSS 1/1 detection - Add Auto call submarines in guild boss - [CN] Update guild combat assets --- assets/cn/guild/BATTLE_STATUS_CF.png | Bin 5767 -> 6161 bytes assets/cn/guild/EXP_INFO_CF.png | Bin 5573 -> 5955 bytes module/guild/assets.py | 4 ++-- module/guild/operations.py | 16 +++++++++++++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/assets/cn/guild/BATTLE_STATUS_CF.png b/assets/cn/guild/BATTLE_STATUS_CF.png index 208a8a3013d85c80497d048d37008172e594687d..9bc862f0c43aceccd1962255430402c70c73548e 100644 GIT binary patch literal 6161 zcmeHK`9D2o2;lT>vN`5#C1y zhXy5{8!%{~_CT6=0&tx1=!SvxOf~>$v>a7cb#xruz1%$=+&y?TR8@IB9=O{%y4(Z6 zcO*;C$2eh&MPXv=-U&mM;nlJfmk_`&fTL=oH_4-q2i6bi8I+pCAJG^xF`vvt8Z?Ct z(jc=QP3N4!+bchLbSKKd?8*wySmFCXKhpB@-j}_ah0KNh9(3;s%t;2}xcNLMa8);4 zPG*=VRvX#WUWE}B?+EX+Guu6vZ4f1-UxDR{n4&cCJ@PZ&i>(uYCDji`X zz#9i9`56|D!?3!b?Sg(A6KG=tZ}i^Xr2&ZmxS#`6_`ypASlZA~pa8?g31h5aIFGBC z3Pi&|+8K30xKcH+G6>N<4<~#CIXET$3*>}S7{;VRQXP(|r2wcHW9$hfD}YH;Io}0% zufT!oDaLLxUQMzb@qzluVoQ&3JQ4;7ok`s(HwP{<;gk9}e15J@PV-HFbSYD@W<5)9 zM?K4*nUW#Eh+H7k?4bpKW2e92@QNaKVSaXM-fqE#w9%Y*=)CIAufVr9aai*dP7dgA z^^!&`=jMjUJX&FIyz8BdO~HsEaG2OJzc@;rbBCtSZzl?UWnbx3cCJpF95)xu@#D)v zHo3LpGf@h^FHX5nMg{$X-X4znt%CdMN@*p8{IG-j)^4a$-I#?=auo@;tp$O@*6`qi zn6v%UQe|f6nV+l~KgR3uYqg?3=*C^+YfqYHSPYh2<4HcCPVhkhT!c2^R>iURoi2o+ z6&O5<&UgR?l!DeppK=_J1N8P%lISe}66$wil|*2mJEdR-fST`YW<`mtnk`fST+0bL z_eS{`Z37dIK$qFTT|;1nTT@*^-sn^$9Y=uA$qVj3K>@s2#VO7lDezPD0n^oJGo@YZXdAEOll><(>Jo_|Z*P-*hI=c0DB|IG(vsuZ z?6f6hd-~Pd>}jN$)nj80;Z_#gIb&(V zSZP~stBQI& z?37wcU&?^<_hX9-i(wl+w1@~qSS!-z47)SCKYJltCA(Of<_n5XDQRu`;$I{=)9h1E zq`DgzpZj$#fH|&%AxS35FexZ$;ibNTr-9-i`sH!`R|Y3uSr`VsxNh)HXQr6?Gs~;N zVs3-#;!CAHx<0zGI=#0o^Xn`RLU(NuZzIC5=R_d$^=&I#*rWMaS|snS8LJFEFeD?M zcTUx^F@3wUq=}-~<3x%1YwD?bzO=*H#o1-e-|vRewUkY+Uj3SRqld2t(c>>lCaNe} zHsn-dR}xfmdBks|Zp3E!!7|G-afIaUk)@P%K5J9PRc6bZy6RHZ?W*vqQSaU#3ZHC= z=tb(yj!nA7@qYD9*Nyy5)*qxHQa{gSaVe@xSauhQE4Hg$SljQ;sgC&m)rV6>Cp#Ug z;+h=t`!(`U&|v3I;Y!J^_PG0 z>gsAcKZYB|wJ*h79n5sjwyyhHGrAug{#-4y`9{>GsMh3>jv(}|qU);oY zGNhnVSoK^BpA@=1^Xp8S<5;O0c>ifLKchNhtmLcf=kYH2=D=5bS{E`n+szy0Ny;0m zTgKD(yJoTqGYUVhV;96MP!=W@d$p&u-(?DC4~e_BjW(H1)^_?^$tcL*+wEB-Q)p3u zKl6JQS@)uje?q=aAZREkE$G;O_MYr+=Rxdt{S^8q%i1jpD_8?;4ptk&5%P}AnT&@# zjr{pBX^LoyYDzI$1!fgmYJ>^Tg9LX1>rc)d+lyoN=hOR{JE*dl?{MylcL{5r8af#h z(MvT!ALRaGM{}{Og6h$vy2~Rxk0W~;>rNok*>jRFFZ{S&uIF{%YwP?FZq{VazBXnp zw)p7>*-@v82Pk`-lZ&p4?NSCFgMWz+@r~S8TT5Z^VicraemvVW+$8^a#uL8al72CB zHeEm2%eHiGEbjyB{9;dMwvU{NvfR87BR@GA zP0UQp%-2OYCYOtR5wAQ`sck1Bl7N^+&%1VTCPa2@%?j*zu8%UiglqQam+O}5(6MNW z6^ZzovYGngk+sM>pD#|>9sbx6I3CIpP>X$|gMagG81HMcHpySFR?Q+1rN`=XLBd?O z>aMTj>Of$pL+9J%1D$DOU4x%a=&_$Mx?uy)pR0<58c8J;C$@LGm2TYmV9RWsbk~67 zlrm^)7<`U3$r9&*D=OW7a~(fFZFI|WFklnyIx_O@MrFq`5lJi{y5Y7=>R;ceby6Pe zi&#aJaIQtqaay|G_~w=C=d>BqUEbZ%O(tzEy=>Z5fgAmqdnx~yUskYrr{O`#tIE2s z!XrcV<39fDbYa}gvfoIFOEvFBe2tuI)dDx&23A7HV>xU%tLo>2#_{St+RfRq{?Gl7 z{Zb4DdRDhfpH(nSWfqO?{ViG-ACoQhSL)-0{mxmzUTHd zjx}~qqy<-QQW248kpY={Z=7hpYmR(wE$REy{48z@ZuPp#-$5ja8C&mG=~$!eoUAkQ zYdf={2{VOv3$wFsDawCN8$)kt?x#7M-!`wcSMAMKWc6CnthC%}U;nlcYrb0JvBAG( zGb&VhvqZjBUOmX;U<&!#)SY;5t8>{%uGDKoizwSq`V_qDL>Tn^vi;?P`7?Aasbz_? z(oJ}r3olf)xsCd@%<4n4qB&;n7wh|azi#B<$FbcLKZ45-%kB|eC%3H#R=tfTCrEVE zk=cidzduDz4XAgi4+>lth>p$T;o(GZ)c(BNlQ32Iwve&6BgpVKn&|mzVd7wV?`E&@ z{_yJYov7aWQgre91JbMF*D|dFtvoe7X!*4l`z1Z2fh0VsYNEB4C+*C>(xJ|J|E_Io zVW0Mv!a~5|zS!2o^*y11XBVNrOf^vN@;gBk!lPBU6LBr;F}%$5X<@<@>k z+R*@#0E{*O*UkU{f#PyQXm(;^;oT1LJI4W_C-h~d(+V}}btED!|2(P_vscD9U3Zcj zKC=QqF1~T+V`JjaR7n%4HG;I~N=4aEUDRan*x|8Tcm_KPMhrEP5YJa^)SA16sL}lh z#nEny%{fc_T$vqg-0Q!MdkD3*Fj~=<$xtBV;=Hj(R$-J-STM*ZfU`Mt*-$|eoXt;T zj8)OnEeO)T)a{AMZQczOy^jcifypP-;$CCzf3x|&ycG1k1H}LsYu9>{(@k5EbmX`3 zMS`zyF7`+?g@1qdcWM94o$GV1mJl2;S}%(>=;*_Q^u8XcI}(&>p=mf<1#_cYI0XPk zr_RGRxElX1Wu?az67k|Q*UEZ;?^vAHe^Hj3)fJ(j1C+{YIPnt$iXA#H&F&+_H%y`2 z|G;hKd}O7c0d?;ycj2_lr_0VkMY+7{F1Zok&?+x4C@TX0ldt$`jTZY$UK%KkvqMl5 zMlN2C>xnd%6<(jRkH4?DofV&W4XPmqM9g#g9!QgdOEd6-pJcX0BcWann$1S7ViP6w zBoh<9k{n$BFhhN`Qm|U0nroo)Z#~DqnSZL}>XmyfHh))xMTGolU5*M|S~bsp4|_|a zedmr5Ig|jEm4iw9+u*+b6?~xBil0GD8k8$EiN{Nh`yH^$l0nK%{L)mm8p=~xa{eCXf-GdQ{t4K z8w&z}6sS~(MSr-T0};>a6<5fgKr*c0v_Jm3@Pb(85=t%ppBiDoU{(U^o}&c%`ij(c zq3sDG5UAHje*azn5cr3{KLq|E@DBk90Zi~F^ac6-n+(KGV}w1vSNR^nqM>%{TB(Xv G=>Gs^jk<;a literal 5767 zcmeHL?MoD45T9M|@+!>>Ev&Sb>=i2WF5hC)t<*HEj*vo%2v4>ky)rdl(r(d6decDY zS~C#}40PKc4za{zYu+TJ}fiyo7vgfncZjRd5#-4 zZwQ<+dkO#qrllrr1yCc)KGjS@VlQ`WLo)e5YGyvb)L?QkP*)#{pnpNyreyy?M$PJ? z<1TeX0?b^Lmb5mb`1NN;i>X%(k)B3D%qb2mdN+3iN3=9%39aKo9l~hTSK)(d~ zJJ2o~-$N{#XPu-bYSmjRw{l%+3^oT*`v6sXnUju#_ zWyKAd)v*(Assx1Q)&&ZZ67JEQS>yF!h(Ygc@1ubw<{&$kx&gn z`ae&-(3I)QA=A{I{5tu36fz*x1`34Ixr!!%PS|vtLHAm8Pl+obO#)2%_~+XLpIR{0M#VgiZ^sV|(vmkPU0=7m;x~A0#1sGk diff --git a/assets/cn/guild/EXP_INFO_CF.png b/assets/cn/guild/EXP_INFO_CF.png index d398a165d2fd8113ee1fd4de41dd49318e37b6c0..eae6bc8263a7576f45f7ac09d84f622d9847b48f 100644 GIT binary patch literal 5955 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 s%N=bQkG70QTgIa;