diff --git a/aas.py b/aas.py index 852ad2d..311a24c 100644 --- a/aas.py +++ b/aas.py @@ -54,6 +54,10 @@ class ArisuAutoSweeper(AzurLaneAutoScript): from tasks.shop.shop import Shop Shop(config=self.config, device=self.device).run() + def momotalk(self): + from tasks.momotalk.momotalk import MomoTalk + MomoTalk(config=self.config, device=self.device).run() + def data_update(self): from tasks.item.data_update import DataUpdate DataUpdate(config=self.config, device=self.device).run() diff --git a/assets/en/momotalk/BEGIN_STORY.png b/assets/en/momotalk/BEGIN_STORY.png new file mode 100644 index 0000000..6d43b89 Binary files /dev/null and b/assets/en/momotalk/BEGIN_STORY.png differ diff --git a/assets/en/momotalk/CHAT_AREA.png b/assets/en/momotalk/CHAT_AREA.png new file mode 100644 index 0000000..ed61a8e Binary files /dev/null and b/assets/en/momotalk/CHAT_AREA.png differ diff --git a/assets/en/momotalk/CONFIRM_SKIP.png b/assets/en/momotalk/CONFIRM_SKIP.png new file mode 100644 index 0000000..1da4357 Binary files /dev/null and b/assets/en/momotalk/CONFIRM_SKIP.png differ diff --git a/assets/en/momotalk/CONFIRM_SORT.png b/assets/en/momotalk/CONFIRM_SORT.png new file mode 100644 index 0000000..e34d453 Binary files /dev/null and b/assets/en/momotalk/CONFIRM_SORT.png differ diff --git a/assets/en/momotalk/FIRST_UNREAD.png b/assets/en/momotalk/FIRST_UNREAD.png new file mode 100644 index 0000000..deb3791 Binary files /dev/null and b/assets/en/momotalk/FIRST_UNREAD.png differ diff --git a/assets/en/momotalk/MENU.png b/assets/en/momotalk/MENU.png new file mode 100644 index 0000000..ee8bc4e Binary files /dev/null and b/assets/en/momotalk/MENU.png differ diff --git a/assets/en/momotalk/MESSAGE_OFF.png b/assets/en/momotalk/MESSAGE_OFF.png new file mode 100644 index 0000000..45f9158 Binary files /dev/null and b/assets/en/momotalk/MESSAGE_OFF.png differ diff --git a/assets/en/momotalk/MESSAGE_ON.png b/assets/en/momotalk/MESSAGE_ON.png new file mode 100644 index 0000000..3ecc259 Binary files /dev/null and b/assets/en/momotalk/MESSAGE_ON.png differ diff --git a/assets/en/momotalk/NOTIFICATION_BADGE.png b/assets/en/momotalk/NOTIFICATION_BADGE.png new file mode 100644 index 0000000..0753e80 Binary files /dev/null and b/assets/en/momotalk/NOTIFICATION_BADGE.png differ diff --git a/assets/en/momotalk/REPLY.png b/assets/en/momotalk/REPLY.png new file mode 100644 index 0000000..7ba2246 Binary files /dev/null and b/assets/en/momotalk/REPLY.png differ diff --git a/assets/en/momotalk/SELECT_STUDENT.png b/assets/en/momotalk/SELECT_STUDENT.png new file mode 100644 index 0000000..8dcc592 Binary files /dev/null and b/assets/en/momotalk/SELECT_STUDENT.png differ diff --git a/assets/en/momotalk/SKIP.png b/assets/en/momotalk/SKIP.png new file mode 100644 index 0000000..b46c299 Binary files /dev/null and b/assets/en/momotalk/SKIP.png differ diff --git a/assets/en/momotalk/SORT_OFF.png b/assets/en/momotalk/SORT_OFF.png new file mode 100644 index 0000000..bd1203a Binary files /dev/null and b/assets/en/momotalk/SORT_OFF.png differ diff --git a/assets/en/momotalk/SORT_ON.png b/assets/en/momotalk/SORT_ON.png new file mode 100644 index 0000000..4d917da Binary files /dev/null and b/assets/en/momotalk/SORT_ON.png differ diff --git a/assets/en/momotalk/STORY.png b/assets/en/momotalk/STORY.png new file mode 100644 index 0000000..b9b8a50 Binary files /dev/null and b/assets/en/momotalk/STORY.png differ diff --git a/assets/en/momotalk/UNREAD.png b/assets/en/momotalk/UNREAD.png new file mode 100644 index 0000000..091294e Binary files /dev/null and b/assets/en/momotalk/UNREAD.png differ diff --git a/assets/en/momotalk/UNREAD_OFF.png b/assets/en/momotalk/UNREAD_OFF.png new file mode 100644 index 0000000..1038f12 Binary files /dev/null and b/assets/en/momotalk/UNREAD_OFF.png differ diff --git a/assets/en/momotalk/UNREAD_ON.png b/assets/en/momotalk/UNREAD_ON.png new file mode 100644 index 0000000..c8a43d0 Binary files /dev/null and b/assets/en/momotalk/UNREAD_ON.png differ diff --git a/config/template.json b/config/template.json index 883c418..887e481 100644 --- a/config/template.json +++ b/config/template.json @@ -201,5 +201,13 @@ "Command": "Mail", "ServerUpdate": "04:00" } + }, + "Momotalk": { + "Scheduler": { + "Enable": false, + "NextRun": "2020-01-01 00:00:00", + "Command": "Momotalk", + "ServerUpdate": "04:00" + } } } \ No newline at end of file diff --git a/module/config/argument/args.json b/module/config/argument/args.json index fa3cf52..bb8d15d 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -827,5 +827,32 @@ "display": "hide" } } + }, + "Momotalk": { + "Scheduler": { + "Enable": { + "type": "checkbox", + "value": false, + "option": [ + true, + false + ] + }, + "NextRun": { + "type": "datetime", + "value": "2020-01-01 00:00:00", + "validate": "datetime" + }, + "Command": { + "type": "input", + "value": "Momotalk", + "display": "hide" + }, + "ServerUpdate": { + "type": "input", + "value": "04:00", + "display": "hide" + } + } } } \ No newline at end of file diff --git a/module/config/argument/menu.json b/module/config/argument/menu.json index 0449457..e0e2e9a 100644 --- a/module/config/argument/menu.json +++ b/module/config/argument/menu.json @@ -31,7 +31,8 @@ "tasks": [ "Circle", "Task", - "Mail" + "Mail", + "Momotalk" ] } } \ No newline at end of file diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index 2dabd3f..33dc2ea 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -67,4 +67,6 @@ Reward: Task: - Scheduler Mail: + - Scheduler + Momotalk: - Scheduler \ No newline at end of file diff --git a/module/config/config_manual.py b/module/config/config_manual.py index b38a4a1..cf5c334 100644 --- a/module/config/config_manual.py +++ b/module/config/config_manual.py @@ -9,7 +9,7 @@ class ManualConfig: SCHEDULER_PRIORITY = """ Restart > Cafe > Circle > Mail > DataUpdate > Bounty - > Scrimmage > TacticalChallenge > Task > Shop + > Scrimmage > TacticalChallenge > Task > Shop > Momotalk """ """ diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 113c671..258def7 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -61,6 +61,10 @@ "Mail": { "name": "Mailbox", "help": "" + }, + "Momotalk": { + "name": "MomoTalk", + "help": "" } }, "Scheduler": { @@ -447,7 +451,7 @@ }, "Purchases": { "name": "Number of Purchases", - "help": "", + "help": "Default can be purchased once + number of refreshes = number of purchases, for example, 2 purchases = 1 default purchase + 1 refresh purchase", "1": "1", "2": "2", "3": "3", @@ -455,83 +459,83 @@ }, "1": { "name": "1", - "help": "Novice Activity Report x5" + "help": "x5 Novice Activity Report - 12,500 Credits" }, "2": { "name": "2", - "help": "x5 Normal Activity Report" + "help": "x5 Normal Activity Report - 125,000 Credits" }, "3": { "name": "3", - "help": "x3 Advanced Activity Report" + "help": "x3 Advanced Activity Report - 300,000 Credits" }, "4": { "name": "4", - "help": "x1 Superior Activity Report" + "help": "x1 Superior Activity Report - 500,000 Credits" }, "5": { "name": "5", - "help": "x5 Lesser Enhancement Stone" + "help": "x5 Lesser Enhancement Stone - 10,000 Credits" }, "6": { "name": "6", - "help": "x5 Normal Enhancement Stone" + "help": "x5 Normal Enhancement Stone - 40,000 Credits" }, "7": { "name": "7", - "help": "x3 Advanced Enhancement Stone" + "help": "x3 Advanced Enhancement Stone - 96,000 Credits" }, "8": { "name": "8", - "help": "x1 Superior Enhancement Stone" + "help": "x1 Superior Enhancement Stone - 128,000 Credits" }, "9": { "name": "9", - "help": "x5 Lesser Enhancement Stone" + "help": "x5 Lesser Enhancement Stone - 10,000 Credits" }, "10": { "name": "10", - "help": "x5 Normal Enhancement Stone" + "help": "x5 Normal Enhancement Stone - 40,000 Credits" }, "11": { "name": "11", - "help": "x3 Advanced Enhancement Stone" + "help": "x3 Advanced Enhancement Stone - 96,000 Credits" }, "12": { "name": "12", - "help": "x1 Superior Enhancement Stone" + "help": "x1 Superior Enhancement Stone - 128,000 Credits" }, "13": { "name": "13", - "help": "x10 Lesser Enhancement Stone" + "help": "x10 Lesser Enhancement Stone - 20,000 Credits" }, "14": { "name": "14", - "help": "x10 Normal Enhancement Stone" + "help": "x10 Normal Enhancement Stone - 80,000 Credits" }, "15": { "name": "15", - "help": "x6 Advanced Enhancement Stone" + "help": "x6 Advanced Enhancement Stone - 192,000 Credits" }, "16": { "name": "16", - "help": "x2 Superior Enhancement Stone" + "help": "x2 Superior Enhancement Stone - 256,000 Credits" }, "17": { "name": "17", - "help": "x1 Mandrake Seed" + "help": "x1 Random Selection - 8,000 Credits" }, "18": { "name": "18", - "help": "x1 Voynich Manuscript Page" + "help": "x1 Random Selection - 8,000 Credits" }, "19": { "name": "19", - "help": "x1 Broken Nimrud Lens" + "help": "x1 Random Selection - 25,000 Credits" }, "20": { "name": "20", - "help": "x1 Aether Piece" + "help": "x1 Random Selection - 25,000 Credits" } }, "TacticalChallengeShop": { @@ -553,63 +557,63 @@ }, "1": { "name": "1", - "help": "" + "help": "x5 Shizuko's Eleph - 50 Coins" }, "2": { "name": "2", - "help": "" + "help": "x5 Mashiro's Eleph - 50 Coins" }, "3": { "name": "3", - "help": "" + "help": "x5 Saya's Eleph - 50 Coins" }, "4": { "name": "4", - "help": "" + "help": "x5 Fuuka's Eleph - 50 Coins" }, "5": { "name": "5", - "help": "" + "help": "x5 Utaha's Eleph - 50 Coins" }, "6": { "name": "6", - "help": "" + "help": "x1 Lesser Drink(30 AP) - 15 Coins" }, "7": { "name": "7", - "help": "" + "help": "x1 Normal Drink(60 AP) - 30 Coins" }, "8": { "name": "8", - "help": "" + "help": "x10 Novice Activity Report - 5 Coins" }, "9": { "name": "9", - "help": "" + "help": "x5 Normal Activity Report - 25 Coins" }, "10": { "name": "10", - "help": "" + "help": "x3 Advanced Activity Report - 60 Coins" }, "11": { "name": "11", - "help": "" + "help": "x1 Superior Activity Report - 100 Coins" }, "12": { "name": "12", - "help": "" + "help": "x5000 Credits - 4 Coins" }, "13": { "name": "13", - "help": "" + "help": "x25k Credits - 20 Coins" }, "14": { "name": "14", - "help": "" + "help": "x75k Credits - 60 Coins" }, "15": { "name": "15", - "help": "" + "help": "x125k Credits - 100 Coins" } }, "ItemStorage": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 856a1c1..a561212 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -61,6 +61,10 @@ "Mail": { "name": "邮箱", "help": "" + }, + "Momotalk": { + "name": "Task.Momotalk.name", + "help": "Task.Momotalk.help" } }, "Scheduler": { diff --git a/tasks/momotalk/assets/assets_momotalk.py b/tasks/momotalk/assets/assets_momotalk.py new file mode 100644 index 0000000..4fcb873 --- /dev/null +++ b/tasks/momotalk/assets/assets_momotalk.py @@ -0,0 +1,203 @@ +from module.base.button import Button, ButtonWrapper + +# This file was auto-generated, do not modify it manually. To generate: +# ``` python -m dev_tools.button_extract ``` + +BEGIN_STORY = ButtonWrapper( + name='BEGIN_STORY', + jp=None, + en=Button( + file='./assets/en/momotalk/BEGIN_STORY.png', + area=(796, 540, 1059, 591), + search=(776, 520, 1079, 611), + color=(107, 197, 230), + button=(796, 540, 1059, 591), + ), +) +CHAT_AREA = ButtonWrapper( + name='CHAT_AREA', + jp=None, + en=Button( + file='./assets/en/momotalk/CHAT_AREA.png', + area=(760, 149, 1149, 628), + search=(740, 129, 1169, 648), + color=(206, 212, 217), + button=(760, 149, 1149, 628), + ), +) +CONFIRM_SKIP = ButtonWrapper( + name='CONFIRM_SKIP', + jp=None, + en=Button( + file='./assets/en/momotalk/CONFIRM_SKIP.png', + area=(674, 486, 871, 555), + search=(654, 466, 891, 575), + color=(112, 207, 241), + button=(674, 486, 871, 555), + ), +) +CONFIRM_SORT = ButtonWrapper( + name='CONFIRM_SORT', + jp=None, + en=Button( + file='./assets/en/momotalk/CONFIRM_SORT.png', + area=(239, 407, 657, 439), + search=(219, 387, 677, 459), + color=(248, 249, 249), + button=(239, 407, 657, 439), + ), +) +FIRST_UNREAD = ButtonWrapper( + name='FIRST_UNREAD', + jp=None, + en=Button( + file='./assets/en/momotalk/FIRST_UNREAD.png', + area=(636, 239, 661, 265), + search=(616, 219, 681, 285), + color=(251, 86, 45), + button=(636, 239, 661, 265), + ), +) +MENU = ButtonWrapper( + name='MENU', + jp=None, + en=Button( + file='./assets/en/momotalk/MENU.png', + area=(1156, 15, 1251, 63), + search=(1136, 0, 1271, 83), + color=(215, 219, 222), + button=(1156, 15, 1251, 63), + ), +) +MESSAGE_OFF = ButtonWrapper( + name='MESSAGE_OFF', + jp=None, + en=Button( + file='./assets/en/momotalk/MESSAGE_OFF.png', + area=(143, 273, 203, 298), + search=(123, 253, 223, 318), + color=(93, 105, 122), + button=(143, 273, 203, 298), + ), +) +MESSAGE_ON = ButtonWrapper( + name='MESSAGE_ON', + jp=None, + en=Button( + file='./assets/en/momotalk/MESSAGE_ON.png', + area=(143, 271, 203, 301), + search=(123, 251, 223, 321), + color=(160, 168, 182), + button=(143, 271, 203, 301), + ), +) +NOTIFICATION_BADGE = ButtonWrapper( + name='NOTIFICATION_BADGE', + jp=None, + en=Button( + file='./assets/en/momotalk/NOTIFICATION_BADGE.png', + area=(171, 109, 200, 128), + search=(151, 89, 220, 148), + color=(242, 101, 47), + button=(171, 109, 200, 128), + ), +) +REPLY = ButtonWrapper( + name='REPLY', + jp=None, + en=Button( + file='./assets/en/momotalk/REPLY.png', + area=(791, 431, 855, 462), + search=(771, 411, 875, 482), + color=(198, 210, 216), + button=(791, 431, 855, 462), + ), +) +SELECT_STUDENT = ButtonWrapper( + name='SELECT_STUDENT', + jp=None, + en=Button( + file='./assets/en/momotalk/SELECT_STUDENT.png', + area=(839, 369, 998, 403), + search=(819, 349, 1018, 423), + color=(241, 242, 242), + button=(839, 369, 998, 403), + ), +) +SKIP = ButtonWrapper( + name='SKIP', + jp=None, + en=Button( + file='./assets/en/momotalk/SKIP.png', + area=(1192, 103, 1229, 141), + search=(1172, 83, 1249, 161), + color=(108, 125, 145), + button=(1192, 103, 1229, 141), + ), +) +SORT_OFF = ButtonWrapper( + name='SORT_OFF', + jp=None, + en=Button( + file='./assets/en/momotalk/SORT_OFF.png', + area=(591, 158, 662, 199), + search=(571, 138, 682, 219), + color=(235, 237, 238), + button=(591, 158, 662, 199), + ), +) +SORT_ON = ButtonWrapper( + name='SORT_ON', + jp=None, + en=Button( + file='./assets/en/momotalk/SORT_ON.png', + area=(594, 159, 658, 196), + search=(574, 139, 678, 216), + color=(233, 235, 236), + button=(594, 159, 658, 196), + ), +) +STORY = ButtonWrapper( + name='STORY', + jp=None, + en=Button( + file='./assets/en/momotalk/STORY.png', + area=(790, 529, 979, 557), + search=(770, 509, 999, 577), + color=(220, 208, 214), + button=(790, 529, 979, 557), + ), +) +UNREAD = ButtonWrapper( + name='UNREAD', + jp=None, + en=Button( + file='./assets/en/momotalk/UNREAD.png', + area=(454, 160, 568, 193), + search=(434, 140, 588, 213), + color=(241, 242, 243), + button=(454, 160, 568, 193), + ), +) +UNREAD_OFF = ButtonWrapper( + name='UNREAD_OFF', + jp=None, + en=Button( + file='./assets/en/momotalk/UNREAD_OFF.png', + area=(456, 273, 658, 316), + search=(436, 253, 678, 336), + color=(252, 252, 251), + button=(456, 273, 658, 316), + ), +) +UNREAD_ON = ButtonWrapper( + name='UNREAD_ON', + jp=None, + en=Button( + file='./assets/en/momotalk/UNREAD_ON.png', + area=(456, 272, 658, 314), + search=(436, 252, 678, 334), + color=(245, 120, 144), + button=(456, 272, 658, 314), + ), +) diff --git a/tasks/momotalk/momotalk.py b/tasks/momotalk/momotalk.py new file mode 100644 index 0000000..35f4974 --- /dev/null +++ b/tasks/momotalk/momotalk.py @@ -0,0 +1,61 @@ +from enum import Enum + +from module.base.timer import Timer +from module.logger import logger +from tasks.tactical_challenge.assets.assets_tactical_challenge import * +from tasks.momotalk.ui import MomoTalkUI + +class MomoTalkStatus(Enum): + OPEN = 0 + SORT = 1 + CHECK = 2 + CHAT = 3 + STORY = 4 + FINISHED = -1 + +class MomoTalk(MomoTalkUI): + def handle_momotalk(self, status): + match status: + case MomoTalkStatus.OPEN: + if self.open_momotalk(): + return MomoTalkStatus.SORT + return MomoTalkStatus.FINISHED + case MomoTalkStatus.SORT: + if self.sort_messages(): + return MomoTalkStatus.CHECK + case MomoTalkStatus.CHECK: + if self.check_first_student(): + return MomoTalkStatus.CHAT + return MomoTalkStatus.FINISHED + case MomoTalkStatus.CHAT: + if self.chat(): + return MomoTalkStatus.STORY + return MomoTalkStatus.OPEN + case MomoTalkStatus.STORY: + if self.skip_story(): + return MomoTalkStatus.OPEN + case MomoTalkStatus.FINISHED: + return status + case _: + logger.warning(f'Invalid status: {status}') + return status + + def run(self): + action_timer = Timer(0.5, 1) + status = MomoTalkStatus.OPEN + + while 1: + self.device.screenshot() + + if self.ui_additional(): + continue + + if action_timer.reached_and_reset(): + logger.attr('Status', status) + status = self.handle_momotalk(status) + + if status == MomoTalkStatus.FINISHED: + break + + self.config.task_delay(server_update=True) + diff --git a/tasks/momotalk/ui.py b/tasks/momotalk/ui.py new file mode 100644 index 0000000..8ac7fd6 --- /dev/null +++ b/tasks/momotalk/ui.py @@ -0,0 +1,189 @@ +from module.base.timer import Timer +from module.base.base import ModuleBase +from module.logger import logger +from module.ui.switch import Switch +from module.base.utils import point_in_area, area_size +from tasks.base.ui import UI +from tasks.base.page import page_main, page_momo_talk +from tasks.momotalk.assets.assets_momotalk import * +import cv2 +import numpy as np + +"""None of the switches works""" +SWITCH_MESSAGE = Switch("Message_switch") +SWITCH_MESSAGE.add_state("on", MESSAGE_ON) +SWITCH_MESSAGE.add_state("off", MESSAGE_OFF) + +SWITCH_UNREAD = Switch("Unread_switch") +SWITCH_UNREAD.add_state("on", UNREAD_ON) +SWITCH_UNREAD.add_state("off", UNREAD_OFF) + +SWITCH_SORT = Switch("Sort_switch") +SWITCH_SORT.add_state("on", SORT_ON) +SWITCH_SORT.add_state("off", SORT_OFF) + +"""Required for template matching as reply and story +button can be found in different locations""" +REPLY_TEMPLATE = REPLY.matched_button.image +STORY_TEMPLATE = STORY.matched_button.image + +class MomoTalkUI(UI): + def __init__(self, config, device): + super().__init__(config, device) + self.swipe_vector_range = (0.65, 0.85) + self.list = CHAT_AREA + + def swipe_page(self, direction: str, main: ModuleBase, vector_range=None, reverse=False): + """ + Args: + direction: up, down + main: + vector_range (tuple[float, float]): + reverse (bool): + """ + if vector_range is None: + vector_range = self.swipe_vector_range + vector = np.random.uniform(*vector_range) + width, height = area_size(self.list.button) + if direction == 'up': + vector = (0, vector * height) + elif direction == 'down': + vector = (0, -vector * height) + else: + logger.warning(f'Unknown swipe direction: {direction}') + return + + if reverse: + vector = (-vector[0], -vector[1]) + main.device.swipe_vector(vector, self.list.button) + + def select_then_check(self, dest_enter: ButtonWrapper, dest_check: ButtonWrapper, similarity=0.85): + timer = Timer(5, 10).start() + while 1: + self.device.screenshot() + self.appear_then_click(dest_enter, interval=1, similarity=similarity) + if self.appear(dest_check, similarity=similarity): + return True + if timer.reached(): + return False + + def select_then_disappear(self, dest_enter: ButtonWrapper, dest_check: ButtonWrapper, force_select=False): + timer = Timer(5, 10).start() + while 1: + self.device.screenshot() + if force_select or self.appear(dest_enter): + self.click_with_interval(dest_enter, interval=1) + if not self.appear(dest_check): + return True + if timer.reached(): + return False + + def set_switch(self, switch): + """ + Set switch to on. However, unsure why is inaccurate in momotalk. + Returns: + True if switch is set, False if switch not found + """ + if not switch.appear(main=self): + logger.info(f'{switch.name} not found') + return False + switch.set('on', main=self) + + return True + + def click_all(self, template, x_add=0, y_add=0): + """ + Find the all the locations of the template adding an offset if specified and click them. + TODO: filter coords that are not inside the chat area as otherwise it will close momotalk. + If after filter, no coords then swipe. + """ + click_coords = self.device.click_methods.get(self.config.Emulator_ControlMethod, self.device.click_adb) + image = self.device.screenshot() + result = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED) + threshold = 0.8 + locations = np.where(result >= threshold) + seen = set() + for pt in zip(*locations[::-1]): + center_pt = (int(pt[0] + template.shape[1] / 2 + x_add), int(pt[1] + template.shape[0] / 2 + y_add)) + seen.add(center_pt) + if seen: + seen = filter(lambda x: point_in_area(x, CHAT_AREA.area), seen) + [click_coords(coords[0], coords[1]) for coords in seen] + self.swipe_page("down", self) + return True + return False + + def open_momotalk(self): + """ + Go to main and check if there are any red notifications in momotalk. + If yes, open it otherwise it means no student available for interaction. + """ + self.ui_ensure(page_main) + if self.match_color(NOTIFICATION_BADGE, threshold=80): + self.ui_ensure(page_momo_talk) + while not self.select_then_check(MESSAGE_OFF, MESSAGE_ON): + pass + return True + logger.warn("No students available for interaction") + return False + + def sort_messages(self): + """ + Switch from newest to unread and sort the messages in descending order + """ + logger.info("Sorting messages...") + steps = [UNREAD, CONFIRM_SORT, UNREAD_OFF, UNREAD_ON] + for i in range(len(steps)-2): + self.select_then_check(steps[i], steps[i+1], similarity=0.95) + return not self.appear(CONFIRM_SORT) and self.appear(UNREAD) and self.appear(SORT_ON) + + def check_first_student(self): + """ + If the first student has a red notification return True and start chat. + Otherwise it means no students are available for interaction. + """ + if self.match_color(FIRST_UNREAD, threshold=80) and self.select_then_disappear(FIRST_UNREAD, SELECT_STUDENT, force_select=True): + return True + logger.warn("No students available for interaction") + return False + + def chat(self): + """ + Waits for the chat area to be stable and then + check if a reply or story button is found and click them. + If the begin story button is found skip story. + """ + logger.info("Chatting with student...") + stability_counter = 0 + while 1: + self.wait_until_stable(CHAT_AREA, timer=Timer(10, 10)) + if self.appear(BEGIN_STORY): + logger.info("Begin Story detected") + return True + if self.click_all(REPLY_TEMPLATE, y_add=62): + logger.info("Clicked on reply") + stability_counter = 0 + continue + if self.click_all(STORY_TEMPLATE, y_add=62): + logger.info("Clicked on story") + stability_counter = 0 + continue + logger.info("No new message detected") + stability_counter += 1 + if stability_counter > 3: + return False + + def skip_story(self): + """ + Skip story by executing a series of steps. Returns True if the confirm skip + button is clicked and disappears + """ + logger.info("Attempting to skip story...") + steps = [BEGIN_STORY, MENU, SKIP] + for step in steps: + self.appear_then_click(step) + if self.appear_then_click(CONFIRM_SKIP) and not self.appear(CONFIRM_SKIP, interval=5): + logger.info("Skipped story successfully") + return True + return False + diff --git a/tasks/shop/shop.py b/tasks/shop/shop.py index 3ef4a21..8e6d132 100644 --- a/tasks/shop/shop.py +++ b/tasks/shop/shop.py @@ -94,7 +94,7 @@ class Shop(ShopUI): return status def run(self): - """Reset the items position by going main and then shop""" + """Reset the shop and items position by going main and then shop""" self.ui_ensure(page_main) self.ui_ensure(page_shop) diff --git a/tasks/shop/ui.py b/tasks/shop/ui.py index e5b79fc..88713bb 100644 --- a/tasks/shop/ui.py +++ b/tasks/shop/ui.py @@ -13,7 +13,7 @@ ITEM_POSITIONS = { 5: (650, 460), 6: (805, 460), 7: (960, 460), 8: (1110, 460), 9: (650, 200), 10: (805, 200), 11: (960, 200), 12: (1110, 200), 13: (650, 460), 14: (805, 460), 15: (960, 460), 16: (1110, 460), - 17: (650, 200), 18: (805, 200), 19: (960, 200), 20: (1110, 200), + 17: (650, 460), 18: (805, 460), 19: (960, 460), 20: (1110, 460), } class ShopUI(UI): @@ -21,7 +21,7 @@ class ShopUI(UI): super().__init__(config, device) self.click_coords = self.device.click_methods.get(self.config.Emulator_ControlMethod, self.device.click_adb) - self.swipe_vector_range = (0.65, 0.85) + self.swipe_vector_range = (1.10, 1.15) self.swipe_flags = {8:False, 16: False} self.list = ITEM_LIST @@ -66,26 +66,37 @@ class ShopUI(UI): True if switch is set, False if switch not found """ if not shop_switch.appear(main=self): - logger.info('Shop switch not found') + logger.info(f'{shop_switch.name} not found') return False shop_switch.set('on', main=self) return True def select_items(self, item_list): + """ + Select items in the item list checking if swipe is required each time. + However, swipes are inaccurate and clicks too fast. + """ + timer = Timer(1).start() for item in item_list: if self.should_swipe(item): self.swipe_page('down', self) self.wait_until_stable( self.list.button, - timer=Timer(0, 0), + timer=Timer(3, 0), timeout=Timer(1.5, 5) ) - + while not timer.reached_and_reset(): + pass self.click_coords(*ITEM_POSITIONS[item]) def should_swipe(self, item): + """ + Return True based on two checkpoints: + one at 8 and the other at 16. + Only once for each checkpoint. + """ if (8 < item < 16) and not self.swipe_flags[8]: self.swipe_flags[8] = True return True @@ -100,6 +111,7 @@ class ShopUI(UI): def make_purchase(self): if self.select_then_check(PURCHASE, CONFIRM_PURCHASE) and self.appear_then_click(CONFIRM_PURCHASE): return True + logger.warning("No items were selected. Unable to purchase.") return False def refresh_shop(self, need_count): @@ -110,6 +122,7 @@ class ShopUI(UI): if refresh_count: purchased_count = 4 - refresh_count if need_count > purchased_count and self.appear_then_click(CONFIRM_REFRESH): + logger.info("Refreshed the shop") return True return False diff --git a/tasks/task/task.py b/tasks/task/task.py index d9efa22..cbb9d27 100644 --- a/tasks/task/task.py +++ b/tasks/task/task.py @@ -24,4 +24,4 @@ class Task(UI): continue break - self.config.task_delay(server_update=True) + self.config.task_delay(minute=120)