fix: update assets file

remove its scheduler,
and some minor improvements

assets/gui/css/alas.css

@@ -377,6 +377,7 @@ pre.rich-traceback-code {
 #pywebio-scope-scheduler-bar,
 #pywebio-scope-log-bar,
 #pywebio-scope-log,
+#pywebio-scope-daemon-log-bar,
 #pywebio-scope-daemon-overview #pywebio-scope-groups {
     font-weight: 500;
     margin: 0.3125rem;

assets/gui/css/dark-alas.css

@@ -133,12 +133,13 @@ pre.rich-traceback-code {
     color: #c9d1d9;
 }
 
-#pywebio-scope-scheduler-bar,
-#pywebio-scope-log-bar,
-#pywebio-scope-log,
 #pywebio-scope-running,
 #pywebio-scope-pending,
 #pywebio-scope-waiting,
+#pywebio-scope-scheduler-bar,
+#pywebio-scope-log-bar,
+#pywebio-scope-log,
+#pywebio-scope-daemon-log-bar,
 #pywebio-scope-daemon-overview #pywebio-scope-groups {
     background-color: #2f3136;
     border: 1px solid #21262d;

assets/gui/css/light-alas.css

@@ -133,12 +133,13 @@ pre.rich-traceback-code {
     border: 1px solid lightgrey;
 }
 
-#pywebio-scope-scheduler-bar,
-#pywebio-scope-log-bar,
-#pywebio-scope-log,
 #pywebio-scope-running,
 #pywebio-scope-pending,
 #pywebio-scope-waiting,
+#pywebio-scope-scheduler-bar,
+#pywebio-scope-log-bar,
+#pywebio-scope-log,
+#pywebio-scope-daemon-log-bar,
 #pywebio-scope-daemon-overview #pywebio-scope-groups {
     background-color: white;
     border: 1px solid lightgrey;

config/template.json

@@ -250,11 +250,8 @@
     }
   },
   "Momotalk": {
-    "Scheduler": {
-      "Enable": false,
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "Momotalk",
-      "ServerUpdate": "04:00"
+    "Momotalk": {
+      "Enable": true
     }
   }
 }

module/config/argument/args.json

@@ -1062,28 +1062,10 @@
     }
   },
   "Momotalk": {
-    "Scheduler": {
+    "Momotalk": {
       "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",
+        "value": true,
         "display": "hide"
       }
     }

module/config/argument/argument.yaml

@@ -267,3 +267,10 @@ ItemStorage:
     stored: StoredTacticalChallengeTicket
     order: 6
     color: "#7ac8e5"
+
+# ==================== Momotalk ====================
+
+Momotalk:
+  Enable:
+    value: true
+    display: hide

module/config/argument/menu.json

@@ -33,7 +33,13 @@
     "tasks": [
       "Circle",
       "Task",
-      "Mail",
+      "Mail"
+    ]
+  },
+  "Tool": {
+    "menu": "collapse",
+    "page": "tool",
+    "tasks": [
       "Momotalk"
     ]
   }

module/config/argument/task.yaml

@@ -80,5 +80,12 @@ Reward:
       - Scheduler
     Mail:
       - Scheduler
+
+# ==================== Tool ====================
+
+Tool:
+  menu: 'collapse'
+  page: 'tool'
+  tasks:
     Momotalk:
-      - Scheduler
+      - Momotalk

module/config/config_generated.py

@@ -166,3 +166,6 @@ class GeneratedConfig:
     ItemStorage_BountyTicket = {}
     ItemStorage_ScrimmageTicket = {}
     ItemStorage_TacticalChallengeTicket = {}
+
+    # Group `Momotalk`
+    Momotalk_Enable = True

module/config/i18n/en-US.json

@@ -15,6 +15,10 @@
     "Reward": {
       "name": "Reward",
       "help": ""
+    },
+    "Tool": {
+      "name": "Tools",
+      "help": ""
     }
   },
   "Task": {
@@ -503,7 +507,7 @@
       "7": "07 - Overpass G",
       "8": "08 - Overpass H",
       "9": "09 - Overpass I",
-      "10": "10 - Overpass J (JP Server Only)"
+      "10": "10 - Overpass J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -528,7 +532,7 @@
       "7": "07 - Abandoned Train G",
       "8": "08 - Abandoned Train H",
       "9": "09 - Abandoned Train I",
-      "10": "10 - Abandoned Train J (JP Server Only)"
+      "10": "10 - Abandoned Train J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -553,7 +557,7 @@
       "7": "07 - Besieged Classroom G",
       "8": "08 - Besieged Classroom H",
       "9": "09 - Besieged Classroom I",
-      "10": "10 - Besieged Classroom J (JP Server Only)"
+      "10": "10 - Besieged Classroom J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -849,6 +853,16 @@
       "help": ""
     }
   },
+  "Momotalk": {
+    "_info": {
+      "name": "Momotalk",
+      "help": "Tools need to stop the scheduler and then run independently"
+    },
+    "Enable": {
+      "name": "",
+      "help": ""
+    }
+  },
   "Gui": {
     "Aside": {
       "Install": "Install",

module/config/i18n/zh-CN.json

@@ -15,6 +15,10 @@
     "Reward": {
       "name": "收菜",
       "help": ""
+    },
+    "Tool": {
+      "name": "工具",
+      "help": ""
     }
   },
   "Task": {
@@ -503,7 +507,7 @@
       "7": "07 - 高架公路 G",
       "8": "08 - 高架公路 H",
       "9": "09 - 高架公路 I",
-      "10": "10 - 高架公路 J（仅日服）"
+      "10": "10 - 高架公路 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -528,7 +532,7 @@
       "7": "07 - 被遗弃的列车 G",
       "8": "08 - 被遗弃的列车 H",
       "9": "09 - 被遗弃的列车 I",
-      "10": "10 - 被遗弃的列车 J（仅日服）"
+      "10": "10 - 被遗弃的列车 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -553,7 +557,7 @@
       "7": "07 - 被袭击的教室 G",
       "8": "08 - 被袭击的教室 H",
       "9": "09 - 被袭击的教室 I",
-      "10": "10 - 被袭击的教室 J（仅日服）"
+      "10": "10 - 被袭击的教室 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -849,6 +853,16 @@
       "help": ""
     }
   },
+  "Momotalk": {
+    "_info": {
+      "name": "Momotalk",
+      "help": "工具需要停止调度器再单独运行"
+    },
+    "Enable": {
+      "name": "",
+      "help": ""
+    }
+  },
   "Gui": {
     "Aside": {
       "Install": "安装",

module/webui/app.py

@@ -611,7 +611,7 @@ class AlasGUI(Frame):
                 [
                     put_scope("scheduler-bar"),
                     put_scope("groups"),
-                    put_scope("log-bar"),
+                    put_scope("daemon-log-bar"),
                     put_scope("log", [put_html("")]),
                 ],
             )
@@ -625,7 +625,7 @@ class AlasGUI(Frame):
                         [
                             put_scope(
                                 "_daemon_upper",
-                                [put_scope("scheduler-bar"), put_scope("log-bar")],
+                                [put_scope("scheduler-bar"), put_scope("daemon-log-bar")],
                             ),
                             put_scope("groups"),
                             put_scope("log", [put_html("")]),
@@ -654,7 +654,8 @@ class AlasGUI(Frame):
             scope="scheduler_btn",
         )
 
-        with use_scope("log-bar"):
+        with use_scope("daemon-log-bar"):
+            with use_scope("log-title"):
                 put_text(t("Gui.Overview.Log")).style(
                     "font-size: 1.25rem; margin: auto .5rem auto;"
                 )

module/webui/process_manager.py

@@ -6,11 +6,12 @@ from multiprocessing import Process
 from typing import Dict, List, Union
 
 from filelock import FileLock
+from rich.console import Console, ConsoleRenderable
+
 from module.config.utils import filepath_config
 from module.logger import logger, set_file_logger, set_func_logger
 from module.webui.fake import get_config_mod, mod_instance
 from module.webui.setting import State
-from rich.console import Console, ConsoleRenderable
 
 
 class ProcessManager:
@@ -147,6 +148,10 @@ class ProcessManager:
                 if e is not None:
                     AzurLaneAutoScript.stop_event = e
                 ArisuAutoSweeper(config_name=config_name).loop()
+            elif func == "Momotalk":
+                from tasks.momotalk.momotalk import MomoTalk
+
+                MomoTalk(config=config_name, task="Momotalk").run()
             else:
                 logger.critical(f"No function matched: {func}")
             logger.info(f"[{config_name}] exited. Reason: Finish\n")

tasks/base/assets/assets_base_page.py

@@ -207,6 +207,13 @@ GACHA_CHECK = ButtonWrapper(
 )
 HOME = ButtonWrapper(
     name='HOME',
+    jp=Button(
+        file='./assets/jp/base/page/HOME.png',
+        area=(1224, 10, 1250, 35),
+        search=(1204, 0, 1270, 55),
+        color=(162, 176, 202),
+        button=(1224, 10, 1250, 35),
+    ),
     share=Button(
         file='./assets/share/base/page/HOME.png',
         area=(1218, 8, 1253, 41),
@@ -251,6 +258,13 @@ MAIL_CHECK = ButtonWrapper(
 )
 MAIN_GO_TO_CAFE = ButtonWrapper(
     name='MAIN_GO_TO_CAFE',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_CAFE.png',
+        area=(86, 632, 113, 670),
+        search=(66, 612, 133, 690),
+        color=(174, 222, 246),
+        button=(86, 632, 113, 670),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
         area=(81, 638, 102, 668),
@@ -261,6 +275,13 @@ MAIN_GO_TO_CAFE = ButtonWrapper(
 )
 MAIN_GO_TO_CIRCLE = ButtonWrapper(
     name='MAIN_GO_TO_CIRCLE',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_CIRCLE.png',
+        area=(531, 631, 561, 659),
+        search=(511, 611, 581, 679),
+        color=(182, 230, 254),
+        button=(531, 631, 561, 659),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
         area=(542, 630, 581, 665),
@@ -271,6 +292,13 @@ MAIN_GO_TO_CIRCLE = ButtonWrapper(
 )
 MAIN_GO_TO_CRAFTING = ButtonWrapper(
     name='MAIN_GO_TO_CRAFTING',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_CRAFTING.png',
+        area=(645, 627, 667, 662),
+        search=(625, 607, 687, 682),
+        color=(206, 235, 251),
+        button=(645, 627, 667, 662),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
         area=(665, 622, 693, 664),
@@ -281,6 +309,13 @@ MAIN_GO_TO_CRAFTING = ButtonWrapper(
 )
 MAIN_GO_TO_GACHA = ButtonWrapper(
     name='MAIN_GO_TO_GACHA',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_GACHA.png',
+        area=(871, 626, 893, 671),
+        search=(851, 606, 913, 691),
+        color=(172, 223, 242),
+        button=(871, 626, 893, 671),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
         area=(900, 623, 924, 670),
@@ -291,6 +326,13 @@ MAIN_GO_TO_GACHA = ButtonWrapper(
 )
 MAIN_GO_TO_MAIL = ButtonWrapper(
     name='MAIN_GO_TO_MAIL',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_MAIL.png',
+        area=(1144, 27, 1165, 44),
+        search=(1124, 7, 1185, 64),
+        color=(102, 125, 168),
+        button=(1144, 27, 1165, 44),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_MAIL.png',
         area=(1130, 29, 1156, 49),
@@ -301,33 +343,47 @@ MAIN_GO_TO_MAIL = ButtonWrapper(
 )
 MAIN_GO_TO_MOMOTALK = ButtonWrapper(
     name='MAIN_GO_TO_MOMOTALK',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_MOMOTALK.png',
+        area=(125, 118, 146, 151),
+        search=(105, 98, 166, 171),
+        color=(244, 200, 211),
+        button=(125, 118, 146, 151),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_MOMOTALK.png',
-        area=(154, 134, 177, 158),
-        search=(134, 114, 197, 178),
-        color=(255, 219, 227),
-        button=(154, 134, 177, 158),
+        area=(138, 130, 159, 161),
+        search=(118, 110, 179, 181),
+        color=(251, 215, 224),
+        button=(138, 130, 159, 161),
     ),
 )
 MAIN_GO_TO_PURCHASE = ButtonWrapper(
     name='MAIN_GO_TO_PURCHASE',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_PURCHASE.png',
-        area=(147, 214, 179, 254),
-        search=(127, 194, 199, 274),
-        color=(171, 216, 241),
-        button=(147, 214, 179, 254),
+        area=(122, 209, 148, 243),
+        search=(102, 189, 168, 263),
+        color=(190, 222, 246),
+        button=(122, 209, 148, 243),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_PURCHASE.png',
-        area=(148, 204, 183, 253),
-        search=(128, 184, 203, 273),
-        color=(172, 214, 239),
-        button=(148, 204, 183, 253),
+        area=(136, 210, 165, 250),
+        search=(116, 190, 185, 270),
+        color=(175, 216, 240),
+        button=(136, 210, 165, 250),
     ),
 )
 MAIN_GO_TO_SCHEDULE = ButtonWrapper(
     name='MAIN_GO_TO_SCHEDULE',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png',
+        area=(198, 634, 217, 667),
+        search=(178, 614, 237, 687),
+        color=(176, 222, 243),
+        button=(198, 634, 217, 667),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
         area=(194, 638, 216, 672),
@@ -338,6 +394,13 @@ MAIN_GO_TO_SCHEDULE = ButtonWrapper(
 )
 MAIN_GO_TO_SHOP = ButtonWrapper(
     name='MAIN_GO_TO_SHOP',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_SHOP.png',
+        area=(752, 628, 786, 665),
+        search=(732, 608, 806, 685),
+        color=(168, 221, 248),
+        button=(752, 628, 786, 665),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
         area=(773, 630, 816, 667),
@@ -348,36 +411,43 @@ MAIN_GO_TO_SHOP = ButtonWrapper(
 )
 MAIN_GO_TO_TASK = ButtonWrapper(
     name='MAIN_GO_TO_TASK',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_TASK.png',
+        area=(30, 214, 55, 248),
+        search=(10, 194, 75, 268),
+        color=(186, 218, 245),
+        button=(30, 214, 55, 248),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_TASK.png',
-        area=(52, 220, 78, 248),
-        search=(32, 200, 98, 268),
-        color=(226, 207, 203),
-        button=(52, 220, 78, 248),
+        area=(47, 219, 70, 246),
+        search=(27, 199, 90, 266),
+        color=(212, 204, 208),
+        button=(47, 219, 70, 246),
     ),
 )
 MAIN_GO_TO_WORK = ButtonWrapper(
     name='MAIN_GO_TO_WORK',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_WORK.png',
-        area=(1169, 588, 1239, 612),
-        search=(1149, 568, 1259, 632),
-        color=(150, 162, 180),
-        button=(1169, 588, 1239, 612),
+        area=(1167, 668, 1222, 688),
+        search=(1147, 648, 1242, 708),
+        color=(141, 156, 174),
+        button=(1167, 668, 1222, 688),
     ),
     en=Button(
         file='./assets/en/base/page/MAIN_GO_TO_WORK.png',
-        area=(1127, 605, 1250, 637),
-        search=(1107, 585, 1270, 657),
-        color=(90, 112, 141),
-        button=(1127, 605, 1250, 637),
+        area=(1143, 591, 1241, 613),
+        search=(1123, 571, 1261, 633),
+        color=(110, 129, 154),
+        button=(1143, 591, 1241, 613),
     ),
     zht=Button(
         file='./assets/zht/base/page/MAIN_GO_TO_WORK.png',
-        area=(1167, 595, 1277, 637),
-        search=(1147, 575, 1280, 657),
-        color=(73, 100, 133),
-        button=(1167, 595, 1277, 637),
+        area=(1188, 586, 1241, 613),
+        search=(1168, 566, 1261, 633),
+        color=(141, 155, 174),
+        button=(1188, 586, 1241, 613),
     ),
 )
 MISSION_CHECK = ButtonWrapper(
@@ -406,6 +476,13 @@ MISSION_CHECK = ButtonWrapper(
 )
 MOMOTALK_CHECK = ButtonWrapper(
     name='MOMOTALK_CHECK',
+    jp=Button(
+        file='./assets/jp/base/page/MOMOTALK_CHECK.png',
+        area=(144, 107, 169, 130),
+        search=(124, 87, 189, 150),
+        color=(253, 211, 219),
+        button=(144, 107, 169, 130),
+    ),
     share=Button(
         file='./assets/share/base/page/MOMOTALK_CHECK.png',
         area=(144, 107, 169, 130),
@@ -596,10 +673,10 @@ WORK_GO_TO_BOUNTY = ButtonWrapper(
     name='WORK_GO_TO_BOUNTY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_BOUNTY.png',
-        area=(667, 383, 764, 409),
-        search=(647, 363, 784, 429),
-        color=(171, 187, 212),
-        button=(667, 383, 764, 409),
+        area=(679, 401, 741, 417),
+        search=(659, 381, 761, 437),
+        color=(155, 164, 186),
+        button=(679, 401, 741, 417),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
@@ -620,10 +697,10 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper(
     name='WORK_GO_TO_COMMISSIONS',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_COMMISSIONS.png',
-        area=(653, 475, 749, 501),
-        search=(633, 455, 769, 521),
-        color=(171, 185, 208),
-        button=(653, 475, 749, 501),
+        area=(661, 504, 724, 521),
+        search=(641, 484, 744, 541),
+        color=(155, 163, 184),
+        button=(661, 504, 724, 521),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
@@ -668,10 +745,10 @@ WORK_GO_TO_MISSION = ButtonWrapper(
     name='WORK_GO_TO_MISSION',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_MISSION.png',
-        area=(722, 155, 807, 199),
-        search=(702, 135, 827, 219),
-        color=(173, 188, 211),
-        button=(722, 155, 807, 199),
+        area=(710, 220, 769, 249),
+        search=(690, 200, 789, 269),
+        color=(137, 153, 180),
+        button=(710, 220, 769, 249),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
@@ -692,10 +769,10 @@ WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
     name='WORK_GO_TO_SCHOOL_EXCHANGE',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
-        area=(636, 566, 753, 592),
-        search=(616, 546, 773, 612),
-        color=(176, 187, 207),
-        button=(636, 566, 753, 592),
+        area=(642, 606, 721, 624),
+        search=(622, 586, 741, 644),
+        color=(167, 174, 192),
+        button=(642, 606, 721, 624),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
@@ -716,10 +793,10 @@ WORK_GO_TO_STORY = ButtonWrapper(
     name='WORK_GO_TO_STORY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_STORY.png',
-        area=(998, 155, 1078, 199),
-        search=(978, 135, 1098, 219),
-        color=(215, 221, 232),
-        button=(998, 155, 1078, 199),
+        area=(993, 220, 1081, 250),
+        search=(973, 200, 1101, 270),
+        color=(209, 214, 224),
+        button=(993, 220, 1081, 250),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_STORY.png',
@@ -740,10 +817,10 @@ WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
     name='WORK_GO_TO_TACTICAL_CHALLENGE',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
-        area=(801, 565, 920, 593),
-        search=(781, 545, 940, 613),
-        color=(172, 186, 209),
-        button=(801, 565, 920, 593),
+        area=(821, 600, 911, 620),
+        search=(801, 580, 931, 640),
+        color=(156, 164, 185),
+        button=(821, 600, 911, 620),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',

tasks/base/ui.py

@@ -1,10 +1,10 @@
 from module.base.button import ButtonWrapper
-from module.base.decorator import run_once, Config
+from module.base.decorator import Config, run_once
 from module.base.timer import Timer
 from module.base.utils import get_color
 from module.exception import GameNotRunningError, GamePageUnknownError, RequestHumanTakeover
 from module.logger import logger
-from module.ocr.ocr import Ocr, Digit
+from module.ocr.ocr import Digit, Ocr
 from tasks.base.assets.assets_base_page import BACK
 from tasks.base.main_page import MainPage
 from tasks.base.page import Page, page_main
@@ -23,7 +23,8 @@ class UI(MainPage):
     # temporary block check for jp
     @Config.when(Emulator_GameLanguage='jp')
     def appear_trademark_year(self):
-        return False
+        # this disables using back button in jp due to a login issue
+        return True
 
     @Config.when(Emulator_GameLanguage=None)
     def appear_trademark_year(self):

tasks/item/assets/assets_item_data.py

@@ -5,6 +5,13 @@ from module.base.button import Button, ButtonWrapper
 
 OCR_AP = ButtonWrapper(
     name='OCR_AP',
+    jp=Button(
+        file='./assets/jp/item/data/OCR_AP.png',
+        area=(512, 13, 597, 32),
+        search=(492, 0, 617, 52),
+        color=(199, 204, 208),
+        button=(512, 13, 597, 32),
+    ),
     share=Button(
         file='./assets/share/item/data/OCR_AP.png',
         area=(535, 13, 660, 36),
@@ -15,6 +22,13 @@ OCR_AP = ButtonWrapper(
 )
 OCR_DATA = ButtonWrapper(
     name='OCR_DATA',
+    jp=Button(
+        file='./assets/jp/item/data/OCR_DATA.png',
+        area=(716, 14, 1058, 33),
+        search=(696, 0, 1078, 53),
+        color=(211, 219, 224),
+        button=(716, 14, 1058, 33),
+    ),
     share=Button(
         file='./assets/share/item/data/OCR_DATA.png',
         area=(745, 11, 1069, 39),

tasks/momotalk/ui.py

@@ -1,9 +1,7 @@
-import cv2
 import numpy as np
 
-from module.base.base import ModuleBase
 from module.base.timer import Timer
-from module.base.utils import point_in_area, area_size
+from module.base.utils import area_size
 from module.logger import logger
 from module.ui.switch import Switch
 from tasks.base.page import page_main, page_momo_talk
@@ -24,23 +22,19 @@ SWITCH_SORT.add_state("descending", SORT_DESCENDING)
 
 """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
-CHATTING_TEMPLATE = CHATTING.matched_button.image
+REPLY_TEMPLATE = REPLY
+STORY_TEMPLATE = STORY
+CHATTING_TEMPLATE = CHATTING
 
 
 class MomoTalkUI(UI):
-    def __init__(self, config, device):
-        super().__init__(config, device)
-        self.swipe_vector_range = (0.65, 0.85)
-        self.list = CHAT_AREA
-        self.click_coords = self.device.click_methods.get(self.config.Emulator_ControlMethod, self.device.click_adb)
+    swipe_vector_range = (0.65, 0.85)
+    list = CHAT_AREA
 
-    def swipe_page(self, direction: str, main: ModuleBase, vector_range=None, reverse=False):
+    def swipe_page(self, direction: str, vector_range=None, reverse=False):
         """
         Args:
             direction: up, down
-            main:
             vector_range (tuple[float, float]):
             reverse (bool):
         """
@@ -58,7 +52,7 @@ class MomoTalkUI(UI):
 
         if reverse:
             vector = (-vector[0], -vector[1])
-        main.device.swipe_vector(vector, self.list.button)
+        self.device.swipe_vector(vector, self.list.button)
 
     def select_then_disappear(self, dest_enter: ButtonWrapper, dest_check: ButtonWrapper):
         timer = Timer(5, 10).start()
@@ -83,24 +77,19 @@ class MomoTalkUI(UI):
 
         return True
 
-    def click_all(self, template, x_add=0, y_add=0):
+    def click_all(self, template: ButtonWrapper, offset: tuple[int, int] = (0, 0)) -> bool:
         """
         Find the all the locations of the template adding an offset if specified and click them. 
         If after filter, no coords then swipe.
         """
-        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)
+        template.load_search(self.list.area)
+        template.matched_button._button_offset = offset
+        seen = template.match_multi_template(self.device.image, similarity=0.8)
         if seen:
-            if y_add != 0:
-                seen = filter(lambda x: point_in_area(x, CHAT_AREA.area), seen)
-                [self.click_coords(coords[0], coords[1]) for coords in seen]
-                self.swipe_page("down", self)
+            if any(offset):
+                for button in seen:
+                    self.device.click(button)
+                self.swipe_page("down")
             return True
         return False
 
@@ -157,10 +146,10 @@ class MomoTalkUI(UI):
                 return True
             elif self.click_all(CHATTING_TEMPLATE):
                 timer.reset()
-            elif self.click_all(REPLY_TEMPLATE, y_add=62):
+            elif self.click_all(REPLY_TEMPLATE, offset=(0, 62)):
                 logger.info("Clicked on reply")
                 timer.reset()
-            elif self.click_all(STORY_TEMPLATE, y_add=62):
+            elif self.click_all(STORY_TEMPLATE, offset=(0, 62)):
                 logger.info("Clicked on story")
                 timer.reset()
             elif timer.reached():