From 10e4f49d90545eb68ea47b0718d89030d3262dd9 Mon Sep 17 00:00:00 2001 From: Zebartin <16185081+Zebartin@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:37:16 +0800 Subject: [PATCH 1/3] Fix: OCR_LEVEL in BattlePass --- assets/share/battle_pass/OCR_LEVEL.png | Bin 9166 -> 13257 bytes module/config/config.py | 2 +- .../battle_pass/assets/assets_battle_pass.py | 8 ++++---- tasks/battle_pass/battle_pass.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/share/battle_pass/OCR_LEVEL.png b/assets/share/battle_pass/OCR_LEVEL.png index e48746e25b3dbd12175cbd57d2a080aa783c24b8..09e10dedcde1948ef352dd1d3ff4f802147171c3 100644 GIT binary patch literal 13257 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 J#A6q({T~Fmd$s@o literal 9166 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 qKM4Fm;12?S5cvN limit: deep_set(self.data, keys=f"{task}.Scheduler.NextRun", value=now) - limit_next_run(['BattlePass'], limit=now + timedelta(days=31, seconds=-1)) + limit_next_run(['BattlePass'], limit=now + timedelta(days=40, seconds=-1)) limit_next_run(self.args.keys(), limit=now + timedelta(hours=24, seconds=-1)) def override(self, **kwargs): diff --git a/tasks/battle_pass/assets/assets_battle_pass.py b/tasks/battle_pass/assets/assets_battle_pass.py index a7bae4c21..49a9daae9 100644 --- a/tasks/battle_pass/assets/assets_battle_pass.py +++ b/tasks/battle_pass/assets/assets_battle_pass.py @@ -77,10 +77,10 @@ OCR_LEVEL = ButtonWrapper( name='OCR_LEVEL', share=Button( file='./assets/share/battle_pass/OCR_LEVEL.png', - area=(183, 93, 240, 134), - search=(163, 73, 260, 154), - color=(90, 79, 60), - button=(183, 93, 240, 134), + area=(167, 103, 249, 143), + search=(147, 83, 269, 163), + color=(134, 119, 94), + button=(167, 103, 249, 143), ), ) OCR_REMAINING_TIME = ButtonWrapper( diff --git a/tasks/battle_pass/battle_pass.py b/tasks/battle_pass/battle_pass.py index fc5acb886..0bafbc421 100644 --- a/tasks/battle_pass/battle_pass.py +++ b/tasks/battle_pass/battle_pass.py @@ -73,7 +73,7 @@ class BattlePassQuestOcr(Ocr): class BattlePassUI(UI): - MAX_LEVEL = 50 + MAX_LEVEL = 70 def _battle_pass_wait_rewards_loaded(self, skip_first_screenshot=True): timeout = Timer(2, count=4).start() From 74cf112cbc4429044f0e28889d1da971246397df Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 17 Nov 2023 21:54:35 +0800 Subject: [PATCH 2/3] Fix: Entered _claim_rewards() but no rewards to claim --- tasks/battle_pass/battle_pass.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tasks/battle_pass/battle_pass.py b/tasks/battle_pass/battle_pass.py index 0bafbc421..2f5c53d51 100644 --- a/tasks/battle_pass/battle_pass.py +++ b/tasks/battle_pass/battle_pass.py @@ -180,6 +180,7 @@ class BattlePassUI(UI): def _claim_rewards(self, skip_first_screenshot=True): logger.hr('Claim rewards', level=1) self.battle_pass_goto(KEYWORD_BATTLE_PASS_TAB.Rewards) + timeout = Timer(5, count=15).start() while 1: if skip_first_screenshot: skip_first_screenshot = False @@ -192,9 +193,14 @@ class BattlePassUI(UI): if self.appear(CLOSE_CHOOSE_GIFT): logger.info('Got reward but have gift to choose') break + if timeout.reached(): + logger.warning('Claim reward timeout, no rewards to claim') + break if self.appear_then_click(REWARDS_CLAIM_ALL, interval=2): + timeout.reset() continue + logger.info('Close reward popup') skip_first_screenshot = True while 1: if skip_first_screenshot: From 5eba06cd0ee1102cb1352b97bd7e60eab63882c1 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 17 Nov 2023 22:20:02 +0800 Subject: [PATCH 3/3] Upd: Battle pass loaded checkers --- assets/share/battle_pass/MISSIONS_LOADED.png | Bin 5558 -> 5557 bytes assets/share/battle_pass/REWARDS_LOADED.png | Bin 7946 -> 7542 bytes .../battle_pass/assets/assets_battle_pass.py | 14 +++++++------- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/share/battle_pass/MISSIONS_LOADED.png b/assets/share/battle_pass/MISSIONS_LOADED.png index 827f1d5b57f79307756bf0991eabc746695da993..259de90d5d3c82172976077134b61ce6a040a795 100644 GIT binary patch delta 179 zcmdm{y;Xa|J}&h~o-U3d6}R5pJjmG)Y^U7ZXKeyfMW-v?+5>~TsU|?flaA06&U^wvns~S*= z$MwFsKO^s*oCRe6Y2r5k%G#axSPW8NT+_hFz_4j*(F@6&S)CoZtHqds7QAAVRk+E= e!0`V+GXw8dPPID+cT@uPGI+ZBxvXbIRF^OA1(jlmslYxO@(v9t3Fa0&qcY7V~1LQU^uub+9R*sGj%|E89ZJ6T-G@yGywpqr9Pnm diff --git a/assets/share/battle_pass/REWARDS_LOADED.png b/assets/share/battle_pass/REWARDS_LOADED.png index dbbf2f1e713f744bdbce62e48f96b5942dfeced4..172e51a1818ed9c384f0c94f8a72e929eaa95413 100644 GIT binary patch delta 2256 zcmXw4i9gf-AO95Mr|&l&g_T@C6j2B>MeV0kj;Y+oS~WR-!g5U;`)DO!{1B4aVve6y z782&WxpL$v+*Kkv!~3y1KpbKfvF znNyLH{52(03RaAJlYG)NYFpOQey%?%zdY6Ge4vv%HSIW9UR2^}Kw0lUIHgp7YW&@)N>h1@gLZe8 zyzB%KMf*Mph{N&!pbyjZc}wPjvZWS#3&g zP^~pNYhYjy;Ts+jVw{PB!C-*|T#twCaRps{eN{z8!UB)(w-I686KNZ|61q_bT59IT z06-MbhSu7CY{Ki#x4xXDtgNI|MG_IzlPQ?K;XW1VNLHhoVnPw7mgM83oopGh7J^?3 zfhj0BIXE~tIkC#h%**C;e*6fkmH+_pn+xjD>dBVRMe_spT6UQm?HTTAa1#?fN_oj0 zZV8rNn4Oi8!6vNCd}ca>0)aqA#k_xDfE_y9x5?S8KbLd_0MvkBSh!$xu)4ZBFE1~{ zX3_~>;xhL@QpLp}d|R}Z{_N>dt<+$RVEt74SG_ssV-l54UB_Uy`3*7%1bo&A0B}Tk zpIz47VA1w?YbqjOsKu)kfkD?q-1qmNZ%R0pr z?b=Cv$db^xhV8L{1jVX+_M`HzFNO=#oH3`stt#L*XxFe+pw##dcpXB0!C-*+1^o1M z$gMvOXzhBsZceg#6aoH2%5EHKga`8Z{MZ9p!vsNLPEL++-81NV#V#Ofu;uX0XD@D{ z&!5iB5*R7%b8gfrU^0>T?Wvk|Z%oxx7IACc9r7lLUndFE^Ejxe!nwz75*p=OTUm9` z&58$iETwFZwpWgSzZwzxi3;}{=0$D~Z3JVn*j7(N@QI_Xtu4_VBwAZrLz?7PlC`w7 zxQpwf(RB+4zCDEP(MYy5RxEt^(xoB*{c*~D!H>h^k2UaW1OZ1=OT-lcKsJhLf4{v&Q-U}i?M)FdqrCFx;m%$*O!UNE`a&u{mxITZh1!3G?QhII%h+lC~c zs3*6u{0CJ;Oz<-F{*p$94aC!wcd_v9`dY&;xqnjl3Art#euYO%MDK(#zh@e@J@&q? zuFl7JGrvRs1g6AXX`dYmg|e|JD`ypYu!FXSVq;^|*J_nwFU-u&BK*HPU@%C-pL5;W z+1cG)5To@rJG-WabkwM4jYJOs|IY6lO*kBGq20n5QIonMYIa5n`3-O1zAc^?x%v6| z$%;2LG$2V^&0mVpGz!JVpaRTBN|9Gts|-5nv|<8jbDEKVBtM1}`h7yAuay#;IInCW z`>0_|O)6~u>q>XL{vBdU|@0_ouaL!Ly6A^14oQ8#7ra+*#v6 zY&9vT;u}8=Ene5j?=8qaYov zp8SUsbjWT4{BT=a+m@JsNFe0C?<(dA2t;?{Sfe!df+GKw!L9S+ZKHR*%f&^ENpeL zStamWH%F~JfP@Q{71zkq*sy%A`kYFo+Mt>~U?(Ofmg1pMug(vC>FYB&b4En?GRv@| z_uT@3e*u$4xbc=`dj?9v;*IE21wIT6o0Oa~#Ob9EzPWYY*VorD!$xy|@GjE~o1-bQ zDcva-kx9$r800{2?^6_`lEZ-#YJ6zNdkqBCYKSP;4B9^-@*G9~y zyZvgHE0y$qC~ai5@Ok->t8QdwWkAjf8u3MgFZAlS-r2E+Ix-*+CO#ysF^M6nG1Eyg+jOboaPv&qqf#B?* zyu3UToS%X=pQQR2b4a312c0yTch$TV1sJRt`kT5AtDGS$uP<_ym6eHW3uxBejD5dc znG9*6Y!=qYT|{i%UySaY_n)7B6$04`x*sx7ny&5=Ee1xRP)vn^G1!v+^zHwB?DBEI z?gD^aluA_dYU1SNWX;adicJuRVr|!xg!{&6R_IDnAqfq+fF>iF=}gmgR{6Sm)zQ(> zfJgjA1wI}!{;WP;UO_=+V@+ctzhiGvAEFndQfZz>rEYr47c2~OXbtmxJ`Rt^x6e>B s&G2zGr6&))lSsX~_obq+c2QLf;L09iU9xKLgz^Afxrn+@bnYhkFGUA?G5`Po delta 2704 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 XYd>{Io36(0egT~w-0carL3jQIRa17f diff --git a/tasks/battle_pass/assets/assets_battle_pass.py b/tasks/battle_pass/assets/assets_battle_pass.py index 49a9daae9..445a27524 100644 --- a/tasks/battle_pass/assets/assets_battle_pass.py +++ b/tasks/battle_pass/assets/assets_battle_pass.py @@ -47,10 +47,10 @@ MISSIONS_LOADED = ButtonWrapper( name='MISSIONS_LOADED', share=Button( file='./assets/share/battle_pass/MISSIONS_LOADED.png', - area=(1163, 573, 1179, 589), - search=(1143, 553, 1199, 609), + area=(1155, 572, 1171, 588), + search=(1135, 552, 1191, 608), color=(186, 183, 170), - button=(1163, 573, 1179, 589), + button=(1155, 572, 1171, 588), ), ) MISSION_PAGE_SCROLL = ButtonWrapper( @@ -144,10 +144,10 @@ REWARDS_LOADED = ButtonWrapper( name='REWARDS_LOADED', share=Button( file='./assets/share/battle_pass/REWARDS_LOADED.png', - area=(173, 286, 248, 324), - search=(153, 266, 268, 344), - color=(96, 96, 94), - button=(173, 286, 248, 324), + area=(187, 252, 222, 280), + search=(167, 232, 242, 300), + color=(134, 135, 134), + button=(187, 252, 222, 280), ), ) TODAY_MISSION_CLICK = ButtonWrapper(