From 77f0ded95f1c5cc8e858324b1c6fc63b4fd788fb Mon Sep 17 00:00:00 2001 From: YoursFunny Date: Sun, 5 Nov 2023 23:19:51 +0800 Subject: [PATCH] feat(cafe): handle unexpected popups --- assets/jp/cafe/INVENTORY.BUTTON.png | Bin 0 -> 5539 bytes assets/jp/cafe/INVENTORY.png | Bin 0 -> 7784 bytes assets/jp/cafe/MOMOTALK_CLOSE.png | Bin 0 -> 5339 bytes tasks/cafe/assets/assets_cafe.py | 20 ++++++++++++++++++++ tasks/cafe/cafe.py | 9 ++++++++- 5 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 assets/jp/cafe/INVENTORY.BUTTON.png create mode 100644 assets/jp/cafe/INVENTORY.png create mode 100644 assets/jp/cafe/MOMOTALK_CLOSE.png diff --git a/assets/jp/cafe/INVENTORY.BUTTON.png b/assets/jp/cafe/INVENTORY.BUTTON.png new file mode 100644 index 0000000000000000000000000000000000000000..adf637299778749858645ca4327fe0690dea531b GIT binary patch literal 5539 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 N%UV}K#v1>f{{|#Jr+xqc literal 0 HcmV?d00001 diff --git a/assets/jp/cafe/INVENTORY.png b/assets/jp/cafe/INVENTORY.png new file mode 100644 index 0000000000000000000000000000000000000000..88a2d8b054ce48d3473e9bb4e13319445948cf07 GIT binary patch literal 7784 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 ZBWfPCxbg7Cduv?Hj-4_oICAE~e*wTki2DEl literal 0 HcmV?d00001 diff --git a/assets/jp/cafe/MOMOTALK_CLOSE.png b/assets/jp/cafe/MOMOTALK_CLOSE.png new file mode 100644 index 0000000000000000000000000000000000000000..6a220ac641329fa32f7e4177fd84da467d832447 GIT binary patch literal 5339 zcmeHJdsGuw8Xwe3>x*vnY!zBbhdowyO(qXQU?74JiddrvvEl<|$V|eNB$H+a3CPQy zuBD|w?V_x}`l@KFAa=DVQ3;A&6;w26-RcroEkx;!=2- zSk9O0!-*tve!78(O<$x?rY9={aX4fyC)kJr1zLi^I7Y2TN25k5?9_{bHM@<#94CZH zmcsK`gPb^dG$))g5S&1sfUD&51sq8r4-3HkBx2DVj*u@DA$$=c6mj_hsMsGBNjO6T z2IdU73XPGyHDnCDN#P`h(W3~GnwrW>74ay88W98r1|obRA{24~f=j3A7|h7k(LTc( zWCX1=ka~usbR1SAmPn;AQW&`Eib1O%QLCeecmj+eMof}8}5r&4KO){UV9gbZT{Da_^qS0Lc>#R{Pa6^Kwj|384F;PYKjIfav|v}Z!a zsGr~|D9A({W3cCfaV4sv3|b7(NNO=Pf#`K=m@{%YXgH;z48Sn(PUQ4LE=QwuG=u4s zM3hVlgAjNmiKB^$0Yrc(QOw1~0x?^`Q>`p`$d5o-~`4Ng%lRR9Oq^nn<|6UP-=0ftY7znX`X8z4g3*+UNyQArJT)Ns zxut*r=MlCux#B?nJ4C1KM_p_f4q79-9BInnWu&bWI?&4vplMH9Uk5|bl=V@vc?x6M z{g%!`#j+Xh4{T*eGu3lyKh+$F*yw*?J+I=A@COTuuW2pgJu9m&n;Sz;RDX6TzxDKH zUdtC=7ys<3jk>nsmA}h3#TSi9T*%n0xASJGu9}j4cU*YAFT?Ozjru~Mr0Lj}a}t}i z<~Pp2n9=F~XTX72woinh1g&G>Y-8K{jk&pIhfhlT(cs3r%j_celEW7Y2JW7bR!mNq z{!$$TahIAMORTkGxMYo^wrpLeZqZlt+gXo78v@}Nd%eez8+|j!K}lb#(gO28=_$zW z*KO&qx2<%XDma#%DtoaGich-;J|PZN-^u^(@q5;wt+UK2w&dm$@hv^qmo}YisXqyA zD1s(I7vJg5>+L~4_iNdlnqOYO4*o`6eW-uqF}1oOu(d4aGPNzQyLkK{28~|~J~omn zr+Lr0tj=ogw8bk)LsNF4x$Syk>z;?bzb)F`cO|H+BSKQ^COdV;6=`|D;c;Ti^8H(- zaqvz*GGnF8?_g&|&F?bRu>6zWqrEHDjs3;u2Vrg-K6pI=%BeOTuUt8I)!nicH6KYj zJsUstUUR#_HW<`>D(>UlBA?a^rS$QhQVlegjSs57c{1!EI<~N|_3ZI|r<+f74V*Go z#g;s}Pj{VYbzqrLcqs6A`jpm_VS|6uET}2kT{KJjFez(owoLXhle9BEBe=XQrl9Da z#MZFxRrh!#^xhHo=}>}kmC4fAx263Iez^EBmB07*lE*9VTQ6<1qzx`Sw`N9kCRC{c zxb0utJ?~p$GT-fZ=#58Y^>|&eS~oS7lkLs4z4lvHkX|lFF<%3w7si z1igkezM2pZ1feS{X#rhwZJGAETurDSM6|)l{+TM(!7Dwza)h zx_U;7Jv!^=mu^Kb@F$G}?7p$lM}B`_HI)yTjM+&i`ak}6aooTz`d~Y!%ckCSLv8V`6+bL=OzTLNbXCuMb27V!DOcg>;7SC{>H1er_Q6WXI<-^%40Vh zf2a=5+2I3$@D#CEeQmk3<;`i@S^HOacHXmYteP8Ozopn^^{6e{hwPl6^Tw@LlAxT; zd({`#dY~bt1?5d!vV3keNrI{tMz%1Hsi5db$0!4%42&``%D^ZCqYR8P@M~n?pB)1e Y`^++*(ru-GV&jX7SR~sYmhk?60Pd bool: + if self.appear_then_click(INVENTORY): + return True + if self.appear_then_click(MOMOTALK_CLOSE): + return True + return False + def _handle_cafe(self, status): match status: case CafeStatus.STUDENT_LIST: @@ -206,7 +213,7 @@ class Cafe(UI): self.device.screenshot() - if self.ui_additional(): + if self.ui_additional() or self._cafe_additional(): continue if not loading_timer.reached():