diff --git a/assets/cn/freebies/MAIL_EMPTY_2.png b/assets/cn/freebies/MAIL_EMPTY_2.png new file mode 100644 index 000000000..605f49fd2 Binary files /dev/null and b/assets/cn/freebies/MAIL_EMPTY_2.png differ diff --git a/assets/en/freebies/MAIL_EMPTY_2.png b/assets/en/freebies/MAIL_EMPTY_2.png new file mode 100644 index 000000000..605f49fd2 Binary files /dev/null and b/assets/en/freebies/MAIL_EMPTY_2.png differ diff --git a/assets/jp/freebies/MAIL_EMPTY_2.png b/assets/jp/freebies/MAIL_EMPTY_2.png new file mode 100644 index 000000000..605f49fd2 Binary files /dev/null and b/assets/jp/freebies/MAIL_EMPTY_2.png differ diff --git a/assets/tw/freebies/MAIL_EMPTY_2.png b/assets/tw/freebies/MAIL_EMPTY_2.png new file mode 100644 index 000000000..605f49fd2 Binary files /dev/null and b/assets/tw/freebies/MAIL_EMPTY_2.png differ diff --git a/module/freebies/assets.py b/module/freebies/assets.py index a7beffc58..ab9a70285 100644 --- a/module/freebies/assets.py +++ b/module/freebies/assets.py @@ -13,6 +13,7 @@ MAIL_COLLECT = Button(area={'cn': (841, 577, 970, 608), 'en': (865, 583, 947, 60 MAIL_COLLECTED = Button(area={'cn': (893, 578, 986, 607), 'en': (835, 578, 975, 606), 'jp': (861, 575, 951, 608), 'tw': (891, 576, 987, 609)}, color={'cn': (55, 61, 70), 'en': (54, 63, 71), 'jp': (48, 57, 65), 'tw': (55, 62, 72)}, button={'cn': (893, 578, 986, 607), 'en': (835, 578, 975, 606), 'jp': (861, 575, 951, 608), 'tw': (891, 576, 987, 609)}, file={'cn': './assets/cn/freebies/MAIL_COLLECTED.png', 'en': './assets/en/freebies/MAIL_COLLECTED.png', 'jp': './assets/jp/freebies/MAIL_COLLECTED.png', 'tw': './assets/tw/freebies/MAIL_COLLECTED.png'}) MAIL_DELETE = Button(area={'cn': (176, 560, 306, 590), 'en': (428, 567, 500, 584), 'jp': (177, 556, 307, 591), 'tw': (175, 559, 308, 592)}, color={'cn': (221, 171, 166), 'en': (216, 173, 169), 'jp': (210, 151, 146), 'tw': (217, 166, 162)}, button={'cn': (176, 560, 306, 590), 'en': (428, 567, 500, 584), 'jp': (177, 556, 307, 591), 'tw': (175, 559, 308, 592)}, file={'cn': './assets/cn/freebies/MAIL_DELETE.png', 'en': './assets/en/freebies/MAIL_DELETE.png', 'jp': './assets/jp/freebies/MAIL_DELETE.png', 'tw': './assets/tw/freebies/MAIL_DELETE.png'}) MAIL_EMPTY = Button(area={'cn': (617, 341, 665, 365), 'en': (476, 366, 606, 390), 'jp': (656, 340, 784, 365), 'tw': (617, 341, 665, 365)}, color={'cn': (185, 187, 194), 'en': (191, 193, 199), 'jp': (148, 150, 162), 'tw': (185, 187, 194)}, button={'cn': (617, 341, 665, 365), 'en': (476, 366, 606, 390), 'jp': (656, 340, 784, 365), 'tw': (617, 341, 665, 365)}, file={'cn': './assets/cn/freebies/MAIL_EMPTY.png', 'en': './assets/en/freebies/MAIL_EMPTY.png', 'jp': './assets/jp/freebies/MAIL_EMPTY.png', 'tw': './assets/cn/freebies/MAIL_EMPTY.png'}) +MAIL_EMPTY_2 = Button(area={'cn': (507, 364, 596, 391), 'en': (507, 364, 596, 391), 'jp': (507, 364, 596, 391), 'tw': (507, 364, 596, 391)}, color={'cn': (181, 185, 194), 'en': (181, 185, 194), 'jp': (181, 185, 194), 'tw': (181, 185, 194)}, button={'cn': (507, 364, 596, 391), 'en': (507, 364, 596, 391), 'jp': (507, 364, 596, 391), 'tw': (507, 364, 596, 391)}, file={'cn': './assets/cn/freebies/MAIL_EMPTY_2.png', 'en': './assets/en/freebies/MAIL_EMPTY_2.png', 'jp': './assets/jp/freebies/MAIL_EMPTY_2.png', 'tw': './assets/tw/freebies/MAIL_EMPTY_2.png'}) MAIL_ENTER = Button(area={'cn': (1207, 393, 1253, 429), 'en': (1207, 393, 1253, 429), 'jp': (1207, 393, 1253, 429), 'tw': (1207, 393, 1253, 429)}, color={'cn': (109, 107, 95), 'en': (109, 107, 95), 'jp': (109, 107, 95), 'tw': (109, 107, 95)}, button={'cn': (1207, 393, 1253, 429), 'en': (1207, 393, 1253, 429), 'jp': (1207, 393, 1253, 429), 'tw': (1207, 393, 1253, 429)}, file={'cn': './assets/cn/freebies/MAIL_ENTER.png', 'en': './assets/en/freebies/MAIL_ENTER.png', 'jp': './assets/jp/freebies/MAIL_ENTER.png', 'tw': './assets/tw/freebies/MAIL_ENTER.png'}) MAIL_GUILD_MESSAGE = Button(area={'cn': (412, 214, 461, 235), 'en': (412, 214, 461, 235), 'jp': (412, 214, 461, 235), 'tw': (412, 214, 461, 235)}, color={'cn': (123, 124, 126), 'en': (123, 124, 126), 'jp': (123, 124, 126), 'tw': (123, 124, 126)}, button={'cn': (412, 214, 461, 235), 'en': (412, 214, 461, 235), 'jp': (412, 214, 461, 235), 'tw': (412, 214, 461, 235)}, file={'cn': './assets/cn/freebies/MAIL_GUILD_MESSAGE.png', 'en': './assets/en/freebies/MAIL_GUILD_MESSAGE.png', 'jp': './assets/jp/freebies/MAIL_GUILD_MESSAGE.png', 'tw': './assets/tw/freebies/MAIL_GUILD_MESSAGE.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'}) diff --git a/module/freebies/mail.py b/module/freebies/mail.py index e5a179f17..d5d8e02bc 100644 --- a/module/freebies/mail.py +++ b/module/freebies/mail.py @@ -52,6 +52,9 @@ class Mail(UI): if self.appear(MAIL_EMPTY, offset=(20, 20)): logger.info('Mail list empty') return False + if self.appear(MAIL_EMPTY_2, offset=(20, 20)): + logger.info('Mail list empty') + return False if self.appear(MAIL_GUILD_MESSAGE, offset=(20, 20)): logger.info('Guild mail found, exit') return False