From 8d2a3bb0ec9729bba75c4931c4c908b42091bbd2 Mon Sep 17 00:00:00 2001 From: Konano Date: Fri, 16 Sep 2022 12:24:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=20new=20game=20data=20"=E5=A5=BD?= =?UTF-8?q?=E4=B9=85=E4=B8=8D=E8=A7=81"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arknights_mower/data/agent.json | 1 + .../fonts/SourceHanSansSC-Bold.otf | Bin 323540 -> 324192 bytes 2 files changed, 1 insertion(+) diff --git a/arknights_mower/data/agent.json b/arknights_mower/data/agent.json index 6534778db..82a46dd2e 100644 --- a/arknights_mower/data/agent.json +++ b/arknights_mower/data/agent.json @@ -51,6 +51,7 @@ "刻刀", "宴", "芳汀", + "罗小黑", "砾", "孑", "暗索", diff --git a/arknights_mower/fonts/SourceHanSansSC-Bold.otf b/arknights_mower/fonts/SourceHanSansSC-Bold.otf index b7aef5ac08b7a592ba9c3a9a0cfdbf4a51dce29b..16ecccf9ffa13fcb96d8f9ca489d5b8d8bd2a546 100644 GIT binary patch delta 2772 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 delta 2170 zcmW+%cU05q5}oAqYYU zAcB#AitS)o^|6BP&$5<-imRwR)RmQoQYtgTY5dbi}8Cdhbe0>9!XU~}Q1lT(@066(ASm+C5Q3kBT&X|u_>F?pWULiUQ zfJQw8ZrjC=Tz2@W7Qj{sVB?r296eyQlk*;<{uBTmv5PN`L~)kZ&A!^$?gD6J0?Cty zt&h!mv6LGiA&_O`|UvUCv)nk--5dbsvQk}P*rTT2!tinOU(#iHjHDzFP9S#x@ z`6sTOd&WKG9&&$h9QP~Nz+L3dai=*wcY-_4m2<^hA(zc%atFEnTrii+iMg2CxwWpf z*0mP3JVU>s&(L9bVK{53F>E)48oUi-4Q4f5O-7By$-5^lPMYgq=^yK>^isV*zg6#| zU$0-IpRfN(?{-3eV%UknC#bwSu{y4LcXd?tgsRdi$?>-1e;f~~%&p9-jH&dgbUapj zY}7G_itY-p3PFW+MPS9&3jd1L6%OTh%H`$p<%06ivMIW+x>vgUx+dLOU7RjPw@UZ3 z&ZD%p^i64HskT&F>ZU!Vt(T(Z2xqqwX1ZLyqRTw1)Lc=pjJ zN7o+pFUl%fUF2T)vhYr!O`++L=LIeWCIw70U(=+ypgE>dYqo2aYFste8ngU|0Qouj z!TGE57vy{APsksy{;a;QKCjMHr>P}sKlMztN#5tY7kQYQnj4u*a{P0a=X9vLa}MX& zXWKPbyZa;SLLd9sy3-MW`E3X&AynuHhWQ4u(D5aNhwjrDz_-7Dm|5UN~XA? zC|B%M1S)I}bsoBrdH0a~kmVus%=ek1%%DvFjNXivjN2Ld1L*+iZ_-EYpPA0v-;`FJ z8kuI9nw`>{(v_k}*_wQD->l@$ zmd%rmmDNeF%F1NfvJ9C-79-=!Hp={E3#Bim4bn1ciL_9fDovE`kqV_gQU|GRe1Cjv z{O$O2@zL>tdoS<3Ah|3_lkAoFOS~oHC2o6qW{IF z?uxn>-6oH$6J?8HMIoZiq5u(%+!*mZ;$V2FFkh$^h6uL{=Ljc<#fFUv`$6zUP%J3i zxk?}vhy=?8(*<@r9__reW6_Scq02&Nhm>xw33(bK3~>tX489%Qw9R*$7r%iY$KMrH z6m%po#kA4Ph4gO`oUt3MSw+!%5o&XE_!6Q6+y8|I5Av4{Uyx02D9G7oGzGu7JNp- z!ppEI6qYDqsS7Oq4l9mfOWsYhAXh~Ic&ZGfqQ|U0l`NgR1AW42-ASD8zS-` z`YOaGL0m3K6F_bYNnwy;0cjdIupcs8LD3J{OCTo*a<4(YGiYu?k-P_rheD|nR6d1j z4r*7x>638Q7S7qh`N_~Q46d}p^#yP}1sYqSxf1S7f%^&YFbi5f!?Ta@d;z@FL)#H( zy9cik+MS?%B^XcQ+qLk17JSgb$D`1*0QxiG>r$hqNKKKKie_@O`i8dG(EhF*hXkO* z798%4BiqqciEfcNJ_08m#Hr;t?Gn!Z6MYur!o%oy7?+&G6`OFC4g;jP?kxV|i<=(d z);J8R!0l2D3B|Bx3@^ioTNrg8#p_X0gYhLO3&NyQO#X=by6}JoGs-YK3RU5#cE+NG zDA)F3SsorYNBuN3#NZhbo-fA+54>^=udl<#>3Gu*Z$%;(gZCcbgA#n)j!zQt$$5Ng zj;&+y`7CU!!q+NnAB7!L@UKAZeutksvG*73Ys7EngghgrW|Ttt>lCMyGoKaZ^UCY$XDe=pg# zjO>_5!Y>g~8xe0I5C{CSN2JHIzM}rkAP3 zd}^bhwriZ6F=5pzZ;55}!_$(CHC$?f~jLgD$S7E4^vJ z7rLR5ZhcIHd+E+PDx6A%g*19J6?aidB9+Ecd9r|}4xwqc=>7^uo*Yt`#y&6exw9v+W+I)uI zj-+{ZmF?DQE|uzWs}KmeEg6^z#kc?@qtTe`3br&<^vw_*iTSg|uJ`;}Ey@>tDD rb|$^9#q;X)WXte0%WyP;7(weT! Date: Fri, 16 Sep 2022 12:24:57 +0800 Subject: [PATCH 2/3] fix: raise error when zone_id not in zoneToRetro --- data_update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_update.py b/data_update.py index 9186ec00c..662ce0d80 100644 --- a/data_update.py +++ b/data_update.py @@ -112,7 +112,7 @@ def requests_get(path): } zoneToRetro = retro_table['zoneToRetro'] for x in retro_table['stageList'].values(): - if x['hardStagedId'] is None and x['canBattleReplay'] and x['zoneId'].endswith('1'): + if x['hardStagedId'] is None and x['canBattleReplay'] and x['zoneId'].endswith('1') and x['zoneId'] in zoneToRetro.keys(): level[x['code']] = { 'zone_id': zoneToRetro[x['zoneId']], 'ap_cost': x['apCost'], From 12372611aa511f83ef5317953e987731c3a3aad3 Mon Sep 17 00:00:00 2001 From: Konano Date: Fri, 16 Sep 2022 12:25:13 +0800 Subject: [PATCH 3/3] release: v2.1.8 --- arknights_mower/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arknights_mower/__init__.py b/arknights_mower/__init__.py index 5702f6d2e..8b1ea5ff6 100644 --- a/arknights_mower/__init__.py +++ b/arknights_mower/__init__.py @@ -15,4 +15,4 @@ __cli__ = not (__pyinstall__ and not sys.argv[1:]) __system__ = platform.system().lower() -__version__ = '2.1.7' +__version__ = '2.1.8'