perf: reduce config save times

README.en.md

@@ -22,7 +22,12 @@ The script is still under active development. The following features have been i
 Supported servers:
 
 - [x] JP
-- [x] OVERSEA - Global
+- [x] OVERSEA
+
+Supported in-game languages:
+
+- [x] Japanese
+- [x] English
 
 ## Relative projects
 

README.md

@@ -22,12 +22,18 @@
 目前支持的服务器：
 
 - [x] 日服
-- [x] 国际服 - 全球
+- [x] 国际服
+
+目前支持的游戏内语言：
+
+- [x] 日语
+- [x] 英语
 
 ## 已知问题
 
-若愿意提供其他服务器支持，请开 PR 或 Issue。
+若愿意提供其他语言或国服支持，请开 PR 或 Issue。
 
+- **国际服登录的全屏通知**：未实现自动关闭，正在研究中
 - **大小月卡**：未实现自动领取，~~因为没买过~~，可能不影响使用。愿意提供图片的请开 Issue
 - **月卡的额外悬赏券和学院交流券**：不太清楚月卡领取额外券的机制，~~因为没买过~~，可能影响相关任务使用券和体力的计算。愿意提供相关信息的请开
   Issue

config/deploy.template-cn.yaml

@@ -128,8 +128,8 @@ Deploy:
     WebuiHost: 0.0.0.0
     # --port. Port to listen
     # You will be able to access webui via `http://{host}:{port}`
-    # [In most cases] Default to 22367
-    WebuiPort: 22367
+    # [In most cases] Default to 23467
+    WebuiPort: 23467
     # Language to use on web ui
     # 'zh-CN' for Chinese simplified
     # 'en-US' for English

config/deploy.template.yaml

@@ -128,8 +128,8 @@ Deploy:
     WebuiHost: 0.0.0.0
     # --port. Port to listen
     # You will be able to access webui via `http://{host}:{port}`
-    # [In most cases] Default to 22367
-    WebuiPort: 22367
+    # [In most cases] Default to 23467
+    WebuiPort: 23467
     # Language to use on web ui
     # 'zh-CN' for Chinese simplified
     # 'en-US' for English

config/template.json

@@ -47,14 +47,6 @@
       "SecondCafe": true
     }
   },
-  "Mail": {
-    "Scheduler": {
-      "Enable": true,
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "Mail",
-      "ServerUpdate": "04:00"
-    }
-  },
   "Circle": {
     "Scheduler": {
       "Enable": true,
@@ -63,6 +55,14 @@
       "ServerUpdate": "04:00"
     }
   },
+  "Mail": {
+    "Scheduler": {
+      "Enable": true,
+      "NextRun": "2020-01-01 00:00:00",
+      "Command": "Mail",
+      "ServerUpdate": "04:00"
+    }
+  },
   "Bounty": {
     "Scheduler": {
       "Enable": true,

deploy/Windows/config.py

@@ -55,7 +55,7 @@ class ConfigModel:
 
     # Webui
     WebuiHost: str = "0.0.0.0"
-    WebuiPort: int = 22367
+    WebuiPort: int = 23467
     Language: str = "en-US"
     Theme: str = "default"
     DpiScaling: bool = True
@@ -77,6 +77,12 @@ class DeployConfig(ConfigModel):
         self.config_template = {}
         self.read()
 
+        self.set_repo()
+
+        self.write()
+        self.show_config()
+
+    def set_repo(self):
         # Bypass webui.config.DeployConfig.__setattr__()
         # Don't write these into deploy.yaml
         if self.Repository == 'cn':
@@ -84,9 +90,6 @@ class DeployConfig(ConfigModel):
         if self.Repository == 'global':
             super().__setattr__('Repository', 'https://github.com/TheFunny/ArisuAutoSweeper')
 
-        self.write()
-        self.show_config()
-
     def show_config(self):
         logger.hr("Show deploy config", 1)
         for k, v in self.config.items():

deploy/Windows/template.yaml

@@ -128,8 +128,8 @@ Deploy:
     WebuiHost: 0.0.0.0
     # --port. Port to listen
     # You will be able to access webui via `http://{host}:{port}`
-    # [In most cases] Default to 22367
-    WebuiPort: 22367
+    # [In most cases] Default to 23467
+    WebuiPort: 23467
     # Language to use on web ui
     # 'zh-CN' for Chinese simplified
     # 'en-US' for English

gui.py

@@ -49,7 +49,7 @@ def func(ev: threading.Event):
     args, _ = parser.parse_known_args()
 
     host = args.host or State.deploy_config.WebuiHost or "0.0.0.0"
-    port = args.port or int(State.deploy_config.WebuiPort) or 22367
+    port = args.port or int(State.deploy_config.WebuiPort) or 23467
     State.electron = args.electron
 
     logger.hr("Launcher config")

module/config/argument/args.json

@@ -12,6 +12,10 @@
         "option": [
           "auto",
           "JP-Official",
+          "OVERSEA-TWHKMO",
+          "OVERSEA-Korea",
+          "OVERSEA-Asia",
+          "OVERSEA-America",
           "OVERSEA-Global"
         ]
       },
@@ -203,33 +207,6 @@
       }
     }
   },
-  "Mail": {
-    "Scheduler": {
-      "Enable": {
-        "type": "checkbox",
-        "value": true,
-        "option": [
-          true,
-          false
-        ]
-      },
-      "NextRun": {
-        "type": "datetime",
-        "value": "2020-01-01 00:00:00",
-        "validate": "datetime"
-      },
-      "Command": {
-        "type": "input",
-        "value": "Mail",
-        "display": "hide"
-      },
-      "ServerUpdate": {
-        "type": "input",
-        "value": "04:00",
-        "display": "hide"
-      }
-    }
-  },
   "Circle": {
     "Scheduler": {
       "Enable": {
@@ -257,6 +234,33 @@
       }
     }
   },
+  "Mail": {
+    "Scheduler": {
+      "Enable": {
+        "type": "checkbox",
+        "value": true,
+        "option": [
+          true,
+          false
+        ]
+      },
+      "NextRun": {
+        "type": "datetime",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
+      },
+      "Command": {
+        "type": "input",
+        "value": "Mail",
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "04:00",
+        "display": "hide"
+      }
+    }
+  },
   "Bounty": {
     "Scheduler": {
       "Enable": {

module/config/argument/menu.json

@@ -12,8 +12,8 @@
     "page": "setting",
     "tasks": [
       "Cafe",
-      "Mail",
       "Circle",
+      "Mail",
       "Bounty",
       "Scrimmage",
       "TacticalChallenge",

module/config/argument/task.yaml

@@ -25,10 +25,10 @@ Daily:
     Cafe:
       - Scheduler
       - Cafe
-    Mail:
-      - Scheduler
     Circle:
       - Scheduler
+    Mail:
+      - Scheduler
     Bounty:
       - Scheduler
       - Bounty

module/config/config_generated.py

@@ -17,7 +17,7 @@ class GeneratedConfig:
 
     # Group `Emulator`
     Emulator_Serial = 'auto'
-    Emulator_PackageName = 'auto'  # auto, JP-Official, OVERSEA-Global
+    Emulator_PackageName = 'auto'  # auto, JP-Official, OVERSEA-TWHKMO, OVERSEA-Korea, OVERSEA-Asia, OVERSEA-America, OVERSEA-Global
     Emulator_GameLanguage = 'auto'  # auto, jp, en
     Emulator_ScreenshotMethod = 'auto'  # auto, ADB, ADB_nc, uiautomator2, aScreenCap, aScreenCap_nc, DroidCast, DroidCast_raw, scrcpy
     Emulator_ControlMethod = 'MaaTouch'  # minitouch, MaaTouch

module/config/i18n/en-US.json

@@ -22,14 +22,14 @@
       "name": "Cafe",
       "help": ""
     },
-    "Mail": {
-      "name": "Mailbox",
-      "help": ""
-    },
     "Circle": {
       "name": "Club",
       "help": ""
     },
+    "Mail": {
+      "name": "Mailbox",
+      "help": ""
+    },
     "Bounty": {
       "name": "Bounty",
       "help": ""
@@ -85,11 +85,15 @@
       "help": "Can't distinguish different regions of oversea servers, please select the server manually.",
       "auto": "Auto-detect",
       "JP-Official": "[JP]-Official",
+      "OVERSEA-TWHKMO": "[OVERSEA]-TW/HK/MO",
+      "OVERSEA-Korea": "[OVERSEA]-Korea",
+      "OVERSEA-Asia": "[OVERSEA]-Asia",
+      "OVERSEA-America": "[OVERSEA]-North America",
       "OVERSEA-Global": "[OVERSEA]-Global"
     },
     "GameLanguage": {
       "name": "In-game Text Language",
-      "help": "",
+      "help": "Can't detect language automatically, please select the language manually.",
       "auto": "Auto-detect",
       "jp": "Japanese",
       "en": "English"

module/config/i18n/zh-CN.json

@@ -22,14 +22,14 @@
       "name": "咖啡厅",
       "help": ""
     },
-    "Mail": {
-      "name": "邮箱",
-      "help": ""
-    },
     "Circle": {
       "name": "公会",
       "help": "社团 / 小组"
     },
+    "Mail": {
+      "name": "邮箱",
+      "help": ""
+    },
     "Bounty": {
       "name": "悬赏通缉",
       "help": ""
@@ -85,11 +85,15 @@
       "help": "无法区分国际服的不同地区，请手动选择服务器",
       "auto": "自动检测",
       "JP-Official": "[日服]-官服",
+      "OVERSEA-TWHKMO": "[国际服]-港澳台",
+      "OVERSEA-Korea": "[国际服]-韩国",
+      "OVERSEA-Asia": "[国际服]-亚洲",
+      "OVERSEA-America": "[国际服]-北美",
       "OVERSEA-Global": "[国际服]-全球"
     },
     "GameLanguage": {
       "name": "游戏内文本语言",
-      "help": "",
+      "help": "无法自动检测语言，请手动选择语言",
       "auto": "自动检测",
       "jp": "日语",
       "en": "英语"

module/config/server.py

@@ -8,6 +8,10 @@ server = 'JP-Official'
 VALID_LANG = ['jp', 'en']
 VALID_SERVER = {
     'JP-Official': 'com.YostarJP.BlueArchive',
+    'OVERSEA-TWHKMO': 'com.nexon.bluearchive',
+    'OVERSEA-Korea': 'com.nexon.bluearchive',
+    'OVERSEA-Asia': 'com.nexon.bluearchive',
+    'OVERSEA-America': 'com.nexon.bluearchive',
     'OVERSEA-Global': 'com.nexon.bluearchive',
 }
 VALID_PACKAGE = set(list(VALID_SERVER.values()))

module/config/utils.py

@@ -13,7 +13,11 @@ from module.config.atomicwrites import atomic_write
 LANGUAGES = ['zh-CN', 'en-US']
 SERVER_TO_TIMEZONE = {
     'JP-Official': timedelta(hours=9),
-    'OVERSEA-Global': timedelta(hours=0),
+    'OVERSEA-TWHKMO': timedelta(hours=9),
+    'OVERSEA-Korea': timedelta(hours=9),
+    'OVERSEA-Asia': timedelta(hours=9),
+    'OVERSEA-America': timedelta(hours=9),
+    'OVERSEA-Global': timedelta(hours=9),
 }
 DEFAULT_TIME = datetime(2020, 1, 1, 0, 0)
 

module/webui/remote_access.py

@@ -16,8 +16,8 @@ import time
 from subprocess import PIPE, Popen
 from typing import TYPE_CHECKING
 
-from module.logger import logger
 from module.config.utils import random_id
+from module.logger import logger
 from module.webui.setting import State
 
 if TYPE_CHECKING:
@@ -41,7 +41,7 @@ def am_i_the_only_thread() -> bool:
 
 def remote_access_service(
     local_host="127.0.0.1",
-    local_port=22367,
+        local_port=23467,
     server="app.pywebio.online",
     server_port=1022,
     remote_port="/",

module/webui/updater.py

@@ -5,6 +5,7 @@ import time
 from typing import Generator, List, Tuple
 
 import requests
+
 from deploy.Windows.config import ExecutionError
 from deploy.Windows.git import GitManager
 from deploy.Windows.pip import PipManager
@@ -20,6 +21,7 @@ from module.webui.utils import TaskHandler, get_next_time
 class Updater(DeployConfig, GitManager, PipManager):
     def __init__(self, file=DEPLOY_CONFIG):
         super().__init__(file=file)
+        self.set_repo()
         self.state = 0
         self.event: threading.Event = None
 
@@ -194,6 +196,7 @@ class Updater(DeployConfig, GitManager, PipManager):
 
     def update(self):
         logger.hr("Run update")
+        self.set_repo()
         try:
             self.git_install()
             self.pip_install()

tasks/base/assets/assets_base_page.py

@@ -22,15 +22,8 @@ ACCOUNT_INFO_CHECK = ButtonWrapper(
 )
 BACK = ButtonWrapper(
     name='BACK',
-    jp=Button(
-        file='./assets/jp/base/page/BACK.png',
-        area=(34, 19, 81, 56),
-        search=(14, 0, 101, 76),
-        color=(93, 118, 164),
-        button=(34, 19, 81, 56),
-    ),
-    en=Button(
-        file='./assets/en/base/page/BACK.png',
+    share=Button(
+        file='./assets/share/base/page/BACK.png',
         area=(34, 19, 81, 56),
         search=(14, 0, 101, 76),
         color=(93, 118, 164),
@@ -141,15 +134,8 @@ GACHA_CHECK = ButtonWrapper(
 )
 HOME = ButtonWrapper(
     name='HOME',
-    jp=Button(
-        file='./assets/jp/base/page/HOME.png',
-        area=(1218, 8, 1253, 41),
-        search=(1198, 0, 1273, 61),
-        color=(168, 182, 205),
-        button=(1218, 8, 1253, 41),
-    ),
-    en=Button(
-        file='./assets/en/base/page/HOME.png',
+    share=Button(
+        file='./assets/share/base/page/HOME.png',
         area=(1218, 8, 1253, 41),
         search=(1198, 0, 1273, 61),
         color=(168, 182, 205),
@@ -158,15 +144,8 @@ HOME = ButtonWrapper(
 )
 LOADING_CHECK = ButtonWrapper(
     name='LOADING_CHECK',
-    jp=Button(
-        file='./assets/jp/base/page/LOADING_CHECK.png',
-        area=(1084, 659, 1120, 674),
-        search=(1064, 639, 1140, 694),
-        color=(173, 196, 219),
-        button=(1084, 659, 1120, 674),
-    ),
-    en=Button(
-        file='./assets/en/base/page/LOADING_CHECK.png',
+    share=Button(
+        file='./assets/share/base/page/LOADING_CHECK.png',
         area=(1084, 659, 1120, 674),
         search=(1064, 639, 1140, 694),
         color=(173, 196, 219),
@@ -192,15 +171,8 @@ 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=(81, 638, 102, 668),
-        search=(61, 618, 122, 688),
-        color=(156, 209, 233),
-        button=(81, 638, 102, 668),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MAIN_GO_TO_CAFE.png',
+    share=Button(
+        file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
         area=(81, 638, 102, 668),
         search=(61, 618, 122, 688),
         color=(156, 209, 233),
@@ -209,15 +181,8 @@ 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=(540, 631, 583, 660),
-        search=(520, 611, 603, 680),
-        color=(131, 204, 234),
-        button=(540, 631, 583, 660),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MAIN_GO_TO_CIRCLE.png',
+    share=Button(
+        file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
         area=(540, 631, 583, 660),
         search=(520, 611, 603, 680),
         color=(131, 204, 234),
@@ -226,15 +191,8 @@ 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=(665, 622, 693, 664),
-        search=(645, 602, 713, 684),
-        color=(192, 229, 241),
-        button=(665, 622, 693, 664),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MAIN_GO_TO_CRAFTING.png',
+    share=Button(
+        file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
         area=(665, 622, 693, 664),
         search=(645, 602, 713, 684),
         color=(192, 229, 241),
@@ -243,15 +201,8 @@ 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=(900, 623, 924, 670),
-        search=(880, 603, 944, 690),
-        color=(157, 219, 241),
-        button=(900, 623, 924, 670),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MAIN_GO_TO_GACHA.png',
+    share=Button(
+        file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
         area=(900, 623, 924, 670),
         search=(880, 603, 944, 690),
         color=(157, 219, 241),
@@ -260,15 +211,8 @@ 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=(1130, 29, 1156, 49),
-        search=(1110, 9, 1176, 69),
-        color=(94, 121, 166),
-        button=(1130, 29, 1156, 49),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MAIN_GO_TO_MAIL.png',
+    share=Button(
+        file='./assets/share/base/page/MAIN_GO_TO_MAIL.png',
         area=(1130, 29, 1156, 49),
         search=(1110, 9, 1176, 69),
         color=(94, 121, 166),
@@ -277,15 +221,8 @@ 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=(154, 134, 177, 158),
-        search=(134, 114, 197, 178),
-        color=(255, 219, 227),
-        button=(154, 134, 177, 158),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MAIN_GO_TO_MOMOTALK.png',
+    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),
@@ -294,15 +231,8 @@ MAIN_GO_TO_MOMOTALK = ButtonWrapper(
 )
 MAIN_GO_TO_PURCHASE = ButtonWrapper(
     name='MAIN_GO_TO_PURCHASE',
-    jp=Button(
-        file='./assets/jp/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),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MAIN_GO_TO_PURCHASE.png',
+    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),
@@ -311,15 +241,8 @@ MAIN_GO_TO_PURCHASE = ButtonWrapper(
 )
 MAIN_GO_TO_SCHEDULE = ButtonWrapper(
     name='MAIN_GO_TO_SCHEDULE',
-    jp=Button(
-        file='./assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png',
-        area=(194, 638, 216, 672),
-        search=(174, 618, 236, 692),
-        color=(149, 194, 222),
-        button=(194, 638, 216, 672),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MAIN_GO_TO_SCHEDULE.png',
+    share=Button(
+        file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
         area=(194, 638, 216, 672),
         search=(174, 618, 236, 692),
         color=(149, 194, 222),
@@ -328,15 +251,8 @@ 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=(773, 630, 816, 667),
-        search=(753, 610, 836, 687),
-        color=(146, 208, 235),
-        button=(773, 630, 816, 667),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MAIN_GO_TO_SHOP.png',
+    share=Button(
+        file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
         area=(773, 630, 816, 667),
         search=(753, 610, 836, 687),
         color=(146, 208, 235),
@@ -345,15 +261,8 @@ 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=(52, 220, 78, 248),
-        search=(32, 200, 98, 268),
-        color=(226, 207, 203),
-        button=(52, 220, 78, 248),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MAIN_GO_TO_TASK.png',
+    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),
@@ -396,15 +305,8 @@ 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),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MOMOTALK_CHECK.png',
+    share=Button(
+        file='./assets/share/base/page/MOMOTALK_CHECK.png',
         area=(144, 107, 169, 130),
         search=(124, 87, 189, 150),
         color=(253, 211, 219),
@@ -413,15 +315,8 @@ MOMOTALK_CHECK = ButtonWrapper(
 )
 MOMOTALK_GO_TO_MAIN = ButtonWrapper(
     name='MOMOTALK_GO_TO_MAIN',
-    jp=Button(
-        file='./assets/jp/base/page/MOMOTALK_GO_TO_MAIN.png',
-        area=(1108, 105, 1134, 131),
-        search=(1088, 85, 1154, 151),
-        color=(252, 182, 194),
-        button=(1108, 105, 1134, 131),
-    ),
-    en=Button(
-        file='./assets/en/base/page/MOMOTALK_GO_TO_MAIN.png',
+    share=Button(
+        file='./assets/share/base/page/MOMOTALK_GO_TO_MAIN.png',
         area=(1108, 105, 1134, 131),
         search=(1088, 85, 1154, 151),
         color=(252, 182, 194),

tasks/base/assets/assets_base_popup.py

@@ -39,15 +39,8 @@ AP_EXCEED = ButtonWrapper(
 )
 DAILY_NEWS = ButtonWrapper(
     name='DAILY_NEWS',
-    jp=Button(
-        file='./assets/jp/base/popup/DAILY_NEWS.png',
-        area=(120, 89, 326, 113),
-        search=(100, 69, 346, 133),
-        color=(150, 204, 253),
-        button=(1128, 89, 1156, 117),
-    ),
-    en=Button(
-        file='./assets/en/base/popup/DAILY_NEWS.png',
+    share=Button(
+        file='./assets/share/base/popup/DAILY_NEWS.png',
         area=(120, 89, 326, 113),
         search=(100, 69, 346, 133),
         color=(150, 204, 253),
@@ -56,15 +49,8 @@ DAILY_NEWS = ButtonWrapper(
 )
 DAILY_REWARD = ButtonWrapper(
     name='DAILY_REWARD',
-    jp=Button(
-        file='./assets/jp/base/popup/DAILY_REWARD.png',
-        area=(416, 165, 434, 216),
-        search=(396, 145, 454, 236),
-        color=(203, 227, 237),
-        button=(920, 632, 1140, 712),
-    ),
-    en=Button(
-        file='./assets/en/base/popup/DAILY_REWARD.png',
+    share=Button(
+        file='./assets/share/base/popup/DAILY_REWARD.png',
         area=(416, 165, 434, 216),
         search=(396, 145, 454, 236),
         color=(203, 227, 237),
@@ -73,15 +59,8 @@ DAILY_REWARD = ButtonWrapper(
 )
 GET_NEW_STUDENT = ButtonWrapper(
     name='GET_NEW_STUDENT',
-    jp=Button(
-        file='./assets/jp/base/popup/GET_NEW_STUDENT.png',
-        area=(32, 93, 158, 114),
-        search=(12, 73, 178, 134),
-        color=(125, 132, 92),
-        button=(934, 643, 1263, 714),
-    ),
-    en=Button(
-        file='./assets/en/base/popup/GET_NEW_STUDENT.png',
+    share=Button(
+        file='./assets/share/base/popup/GET_NEW_STUDENT.png',
         area=(32, 93, 158, 114),
         search=(12, 73, 178, 134),
         color=(125, 132, 92),

tasks/bounty/assets/assets_bounty.py

@@ -12,7 +12,13 @@ CHECK_BOUNTY = ButtonWrapper(
         color=(88, 113, 139),
         button=(654, 87, 889, 129),
     ),
-    en=None,
+    en=Button(
+        file='./assets/en/bounty/CHECK_BOUNTY.png',
+        area=(654, 87, 891, 126),
+        search=(634, 67, 911, 146),
+        color=(92, 116, 141),
+        button=(654, 87, 891, 126),
+    ),
 )
 CHECK_DESERT_RAILROAD = ButtonWrapper(
     name='CHECK_DESERT_RAILROAD',
@@ -23,7 +29,13 @@ CHECK_DESERT_RAILROAD = ButtonWrapper(
         color=(172, 179, 183),
         button=(106, 147, 401, 179),
     ),
-    en=None,
+    en=Button(
+        file='./assets/en/bounty/CHECK_DESERT_RAILROAD.png',
+        area=(105, 144, 490, 183),
+        search=(85, 124, 510, 203),
+        color=(200, 207, 211),
+        button=(105, 144, 490, 183),
+    ),
 )
 CHECK_HIGHWAY = ButtonWrapper(
     name='CHECK_HIGHWAY',
@@ -34,7 +46,13 @@ CHECK_HIGHWAY = ButtonWrapper(
         color=(191, 199, 203),
         button=(107, 147, 400, 179),
     ),
-    en=None,
+    en=Button(
+        file='./assets/en/bounty/CHECK_HIGHWAY.png',
+        area=(104, 143, 391, 188),
+        search=(84, 123, 411, 208),
+        color=(206, 213, 217),
+        button=(104, 143, 391, 188),
+    ),
 )
 CHECK_SCHOOLHOUSE = ButtonWrapper(
     name='CHECK_SCHOOLHOUSE',
@@ -45,18 +63,30 @@ CHECK_SCHOOLHOUSE = ButtonWrapper(
         color=(176, 183, 187),
         button=(106, 147, 314, 179),
     ),
-    en=None,
+    en=Button(
+        file='./assets/en/bounty/CHECK_SCHOOLHOUSE.png',
+        area=(102, 144, 408, 185),
+        search=(82, 124, 428, 205),
+        color=(203, 210, 214),
+        button=(102, 144, 408, 185),
+    ),
 )
 OCR_TICKET = ButtonWrapper(
     name='OCR_TICKET',
     jp=Button(
         file='./assets/jp/bounty/OCR_TICKET.png',
-        area=(195, 85, 237, 113),
-        search=(175, 65, 257, 133),
-        color=(197, 206, 213),
-        button=(195, 85, 237, 113),
+        area=(196, 87, 258, 113),
+        search=(176, 67, 278, 133),
+        color=(173, 197, 212),
+        button=(196, 87, 258, 113),
+    ),
+    en=Button(
+        file='./assets/en/bounty/OCR_TICKET.png',
+        area=(229, 89, 285, 112),
+        search=(209, 69, 305, 132),
+        color=(177, 194, 207),
+        button=(229, 89, 285, 112),
     ),
-    en=None,
 )
 SELECT_DESERT_RAILROAD = ButtonWrapper(
     name='SELECT_DESERT_RAILROAD',
@@ -67,7 +97,13 @@ SELECT_DESERT_RAILROAD = ButtonWrapper(
         color=(178, 188, 199),
         button=(1066, 271, 1224, 311),
     ),
-    en=None,
+    en=Button(
+        file='./assets/en/bounty/SELECT_DESERT_RAILROAD.png',
+        area=(989, 270, 1223, 308),
+        search=(969, 250, 1243, 328),
+        color=(196, 203, 212),
+        button=(989, 270, 1223, 308),
+    ),
 )
 SELECT_HIGHWAY = ButtonWrapper(
     name='SELECT_HIGHWAY',
@@ -78,7 +114,13 @@ SELECT_HIGHWAY = ButtonWrapper(
         color=(214, 221, 228),
         button=(1065, 165, 1223, 203),
     ),
-    en=None,
+    en=Button(
+        file='./assets/en/bounty/SELECT_HIGHWAY.png',
+        area=(1073, 167, 1223, 202),
+        search=(1053, 147, 1243, 222),
+        color=(192, 201, 211),
+        button=(1073, 167, 1223, 202),
+    ),
 )
 SELECT_SCHOOLHOUSE = ButtonWrapper(
     name='SELECT_SCHOOLHOUSE',
@@ -89,5 +131,11 @@ SELECT_SCHOOLHOUSE = ButtonWrapper(
         color=(173, 185, 198),
         button=(1154, 381, 1223, 417),
     ),
-    en=None,
+    en=Button(
+        file='./assets/en/bounty/SELECT_SCHOOLHOUSE.png',
+        area=(1055, 378, 1226, 415),
+        search=(1035, 358, 1246, 435),
+        color=(198, 206, 215),
+        button=(1055, 378, 1226, 415),
+    ),
 )

tasks/bounty/bounty.py

@@ -41,8 +41,9 @@ class Bounty(BountyUI):
         if action == 'stop':
             raise RequestHumanTakeover
         elif action == 'skip':
-            self.config.task_delay(server_update=True)
-            self.config.task_stop()
+            with self.config.multi_set():
+                self.config.task_delay(server_update=True)
+                self.config.task_stop()
 
     @property
     def is_ticket_enough(self) -> bool:

tasks/cafe/assets/assets_cafe.py

@@ -5,19 +5,22 @@ from module.base.button import Button, ButtonWrapper
 
 BOX_CAFE = ButtonWrapper(
     name='BOX_CAFE',
-    jp=Button(
-        file='./assets/jp/cafe/BOX_CAFE.png',
+    share=Button(
+        file='./assets/share/cafe/BOX_CAFE.png',
         area=(33, 130, 1247, 569),
         search=(13, 110, 1267, 589),
         color=(175, 181, 186),
         button=(33, 130, 1247, 569),
     ),
-    en=Button(
-        file='./assets/en/cafe/BOX_CAFE.png',
-        area=(33, 130, 1247, 569),
-        search=(13, 110, 1267, 589),
-        color=(175, 181, 186),
-        button=(33, 130, 1247, 569),
+)
+BOX_SEARCH = ButtonWrapper(
+    name='BOX_SEARCH',
+    share=Button(
+        file='./assets/share/cafe/BOX_SEARCH.png',
+        area=(12, 71, 1176, 654),
+        search=(0, 51, 1196, 674),
+        color=(175, 183, 190),
+        button=(12, 71, 1176, 654),
     ),
 )
 CAFE_FIRST = ButtonWrapper(
@@ -107,15 +110,8 @@ CHECK_REWARD = ButtonWrapper(
 )
 CLICKABLE_TEMPLATE = ButtonWrapper(
     name='CLICKABLE_TEMPLATE',
-    jp=Button(
-        file='./assets/jp/cafe/CLICKABLE_TEMPLATE.png',
-        area=(619, 332, 660, 387),
-        search=(599, 312, 680, 407),
-        color=(79, 65, 1),
-        button=(619, 332, 660, 387),
-    ),
-    en=Button(
-        file='./assets/en/cafe/CLICKABLE_TEMPLATE.png',
+    share=Button(
+        file='./assets/share/cafe/CLICKABLE_TEMPLATE.png',
         area=(619, 332, 660, 387),
         search=(599, 312, 680, 407),
         color=(79, 65, 1),