1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 06:57:21 +08:00

merge alas

This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions

View File

@@ -45,19 +45,11 @@ class Reward(UI):
confirm_timer.reset()
click_timer.reset()
continue
<<<<<<< HEAD
if coin and click_timer.reached() and self.appear_then_click(COIN, offset=(20, 50), interval=60):
confirm_timer.reset()
click_timer.reset()
continue
if exp and click_timer.reached() and self.appear_then_click(EXP, offset=(20, 50), interval=60):
=======
if coin and click_timer.reached() and self.appear_then_click(COIN, offset=(25, 50), interval=60):
confirm_timer.reset()
click_timer.reset()
continue
if exp and click_timer.reached() and self.appear_then_click(EXP, offset=(30, 50), interval=60):
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
confirm_timer.reset()
click_timer.reset()
continue