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": {
+    "Momotalk": {
-      "Enable": false,
+      "Enable": true
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "Momotalk",
-      "ServerUpdate": "04:00"
     }
   }
 }

module/config/argument/args.json

@@ -770,7 +770,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -792,7 +793,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -814,7 +816,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -1059,28 +1062,10 @@
     }
   },
   "Momotalk": {
-    "Scheduler": {
+    "Momotalk": {
       "Enable": {
         "type": "checkbox",
-        "value": false,
+        "value": true,
-        "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"
       }
     }

module/config/argument/argument.yaml

@@ -156,17 +156,17 @@ Bounty:
 Highway:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 DesertRailroad:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 Schoolhouse:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 
 Scrimmage:
@@ -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

@@ -87,15 +87,15 @@ class GeneratedConfig:
     Bounty_OnError = 'skip'  # stop, skip
 
     # Group `Highway`
-    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Highway_Count = 2
 
     # Group `DesertRailroad`
-    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     DesertRailroad_Count = 2
 
     # Group `Schoolhouse`
-    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Schoolhouse_Count = 2
 
     # Group `Scrimmage`
@@ -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": {
@@ -251,7 +255,7 @@
     },
     "SecondCafe": {
       "name": "Second Floor",
-      "help": "JP server only\nEnable auto switch to second floor and perform interaction"
+      "help": "Enable auto switch to second floor and perform interaction"
     }
   },
   "Invitation": {
@@ -502,7 +506,8 @@
       "6": "06 - Overpass F",
       "7": "07 - Overpass G",
       "8": "08 - Overpass H",
-      "9": "09 - Overpass I"
+      "9": "09 - Overpass I",
+      "10": "10 - Overpass J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -526,7 +531,8 @@
       "6": "06 - Abandoned Train F",
       "7": "07 - Abandoned Train G",
       "8": "08 - Abandoned Train H",
-      "9": "09 - Abandoned Train I"
+      "9": "09 - Abandoned Train I",
+      "10": "10 - Abandoned Train J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -550,7 +556,8 @@
       "6": "06 - Besieged Classroom F",
       "7": "07 - Besieged Classroom G",
       "8": "08 - Besieged Classroom H",
-      "9": "09 - Besieged Classroom I"
+      "9": "09 - Besieged Classroom I",
+      "10": "10 - Besieged Classroom J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -846,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": {
@@ -251,7 +255,7 @@
     },
     "SecondCafe": {
       "name": "第二咖啡厅",
-      "help": "仅支持日服\n自动切换第二咖啡厅进行互动点击"
+      "help": "自动切换第二咖啡厅进行互动点击"
     }
   },
   "Invitation": {
@@ -502,7 +506,8 @@
       "6": "06 - 高架公路 F",
       "7": "07 - 高架公路 G",
       "8": "08 - 高架公路 H",
-      "9": "09 - 高架公路 I"
+      "9": "09 - 高架公路 I",
+      "10": "10 - 高架公路 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -526,7 +531,8 @@
       "6": "06 - 被遗弃的列车 F",
       "7": "07 - 被遗弃的列车 G",
       "8": "08 - 被遗弃的列车 H",
-      "9": "09 - 被遗弃的列车 I"
+      "9": "09 - 被遗弃的列车 I",
+      "10": "10 - 被遗弃的列车 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -550,7 +556,8 @@
       "6": "06 - 被袭击的教室 F",
       "7": "07 - 被袭击的教室 G",
       "8": "08 - 被袭击的教室 H",
-      "9": "09 - 被袭击的教室 I"
+      "9": "09 - 被袭击的教室 I",
+      "10": "10 - 被袭击的教室 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -846,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

@@ -65,24 +65,24 @@ CAFE_CHECK = ButtonWrapper(
     name='CAFE_CHECK',
     jp=Button(
         file='./assets/jp/base/page/CAFE_CHECK.png',
-        area=(264, 11, 337, 35),
+        area=(108, 11, 182, 36),
-        search=(244, 0, 357, 55),
+        search=(88, 0, 202, 56),
-        color=(188, 197, 205),
+        color=(191, 200, 208),
-        button=(264, 11, 337, 35),
+        button=(108, 11, 182, 36),
     ),
     en=Button(
         file='./assets/en/base/page/CAFE_CHECK.png',
-        area=(196, 8, 259, 37),
+        area=(106, 12, 167, 36),
-        search=(176, 0, 279, 57),
+        search=(86, 0, 187, 56),
-        color=(188, 197, 206),
+        color=(173, 184, 194),
-        button=(196, 8, 259, 37),
+        button=(106, 12, 167, 36),
     ),
     zht=Button(
         file='./assets/zht/base/page/CAFE_CHECK.png',
-        area=(94, 2, 307, 43),
+        area=(107, 9, 190, 38),
-        search=(74, 0, 327, 63),
+        search=(87, 0, 210, 58),
-        color=(187, 196, 201),
+        color=(154, 166, 178),
-        button=(94, 2, 307, 43),
+        button=(107, 9, 190, 38),
     ),
 )
 CIRCLE_CHECK = ButtonWrapper(
@@ -103,10 +103,10 @@ CIRCLE_CHECK = ButtonWrapper(
     ),
     zht=Button(
         file='./assets/zht/base/page/CIRCLE_CHECK.png',
-        area=(93, 3, 224, 39),
+        area=(106, 10, 161, 38),
-        search=(73, 0, 244, 59),
+        search=(86, 0, 181, 58),
-        color=(187, 197, 206),
+        color=(154, 167, 180),
-        button=(93, 3, 224, 39),
+        button=(106, 10, 161, 38),
     ),
 )
 COMMISSIONS_CHECK = ButtonWrapper(
@@ -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),
@@ -253,10 +260,10 @@ MAIN_GO_TO_CAFE = ButtonWrapper(
     name='MAIN_GO_TO_CAFE',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_CAFE.png',
-        area=(76, 638, 104, 674),
+        area=(86, 632, 113, 670),
-        search=(56, 618, 124, 694),
+        search=(66, 612, 133, 690),
-        color=(173, 212, 230),
+        color=(174, 222, 246),
-        button=(76, 638, 104, 674),
+        button=(86, 632, 113, 670),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
@@ -270,27 +277,27 @@ MAIN_GO_TO_CIRCLE = ButtonWrapper(
     name='MAIN_GO_TO_CIRCLE',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_CIRCLE.png',
-        area=(542, 630, 581, 665),
+        area=(531, 631, 561, 659),
-        search=(522, 610, 601, 685),
+        search=(511, 611, 581, 679),
-        color=(164, 225, 243),
+        color=(182, 230, 254),
-        button=(542, 630, 581, 665),
+        button=(531, 631, 561, 659),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
-        area=(540, 631, 583, 660),
+        area=(542, 630, 581, 665),
-        search=(520, 611, 603, 680),
+        search=(522, 610, 601, 685),
-        color=(131, 204, 234),
+        color=(163, 225, 242),
-        button=(540, 631, 583, 660),
+        button=(542, 630, 581, 665),
     ),
 )
 MAIN_GO_TO_CRAFTING = ButtonWrapper(
     name='MAIN_GO_TO_CRAFTING',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_CRAFTING.png',
-        area=(661, 620, 693, 668),
+        area=(645, 627, 667, 662),
-        search=(641, 600, 713, 688),
+        search=(625, 607, 687, 682),
-        color=(183, 216, 230),
+        color=(206, 235, 251),
-        button=(661, 620, 693, 668),
+        button=(645, 627, 667, 662),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
@@ -304,10 +311,10 @@ MAIN_GO_TO_GACHA = ButtonWrapper(
     name='MAIN_GO_TO_GACHA',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_GACHA.png',
-        area=(898, 631, 927, 663),
+        area=(871, 626, 893, 671),
-        search=(878, 611, 947, 683),
+        search=(851, 606, 913, 691),
-        color=(170, 229, 247),
+        color=(172, 223, 242),
-        button=(898, 631, 927, 663),
+        button=(871, 626, 893, 671),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
@@ -319,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),
@@ -329,32 +343,46 @@ 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),
+        area=(138, 130, 159, 161),
-        search=(134, 114, 197, 178),
+        search=(118, 110, 179, 181),
-        color=(255, 219, 227),
+        color=(251, 215, 224),
-        button=(154, 134, 177, 158),
+        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=(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),
+        area=(136, 210, 165, 250),
-        search=(128, 184, 203, 273),
+        search=(116, 190, 185, 270),
-        color=(172, 214, 239),
+        color=(175, 216, 240),
-        button=(148, 204, 183, 253),
+        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=(194, 646, 222, 672),
+        area=(198, 634, 217, 667),
-        search=(174, 626, 242, 692),
+        search=(178, 614, 237, 687),
-        color=(150, 197, 223),
+        color=(176, 222, 243),
-        button=(194, 646, 222, 672),
+        button=(198, 634, 217, 667),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
@@ -368,10 +396,10 @@ MAIN_GO_TO_SHOP = ButtonWrapper(
     name='MAIN_GO_TO_SHOP',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_SHOP.png',
-        area=(774, 628, 816, 670),
+        area=(752, 628, 786, 665),
-        search=(754, 608, 836, 690),
+        search=(732, 608, 806, 685),
-        color=(145, 203, 229),
+        color=(168, 221, 248),
-        button=(774, 628, 816, 670),
+        button=(752, 628, 786, 665),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
@@ -383,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),
+        area=(47, 219, 70, 246),
-        search=(32, 200, 98, 268),
+        search=(27, 199, 90, 266),
-        color=(226, 207, 203),
+        color=(212, 204, 208),
-        button=(52, 220, 78, 248),
+        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=(1167, 605, 1241, 632),
+        area=(1167, 668, 1222, 688),
-        search=(1147, 585, 1261, 652),
+        search=(1147, 648, 1242, 708),
-        color=(135, 149, 169),
+        color=(141, 156, 174),
-        button=(1167, 605, 1241, 632),
+        button=(1167, 668, 1222, 688),
     ),
     en=Button(
         file='./assets/en/base/page/MAIN_GO_TO_WORK.png',
-        area=(1127, 605, 1250, 637),
+        area=(1143, 591, 1241, 613),
-        search=(1107, 585, 1270, 657),
+        search=(1123, 571, 1261, 633),
-        color=(90, 112, 141),
+        color=(110, 129, 154),
-        button=(1127, 605, 1250, 637),
+        button=(1143, 591, 1241, 613),
     ),
     zht=Button(
         file='./assets/zht/base/page/MAIN_GO_TO_WORK.png',
-        area=(1167, 595, 1277, 637),
+        area=(1188, 586, 1241, 613),
-        search=(1147, 575, 1280, 657),
+        search=(1168, 566, 1261, 633),
-        color=(73, 100, 133),
+        color=(141, 155, 174),
-        button=(1167, 595, 1277, 637),
+        button=(1188, 586, 1241, 613),
     ),
 )
 MISSION_CHECK = ButtonWrapper(
@@ -441,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),
@@ -631,48 +673,48 @@ 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),
+        area=(679, 401, 741, 417),
-        search=(647, 363, 784, 429),
+        search=(659, 381, 761, 437),
-        color=(171, 187, 212),
+        color=(155, 164, 186),
-        button=(667, 383, 764, 409),
+        button=(679, 401, 741, 417),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
-        area=(671, 409, 760, 440),
+        area=(668, 385, 756, 412),
-        search=(651, 389, 780, 460),
+        search=(648, 365, 776, 432),
-        color=(183, 202, 227),
+        color=(180, 198, 223),
-        button=(671, 409, 760, 440),
+        button=(668, 385, 756, 412),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_BOUNTY.png',
-        area=(668, 410, 770, 438),
+        area=(667, 383, 769, 410),
-        search=(648, 390, 790, 458),
+        search=(647, 363, 789, 430),
-        color=(170, 185, 211),
+        color=(169, 184, 209),
-        button=(668, 410, 770, 438),
+        button=(667, 383, 769, 410),
     ),
 )
 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),
+        area=(661, 504, 724, 521),
-        search=(633, 455, 769, 521),
+        search=(641, 484, 744, 541),
-        color=(171, 185, 208),
+        color=(155, 163, 184),
-        button=(653, 475, 749, 501),
+        button=(661, 504, 724, 521),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
-        area=(656, 494, 803, 517),
+        area=(653, 477, 787, 496),
-        search=(636, 474, 823, 537),
+        search=(633, 457, 807, 516),
-        color=(192, 204, 221),
+        color=(187, 199, 218),
-        button=(656, 494, 803, 517),
+        button=(653, 477, 787, 496),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_COMMISSIONS.png',
-        area=(656, 492, 757, 519),
+        area=(654, 474, 753, 503),
-        search=(636, 472, 777, 539),
+        search=(634, 454, 773, 523),
-        color=(177, 190, 212),
+        color=(179, 192, 213),
-        button=(656, 492, 757, 519),
+        button=(654, 474, 753, 503),
     ),
 )
 WORK_GO_TO_EVENT = ButtonWrapper(
@@ -703,95 +745,95 @@ 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),
+        area=(710, 220, 769, 249),
-        search=(702, 135, 827, 219),
+        search=(690, 200, 789, 269),
-        color=(173, 188, 211),
+        color=(137, 153, 180),
-        button=(722, 155, 807, 199),
+        button=(710, 220, 769, 249),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
-        area=(720, 160, 871, 206),
+        area=(721, 158, 873, 197),
-        search=(700, 140, 891, 226),
+        search=(701, 138, 893, 217),
-        color=(192, 204, 221),
+        color=(180, 195, 215),
-        button=(720, 160, 871, 206),
+        button=(721, 158, 873, 197),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_MISSION.png',
-        area=(719, 152, 805, 202),
+        area=(720, 152, 812, 200),
-        search=(699, 132, 825, 222),
+        search=(700, 132, 832, 220),
-        color=(182, 194, 214),
+        color=(181, 195, 215),
-        button=(719, 152, 805, 202),
+        button=(720, 152, 812, 200),
     ),
 )
 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),
+        area=(642, 606, 721, 624),
-        search=(616, 546, 773, 612),
+        search=(622, 586, 741, 644),
-        color=(176, 187, 207),
+        color=(167, 174, 192),
-        button=(636, 566, 753, 592),
+        button=(642, 606, 721, 624),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
-        area=(643, 572, 778, 602),
+        area=(635, 569, 769, 597),
-        search=(623, 552, 798, 622),
+        search=(615, 549, 789, 617),
-        color=(190, 203, 221),
+        color=(198, 204, 216),
-        button=(643, 572, 778, 602),
+        button=(635, 569, 769, 597),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
-        area=(643, 575, 764, 601),
+        area=(635, 567, 761, 594),
-        search=(623, 555, 784, 621),
+        search=(615, 547, 781, 614),
-        color=(171, 185, 208),
+        color=(181, 191, 209),
-        button=(643, 575, 764, 601),
+        button=(635, 567, 761, 594),
     ),
 )
 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),
+        area=(993, 220, 1081, 250),
-        search=(978, 135, 1098, 219),
+        search=(973, 200, 1101, 270),
-        color=(215, 221, 232),
+        color=(209, 214, 224),
-        button=(998, 155, 1078, 199),
+        button=(993, 220, 1081, 250),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_STORY.png',
-        area=(994, 159, 1109, 211),
+        area=(996, 159, 1112, 205),
-        search=(974, 139, 1129, 231),
+        search=(976, 139, 1132, 225),
-        color=(208, 215, 228),
+        color=(200, 209, 225),
-        button=(994, 159, 1109, 211),
+        button=(996, 159, 1112, 205),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_STORY.png',
-        area=(995, 153, 1086, 201),
+        area=(991, 152, 1093, 202),
-        search=(975, 133, 1106, 221),
+        search=(971, 132, 1113, 222),
-        color=(181, 192, 212),
+        color=(190, 200, 218),
-        button=(995, 153, 1086, 201),
+        button=(991, 152, 1093, 202),
     ),
 )
 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),
+        area=(821, 600, 911, 620),
-        search=(781, 545, 940, 613),
+        search=(801, 580, 931, 640),
-        color=(172, 186, 209),
+        color=(156, 164, 185),
-        button=(801, 565, 920, 593),
+        button=(821, 600, 911, 620),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
-        area=(1012, 532, 1152, 591),
+        area=(803, 566, 922, 623),
-        search=(992, 512, 1172, 611),
+        search=(783, 546, 942, 643),
-        color=(199, 211, 227),
+        color=(186, 201, 220),
-        button=(1012, 532, 1152, 591),
+        button=(803, 566, 922, 623),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
-        area=(1014, 530, 1120, 569),
+        area=(801, 564, 908, 595),
-        search=(994, 510, 1140, 589),
+        search=(781, 544, 928, 615),
-        color=(190, 201, 219),
+        color=(179, 192, 213),
-        button=(1014, 530, 1120, 569),
+        button=(801, 564, 908, 595),
     ),
 )

tasks/base/assets/assets_base_popup.py

@@ -31,9 +31,9 @@ AP_EXCEED = ButtonWrapper(
     name='AP_EXCEED',
     jp=Button(
         file='./assets/jp/base/popup/AP_EXCEED.png',
-        area=(611, 147, 669, 177),
+        area=(400, 288, 879, 377),
-        search=(591, 127, 689, 197),
+        search=(380, 268, 899, 397),
-        color=(143, 156, 170),
+        color=(201, 202, 202),
         button=(539, 470, 743, 533),
     ),
     en=Button(
@@ -133,9 +133,9 @@ INSUFFICIENT_INVENTORY = ButtonWrapper(
     name='INSUFFICIENT_INVENTORY',
     jp=Button(
         file='./assets/jp/base/popup/INSUFFICIENT_INVENTORY.png',
-        area=(610, 124, 669, 153),
+        area=(371, 392, 896, 451),
-        search=(590, 104, 689, 173),
+        search=(351, 372, 916, 471),
-        color=(139, 153, 168),
+        color=(213, 218, 222),
         button=(535, 494, 746, 565),
     ),
     en=Button(

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):