From 7eadaa7d8a51854efcf33f25a78a71564d672c53 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 23 Aug 2024 02:34:40 +0800 Subject: [PATCH] Fix: [JP] Handle mail empty (#4114) --- assets/cn/freebies/MAIL_WHITE_EMPTY.png | Bin 0 -> 7764 bytes assets/jp/freebies/MAIL_WHITE_EMPTY.png | Bin 0 -> 7764 bytes module/freebies/assets.py | 1 + module/freebies/mail_white.py | 5 ++++- 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 assets/cn/freebies/MAIL_WHITE_EMPTY.png create mode 100644 assets/jp/freebies/MAIL_WHITE_EMPTY.png diff --git a/assets/cn/freebies/MAIL_WHITE_EMPTY.png b/assets/cn/freebies/MAIL_WHITE_EMPTY.png new file mode 100644 index 0000000000000000000000000000000000000000..d1ef6a8d0b59082ae4e9335972dcc71f166aec4b GIT binary patch literal 7764 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 literal 0 HcmV?d00001 diff --git a/assets/jp/freebies/MAIL_WHITE_EMPTY.png b/assets/jp/freebies/MAIL_WHITE_EMPTY.png new file mode 100644 index 0000000000000000000000000000000000000000..d1ef6a8d0b59082ae4e9335972dcc71f166aec4b GIT binary patch literal 7764 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 literal 0 HcmV?d00001 diff --git a/module/freebies/assets.py b/module/freebies/assets.py index a0f1ac059f..1675bf8ceb 100644 --- a/module/freebies/assets.py +++ b/module/freebies/assets.py @@ -25,6 +25,7 @@ MAIL_SELECT_GEMS = Button(area={'cn': (442, 441, 462, 461), 'en': (442, 441, 462, 461), 'jp': (442, 460, 462, 480), 'tw': (442, 441, 462, 461)}, color={'cn': (241, 241, 241), 'en': (241, 241, 241), 'jp': (239, 239, 239), 'tw': (241, 241, 241)}, button={'cn': (442, 441, 462, 461), 'en': (442, 441, 462, 461), 'jp': (442, 460, 462, 480), 'tw': (442, 441, 462, 461)}, file={'cn': './assets/cn/freebies/MAIL_SELECT_GEMS.png', 'en': './assets/en/freebies/MAIL_SELECT_GEMS.png', 'jp': './assets/jp/freebies/MAIL_SELECT_GEMS.png', 'tw': './assets/tw/freebies/MAIL_SELECT_GEMS.png'}) MAIL_SELECT_MERIT = Button(area={'cn': (802, 401, 822, 421), 'en': (802, 401, 822, 421), 'jp': (802, 410, 822, 430), 'tw': (802, 401, 822, 421)}, color={'cn': (87, 87, 88), 'en': (87, 87, 88), 'jp': (239, 239, 239), 'tw': (87, 87, 88)}, button={'cn': (802, 401, 822, 421), 'en': (802, 401, 822, 421), 'jp': (802, 410, 822, 430), 'tw': (802, 401, 822, 421)}, file={'cn': './assets/cn/freebies/MAIL_SELECT_MERIT.png', 'en': './assets/en/freebies/MAIL_SELECT_MERIT.png', 'jp': './assets/jp/freebies/MAIL_SELECT_MERIT.png', 'tw': './assets/tw/freebies/MAIL_SELECT_MERIT.png'}) MAIL_SELECT_OIL = Button(area={'cn': (682, 401, 702, 421), 'en': (682, 401, 702, 421), 'jp': (682, 410, 702, 430), 'tw': (682, 401, 702, 421)}, color={'cn': (241, 240, 241), 'en': (241, 240, 241), 'jp': (239, 239, 239), 'tw': (241, 240, 241)}, button={'cn': (682, 401, 702, 421), 'en': (682, 401, 702, 421), 'jp': (682, 410, 702, 430), 'tw': (682, 401, 702, 421)}, file={'cn': './assets/cn/freebies/MAIL_SELECT_OIL.png', 'en': './assets/en/freebies/MAIL_SELECT_OIL.png', 'jp': './assets/jp/freebies/MAIL_SELECT_OIL.png', 'tw': './assets/tw/freebies/MAIL_SELECT_OIL.png'}) +MAIL_WHITE_EMPTY = Button(area={'cn': (178, 375, 266, 400), 'en': (178, 375, 266, 400), 'jp': (178, 375, 266, 400), 'tw': (178, 375, 266, 400)}, color={'cn': (131, 141, 158), 'en': (131, 141, 158), 'jp': (131, 141, 158), 'tw': (131, 141, 158)}, button={'cn': (178, 375, 266, 400), 'en': (178, 375, 266, 400), 'jp': (178, 375, 266, 400), 'tw': (178, 375, 266, 400)}, file={'cn': './assets/cn/freebies/MAIL_WHITE_EMPTY.png', 'en': './assets/cn/freebies/MAIL_WHITE_EMPTY.png', 'jp': './assets/jp/freebies/MAIL_WHITE_EMPTY.png', 'tw': './assets/cn/freebies/MAIL_WHITE_EMPTY.png'}) OCR_DATA_KEY = Button(area={'cn': (132, 42, 233, 70), 'en': (132, 42, 233, 70), 'jp': (132, 42, 233, 70), 'tw': (132, 42, 233, 70)}, color={'cn': (74, 75, 86), 'en': (74, 75, 86), 'jp': (74, 75, 86), 'tw': (74, 75, 86)}, button={'cn': (132, 42, 233, 70), 'en': (132, 42, 233, 70), 'jp': (132, 42, 233, 70), 'tw': (132, 42, 233, 70)}, file={'cn': './assets/cn/freebies/OCR_DATA_KEY.png', 'en': './assets/en/freebies/OCR_DATA_KEY.png', 'jp': './assets/jp/freebies/OCR_DATA_KEY.png', 'tw': './assets/tw/freebies/OCR_DATA_KEY.png'}) PURCHASE_POPUP = Button(area={'cn': (907, 204, 934, 229), 'en': (907, 204, 934, 229), 'jp': (907, 204, 934, 229), 'tw': (907, 204, 934, 229)}, color={'cn': (176, 130, 110), 'en': (176, 130, 110), 'jp': (176, 130, 110), 'tw': (176, 130, 110)}, button={'cn': (907, 204, 934, 229), 'en': (907, 204, 934, 229), 'jp': (907, 204, 934, 229), 'tw': (907, 204, 934, 229)}, file={'cn': './assets/cn/freebies/PURCHASE_POPUP.png', 'en': './assets/en/freebies/PURCHASE_POPUP.png', 'jp': './assets/jp/freebies/PURCHASE_POPUP.png', 'tw': './assets/tw/freebies/PURCHASE_POPUP.png'}) REWARD_RECEIVE = Button(area={'cn': (1192, 520, 1255, 536), 'en': (1192, 522, 1254, 534), 'jp': (1186, 518, 1259, 536), 'tw': (1192, 520, 1255, 536)}, color={'cn': (191, 178, 163), 'en': (195, 182, 168), 'jp': (208, 197, 183), 'tw': (191, 178, 163)}, button={'cn': (1192, 520, 1255, 536), 'en': (1192, 522, 1254, 534), 'jp': (1186, 518, 1259, 536), 'tw': (1192, 520, 1255, 536)}, file={'cn': './assets/cn/freebies/REWARD_RECEIVE.png', 'en': './assets/en/freebies/REWARD_RECEIVE.png', 'jp': './assets/jp/freebies/REWARD_RECEIVE.png', 'tw': './assets/cn/freebies/REWARD_RECEIVE.png'}) diff --git a/module/freebies/mail_white.py b/module/freebies/mail_white.py index d8c7dc4624..7a4f495fcc 100644 --- a/module/freebies/mail_white.py +++ b/module/freebies/mail_white.py @@ -64,10 +64,13 @@ def _mail_enter(self, skip_first_screenshot=True): if self.appear(MAIL_BATCH_CLAIM, offset=(20, 20)): logger.info('Mail entered') return True + if self.appear(MAIL_WHITE_EMPTY, offset=(20, 20)): + logger.info('Mail empty') + return False if not has_mail and self.appear(GOTO_MAIN_WHITE, offset=(20, 20)): timeout.start() if timeout.reached(): - logger.info('Mail empty') + logger.info('Mail empty, wait GOTO_MAIN_WHITE timeout') return False # Click