feat: add en and Global server options

README.en.md

@@ -0,0 +1,40 @@
+<img width="150" height="150" align="left" style="float: left; margin: 0 10px 0 0;" alt="AAS icon" src="docs/resources/aas_icon.svg"/>
+
+# ArisuAutoSweeper
+
+**Blue Archive Automation Script**
+
+**| English | [简体中文](README.md) |**
+
+![gui_en.png](docs/resources/gui_en.png)
+
+## Features
+
+The script is still under active development. The following features have been implemented:
+
+- [x] **Cafe** Claim rewards / Interact / Second cafe
+- [x] **Circle** Claim AP
+- [x] **Mailbox** Claim rewards
+- [x] **Tactical Challenge** Claim rewards / Auto battle
+
+_Currently only supports JP server._
+
+## Relative projects
+
+- [AzurLaneAutoScript](https://github.com/LmeSzinc/AzurLaneAutoScript): Azur Lane auto script
+- [StarRailCopilot](https://github.com/LmeSzinc/StarRailCopilot): A bot for Honkai: Star Rail, based on the next
+  generation of ALAS framework
+
+Some Blue Archive auto scripts:
+
+- [BAAuto](https://github.com/RedDeadDepresso/BAAuto): Blue Archive Automation Script
+- [BlueArchiveAutoScript](https://github.com/pur1fying/blue_archive_auto_script): BAAS, used to implement Blue Archive
+  automation
+- [MBA](https://github.com/MaaAssistantArknights/MBA): BA assistant based on the new architecture of MAA
+
+## Acknowledgements
+
+Thanks to [6bir](https://github.com/6bir) for the icon design.
+
+Thanks to [Alas](https://github.com/LmeSzinc/AzurLaneAutoScript) and [SRC](https://github.com/LmeSzinc/StarRailCopilot)
+for the development framework.

README.md

@@ -0,0 +1,38 @@
+<img width="150" height="150" align="left" style="float: left; margin: 0 10px 0 0;" alt="AAS icon" src="docs/resources/aas_icon.svg"/>
+
+# ArisuAutoSweeper
+
+**蔚蓝档案自动化脚本**
+
+**| [English](README.en.md) | 简体中文 |**
+
+![gui_cn.png](docs/resources/gui_cn.png)
+
+## 功能
+
+当前脚本还在活跃开发中，已经实现的功能有：
+
+- [x] **咖啡厅** 领取奖励 / 互动 / 第二咖啡厅
+- [x] **公会** 领取体力
+- [x] **邮箱** 领取奖励
+- [x] **战术对抗赛** 领取奖励 / 自动战斗
+
+_目前仅支持日服。_
+
+## 相关项目
+
+- [AzurLaneAutoScript](https://github.com/LmeSzinc/AzurLaneAutoScript): 碧蓝航线自动化脚本
+- [StarRailCopilot](https://github.com/LmeSzinc/StarRailCopilot): 崩坏：星穹铁道脚本，基于下一代Alas框架
+
+一些蔚蓝档案脚本：
+
+- [BAAuto](https://github.com/RedDeadDepresso/BAAuto): 蔚蓝档案自动脚本
+- [BlueArchiveAutoScript](https://github.com/pur1fying/blue_archive_auto_script): BAAS，用于实现蔚蓝档案自动化
+- [MBA](https://github.com/MaaAssistantArknights/MBA): 基于 MAA 全新架构的 BA 小助手
+
+## 鸣谢
+
+感谢 [6bir](https://github.com/6bir) 为本项目设计的图标。
+
+感谢 [Alas](https://github.com/LmeSzinc/AzurLaneAutoScript) 以及 [SRC](https://github.com/LmeSzinc/StarRailCopilot)
+提供的开发框架。

config/deploy.template-cn.yaml

@@ -1,8 +1,8 @@
 Deploy:
   Git:
     # URL of AzurLaneAutoScript repository
-    # [CN user] Use 'cn' to get update from git-over-cdn service
-    # [Other] Use 'global' to get update from https://github.com/TheFunny/ArisuAutoSrcipt
+    # [CN user] Use 'cn' to get update from self-hosted git service
+    # [Other] Use 'global' to get update from https://github.com/TheFunny/ArisuAutoSweeper
     Repository: cn
     # Branch of Alas
     # [Developer] Use 'dev', 'app', etc, to try new features

config/deploy.template.yaml

@@ -1,8 +1,8 @@
 Deploy:
   Git:
     # URL of AzurLaneAutoScript repository
-    # [CN user] Use 'cn' to get update from git-over-cdn service
-    # [Other] Use 'global' to get update from https://github.com/TheFunny/ArisuAutoSrcipt
+    # [CN user] Use 'cn' to get update from self-hosted git service
+    # [Other] Use 'global' to get update from https://github.com/TheFunny/ArisuAutoSweeper
     Repository: global
     # Branch of Alas
     # [Developer] Use 'dev', 'app', etc, to try new features

deploy/Windows/template.yaml

@@ -1,8 +1,8 @@
 Deploy:
   Git:
     # URL of AzurLaneAutoScript repository
-    # [CN user] Use 'cn' to get update from git-over-cdn service
-    # [Other] Use 'global' to get update from https://github.com/TheFunny/ArisuAutoSrcipt
+    # [CN user] Use 'cn' to get update from self-hosted git service
+    # [Other] Use 'global' to get update from https://github.com/TheFunny/ArisuAutoSweeper
     Repository: 'global'
     # Branch of Alas
     # [Developer] Use 'dev', 'app', etc, to try new features

module/config/argument/args.json

@@ -11,7 +11,8 @@
         "value": "auto",
         "option": [
           "auto",
-          "JP-Official"
+          "JP-Official",
+          "OVERSEA-Global"
         ]
       },
       "GameLanguage": {
@@ -19,7 +20,8 @@
         "value": "auto",
         "option": [
           "auto",
-          "jp"
+          "jp",
+          "en"
         ]
       },
       "ScreenshotMethod": {

module/config/argument/argument.yaml

@@ -23,7 +23,7 @@ Emulator:
     option: [ auto, ]
   GameLanguage:
     value: auto
-    option: [ auto, jp ]
+    option: [ auto, jp, en ]
   ScreenshotMethod:
     value: auto
     option: [ auto, ADB, ADB_nc, uiautomator2, aScreenCap, aScreenCap_nc, DroidCast, DroidCast_raw, scrcpy ]

module/config/config_generated.py

@@ -17,8 +17,8 @@ class GeneratedConfig:
 
     # Group `Emulator`
     Emulator_Serial = 'auto'
-    Emulator_PackageName = 'auto'  # auto, JP-Official
-    Emulator_GameLanguage = 'auto'  # auto, jp
+    Emulator_PackageName = 'auto'  # auto, JP-Official, 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
     Emulator_AdbRestart = False

module/config/i18n/en-US.json

@@ -1,93 +1,95 @@
 {
   "Menu": {
     "Alas": {
-      "name": "Menu.Alas.name",
-      "help": "Menu.Alas.help"
+      "name": "AAS",
+      "help": ""
     },
     "Daily": {
-      "name": "Menu.Daily.name",
-      "help": "Menu.Daily.help"
+      "name": "Daily",
+      "help": ""
     }
   },
   "Task": {
     "Alas": {
-      "name": "Task.Alas.name",
-      "help": "Task.Alas.help"
+      "name": "AAS Settings",
+      "help": ""
     },
     "Restart": {
-      "name": "Task.Restart.name",
-      "help": "Task.Restart.help"
+      "name": "Error Handling",
+      "help": ""
     },
     "Cafe": {
-      "name": "Task.Cafe.name",
-      "help": "Task.Cafe.help"
+      "name": "Cafe",
+      "help": ""
     },
     "Mail": {
-      "name": "Task.Mail.name",
-      "help": "Task.Mail.help"
+      "name": "Mailbox",
+      "help": ""
     },
     "Circle": {
-      "name": "Task.Circle.name",
-      "help": "Task.Circle.help"
+      "name": "Club",
+      "help": ""
     },
     "TacticalChallenge": {
-      "name": "Task.TacticalChallenge.name",
-      "help": "Task.TacticalChallenge.help"
+      "name": "Tactical Challenge",
+      "help": ""
     },
     "DataUpdate": {
-      "name": "Task.DataUpdate.name",
-      "help": "Task.DataUpdate.help"
+      "name": "Dashboard Upd",
+      "help": ""
     }
   },
   "Scheduler": {
     "_info": {
-      "name": "Scheduler._info.name",
-      "help": "Scheduler._info.help"
+      "name": "Scheduler",
+      "help": ""
     },
     "Enable": {
-      "name": "Scheduler.Enable.name",
-      "help": "Scheduler.Enable.help",
-      "True": "True",
+      "name": "Enable Task",
+      "help": "Join this task to scheduler.",
+      "True": "Enabled",
       "False": "False"
     },
     "NextRun": {
-      "name": "Scheduler.NextRun.name",
-      "help": "Scheduler.NextRun.help"
+      "name": "Next Run",
+      "help": "Updated automatically after completing the task to set next scheduled run, typically not manually modified\nHowever you can force immediate scheduling if you clear this text field"
     },
     "Command": {
-      "name": "Scheduler.Command.name",
-      "help": "Scheduler.Command.help"
+      "name": "Command",
+      "help": ""
     },
     "ServerUpdate": {
-      "name": "Scheduler.ServerUpdate.name",
-      "help": "Scheduler.ServerUpdate.help"
+      "name": "Server Update",
+      "help": "Series of server refresh time(s) as to when this task will next run, this is automatically converted to respective time zone, generally do not need to modify"
     }
   },
   "Emulator": {
     "_info": {
-      "name": "Emulator._info.name",
-      "help": "Emulator._info.help"
+      "name": "Emulator Settings",
+      "help": ""
     },
     "Serial": {
-      "name": "Emulator.Serial.name",
-      "help": "Emulator.Serial.help"
+      "name": "Serial",
+      "help": "Common emulator Serial can be queried in the list below\nUse \"auto\" to auto-detect emulators, but if multiple emulators are running or use emulators that do not support auto-detect, \"auto\" cannot be used and serial must be filled in manually\nDefault serial for select emulators:\n- BlueStacks 127.0.0.1:5555\n- BlueStacks4 Hyper-V use \"bluestacks4-hyperv\", \"bluestacks4-hyperv-2\" for multi instance, and so on\n- BlueStacks5 Hyper-V use \"bluestacks5-hyperv\", \"bluestacks5-hyperv-1\" for multi instance, and so on\n- NoxPlayer 127.0.0.1:62001\n- NoxPlayer64bit 127.0.0.1:59865\n- MuMuPlayer/MuMuPlayer X 127.0.0.1:7555\n- MuMuPlayer12 127.0.0.1:16384\n- MemuPlayer 127.0.0.1:21503\n- LDPlayer emulator-5554 or 127.0.0.1:5555\n- WSA use \"wsa-0\" to make the game run in the background, which needs to be controlled or closed by third-party software\nIf there are multiple emulator instances running, the default is reserved for one of them and the others will use different serials to avoid conflicts\nOpen console.bat and run `adb devices` to find them or follow the emulator's official tutorial"
     },
     "PackageName": {
-      "name": "Emulator.PackageName.name",
-      "help": "Emulator.PackageName.help",
-      "auto": "auto",
-      "JP-Official": "JP-Official"
+      "name": "Game Server",
+      "help": "Can't distinguish different regions of oversea servers, please select the server manually.",
+      "auto": "Auto-detect",
+      "JP-Official": "[JP]-Official",
+      "OVERSEA-Global": "[OVERSEA]-Global"
     },
     "GameLanguage": {
-      "name": "Emulator.GameLanguage.name",
-      "help": "Emulator.GameLanguage.help",
-      "auto": "auto",
-      "jp": "jp"
+      "name": "In-game Text Language",
+      "help": "",
+      "auto": "Auto-detect",
+      "jp": "Japanese",
+      "en": "English"
     },
     "ScreenshotMethod": {
-      "name": "Emulator.ScreenshotMethod.name",
-      "help": "Emulator.ScreenshotMethod.help",
-      "auto": "auto",
+      "name": "Screenshot Method",
+      "help": "When using auto-select, a benchmark will be performed and automatically changed to the fastest screenshot method.\nGeneral speed: DroidCast_raw >> aScreenCap_nc > ADB_nc >>> aScreenCap > uiautomator2 ~= ADB.\nRun Tools - Performance Test to find the fastest method.",
+      "auto": "Auto-select the fastest",
       "ADB": "ADB",
       "ADB_nc": "ADB_nc",
       "uiautomator2": "uiautomator2",
@@ -98,127 +100,127 @@
       "scrcpy": "scrcpy"
     },
     "ControlMethod": {
-      "name": "Emulator.ControlMethod.name",
-      "help": "Emulator.ControlMethod.help",
+      "name": "Control Method",
+      "help": "Speed: MaaTouch = minitouch >>> uiautomator2 ~= ADB\nMaaTouch is recommended",
       "minitouch": "minitouch",
       "MaaTouch": "MaaTouch"
     },
     "AdbRestart": {
-      "name": "Emulator.AdbRestart.name",
-      "help": "Emulator.AdbRestart.help"
+      "name": "Try to restart adb when no device found",
+      "help": ""
     }
   },
   "EmulatorInfo": {
     "_info": {
-      "name": "EmulatorInfo._info.name",
-      "help": "EmulatorInfo._info.help"
+      "name": "Emulator Settings",
+      "help": "The following values are auto-filled according to \"Serial\", if you don’t understand, please don't modify them"
     },
     "Emulator": {
-      "name": "EmulatorInfo.Emulator.name",
-      "help": "EmulatorInfo.Emulator.help",
-      "auto": "auto",
-      "NoxPlayer": "NoxPlayer",
-      "NoxPlayer64": "NoxPlayer64",
-      "BlueStacks4": "BlueStacks4",
-      "BlueStacks5": "BlueStacks5",
-      "BlueStacks4HyperV": "BlueStacks4HyperV",
-      "BlueStacks5HyperV": "BlueStacks5HyperV",
-      "LDPlayer3": "LDPlayer3",
-      "LDPlayer4": "LDPlayer4",
-      "LDPlayer9": "LDPlayer9",
-      "MuMuPlayer": "MuMuPlayer",
-      "MuMuPlayerX": "MuMuPlayerX",
-      "MuMuPlayer12": "MuMuPlayer12",
-      "MEmuPlayer": "MEmuPlayer"
+      "name": "Emulator Type",
+      "help": "",
+      "auto": "Auto-detect",
+      "NoxPlayer": "Nox Player",
+      "NoxPlayer64": "Nox Player 64bit",
+      "BlueStacks4": "BlueStacks 4",
+      "BlueStacks5": "BlueStacks 5",
+      "BlueStacks4HyperV": "BlueStacks 4 Hyper-V",
+      "BlueStacks5HyperV": "BlueStacks 5 Hyper-V",
+      "LDPlayer3": "LD Player 3",
+      "LDPlayer4": "LD Player 4",
+      "LDPlayer9": "LD Player 9",
+      "MuMuPlayer": "MuMu Player",
+      "MuMuPlayerX": "MuMu Player X",
+      "MuMuPlayer12": "MuMu Player 12",
+      "MEmuPlayer": "MEmu Player"
     },
     "name": {
-      "name": "EmulatorInfo.name.name",
-      "help": "EmulatorInfo.name.help"
+      "name": "Emulator Instance Name",
+      "help": ""
     },
     "path": {
-      "name": "EmulatorInfo.path.name",
-      "help": "EmulatorInfo.path.help"
+      "name": "Emulator Installation Path",
+      "help": ""
     }
   },
   "Error": {
     "_info": {
-      "name": "Error._info.name",
-      "help": "Error._info.help"
+      "name": "Debug Settings",
+      "help": ""
     },
     "Restart": {
-      "name": "Error.Restart.name",
-      "help": "Error.Restart.help",
-      "game": "game",
-      "game_emulator": "game_emulator"
+      "name": "Restart Game on Error",
+      "help": "",
+      "game": "Restart game",
+      "game_emulator": "Restart emulator and game"
     },
     "SaveError": {
-      "name": "Error.SaveError.name",
-      "help": "Error.SaveError.help"
+      "name": "Record Exception",
+      "help": "Records exception and log into directory for review or sharing"
     },
     "ScreenshotLength": {
-      "name": "Error.ScreenshotLength.name",
-      "help": "Error.ScreenshotLength.help"
+      "name": "Record Screenshot(s)",
+      "help": "Number of screenshots saved when exception occurs"
     },
     "OnePushConfig": {
-      "name": "Error.OnePushConfig.name",
-      "help": "Error.OnePushConfig.help"
+      "name": "Error notify config",
+      "help": "When AAS cannot handle exception, send a message through Onepush. Configuration document: \nhttps://github.com/LmeSzinc/AzurLaneAutoScript/wiki/Onepush-configuration-%5BEN%5D"
     }
   },
   "Optimization": {
     "_info": {
-      "name": "Optimization._info.name",
-      "help": "Optimization._info.help"
+      "name": "Optimization Settings",
+      "help": ""
     },
     "ScreenshotInterval": {
-      "name": "Optimization.ScreenshotInterval.name",
-      "help": "Optimization.ScreenshotInterval.help"
+      "name": "Take Screenshots Every X Second(s)",
+      "help": "Minimum interval between 2 screenshots, limited in 0.1 ~ 0.3, can help reduce CPU on high-end PCs"
     },
     "CombatScreenshotInterval": {
-      "name": "Optimization.CombatScreenshotInterval.name",
-      "help": "Optimization.CombatScreenshotInterval.help"
+      "name": "Take Screenshots Every X Second(s) In Combat",
+      "help": "Minimum interval between 2 screenshots, limited in 0.1 ~ 1.0, can help reduce CPU during battle"
     },
     "WhenTaskQueueEmpty": {
-      "name": "Optimization.WhenTaskQueueEmpty.name",
-      "help": "Optimization.WhenTaskQueueEmpty.help",
-      "stay_there": "stay_there",
-      "goto_main": "goto_main",
-      "close_game": "close_game"
+      "name": "When Task Queue is Empty",
+      "help": "Close AL when there are no pending tasks, can help reduce CPU",
+      "stay_there": "Stay There",
+      "goto_main": "Goto Main Page",
+      "close_game": "Close Game"
     }
   },
   "Cafe": {
     "_info": {
-      "name": "Cafe._info.name",
-      "help": "Cafe._info.help"
+      "name": "Cafe Settings",
+      "help": ""
     },
     "Reward": {
-      "name": "Cafe.Reward.name",
-      "help": "Cafe.Reward.help"
+      "name": "Claim Reward",
+      "help": ""
     },
     "Touch": {
-      "name": "Cafe.Touch.name",
-      "help": "Cafe.Touch.help"
+      "name": "Student Interaction",
+      "help": "Auto detect intractable student and tap"
     },
     "AutoAdjust": {
-      "name": "Cafe.AutoAdjust.name",
-      "help": "Cafe.AutoAdjust.help"
+      "name": "Interface Auto Adjustment",
+      "help": "Auto adjust cafe interface for better student interaction"
     },
     "SecondCafe": {
-      "name": "Cafe.SecondCafe.name",
-      "help": "Cafe.SecondCafe.help"
+      "name": "Second Cafe",
+      "help": "Enable auto switch to second cafe and perform interaction"
     }
   },
   "TacticalChallenge": {
     "_info": {
-      "name": "TacticalChallenge._info.name",
-      "help": "TacticalChallenge._info.help"
+      "name": "Tactical Challenge Settings",
+      "help": ""
     },
     "PlayerSelect": {
-      "name": "TacticalChallenge.PlayerSelect.name",
-      "help": "TacticalChallenge.PlayerSelect.help",
-      "0": "0",
-      "1": "1",
-      "2": "2",
-      "3": "3"
+      "name": "Select Player",
+      "help": "",
+      "0": "Random",
+      "1": "First",
+      "2": "Second",
+      "3": "Third"
     }
   },
   "ItemStorage": {
@@ -227,118 +229,118 @@
       "help": "ItemStorage._info.help"
     },
     "AP": {
-      "name": "ItemStorage.AP.name",
-      "help": "ItemStorage.AP.help"
+      "name": "AP",
+      "help": ""
     },
     "Credit": {
-      "name": "ItemStorage.Credit.name",
-      "help": "ItemStorage.Credit.help"
+      "name": "Credit",
+      "help": ""
     },
     "Pyroxene": {
-      "name": "ItemStorage.Pyroxene.name",
-      "help": "ItemStorage.Pyroxene.help"
+      "name": "Pyroxene",
+      "help": ""
     }
   },
   "Gui": {
     "Aside": {
-      "Install": "Gui.Aside.Install",
-      "Home": "Gui.Aside.Home",
-      "Develop": "Gui.Aside.Develop",
-      "Performance": "Gui.Aside.Performance",
-      "Setting": "Gui.Aside.Setting",
-      "AddAlas": "Gui.Aside.AddAlas"
+      "Install": "Install",
+      "Home": "Home",
+      "Develop": "Develop",
+      "Performance": "Perf.",
+      "Setting": "Settings",
+      "AddAlas": "Add"
     },
     "Button": {
-      "Start": "Gui.Button.Start",
-      "Stop": "Gui.Button.Stop",
-      "ScrollON": "Gui.Button.ScrollON",
-      "ScrollOFF": "Gui.Button.ScrollOFF",
-      "ClearLog": "Gui.Button.ClearLog",
-      "Setting": "Gui.Button.Setting",
-      "CheckUpdate": "Gui.Button.CheckUpdate",
-      "ClickToUpdate": "Gui.Button.ClickToUpdate",
-      "RetryUpdate": "Gui.Button.RetryUpdate",
-      "CancelUpdate": "Gui.Button.CancelUpdate"
+      "Start": "Start",
+      "Stop": "Stop",
+      "ScrollON": "Auto Scroll ON",
+      "ScrollOFF": "Auto Scroll OFF",
+      "ClearLog": "Clear Log",
+      "Setting": "Setting",
+      "CheckUpdate": "Check update",
+      "ClickToUpdate": "Click to update",
+      "RetryUpdate": "Retry update",
+      "CancelUpdate": "Cancel update"
     },
     "Toast": {
-      "DisableTranslateMode": "Gui.Toast.DisableTranslateMode",
-      "ConfigSaved": "Gui.Toast.ConfigSaved",
-      "AlasIsRunning": "Gui.Toast.AlasIsRunning",
-      "ClickToUpdate": "Gui.Toast.ClickToUpdate"
+      "DisableTranslateMode": "Click here to disable translate mode",
+      "ConfigSaved": "Config saved",
+      "AlasIsRunning": "Scheduler is already running",
+      "ClickToUpdate": "New update available, click here to update"
     },
     "Status": {
-      "Running": "Gui.Status.Running",
-      "Inactive": "Gui.Status.Inactive",
-      "Warning": "Gui.Status.Warning",
-      "Updating": "Gui.Status.Updating"
+      "Running": "Running",
+      "Inactive": "Inactive",
+      "Warning": "Warning",
+      "Updating": "Waiting Update"
     },
     "MenuAlas": {
-      "Overview": "Gui.MenuAlas.Overview",
-      "Log": "Gui.MenuAlas.Log"
+      "Overview": "Overview",
+      "Log": "Logs"
     },
     "MenuDevelop": {
-      "HomePage": "Gui.MenuDevelop.HomePage",
-      "Translate": "Gui.MenuDevelop.Translate",
-      "Update": "Gui.MenuDevelop.Update",
-      "Remote": "Gui.MenuDevelop.Remote",
-      "Utils": "Gui.MenuDevelop.Utils"
+      "HomePage": "Home",
+      "Translate": "Translate",
+      "Update": "Updater",
+      "Remote": "Remote access",
+      "Utils": "Utils"
     },
     "Overview": {
-      "Scheduler": "Gui.Overview.Scheduler",
-      "Log": "Gui.Overview.Log",
-      "Running": "Gui.Overview.Running",
-      "Pending": "Gui.Overview.Pending",
-      "Waiting": "Gui.Overview.Waiting",
-      "NoTask": "Gui.Overview.NoTask"
+      "Scheduler": "Scheduler",
+      "Log": "Log",
+      "Running": "Running",
+      "Pending": "Pending",
+      "Waiting": "Waiting",
+      "NoTask": "No Task"
     },
     "Dashboard": {
-      "NoData": "Gui.Dashboard.NoData",
-      "TimeError": "Gui.Dashboard.TimeError",
-      "JustNow": "Gui.Dashboard.JustNow",
-      "MinutesAgo": "Gui.Dashboard.MinutesAgo",
-      "HoursAgo": "Gui.Dashboard.HoursAgo",
-      "DaysAgo": "Gui.Dashboard.DaysAgo",
-      "LongTimeAgo": "Gui.Dashboard.LongTimeAgo"
+      "NoData": "no data",
+      "TimeError": "time error",
+      "JustNow": "just now",
+      "MinutesAgo": "{time}min ago",
+      "HoursAgo": "{time}h ago",
+      "DaysAgo": "{time}d ago",
+      "LongTimeAgo": "long time ago"
     },
     "AddAlas": {
-      "PopupTitle": "Gui.AddAlas.PopupTitle",
-      "NewName": "Gui.AddAlas.NewName",
-      "CopyFrom": "Gui.AddAlas.CopyFrom",
-      "Confirm": "Gui.AddAlas.Confirm",
-      "FileExist": "Gui.AddAlas.FileExist",
-      "InvalidChar": "Gui.AddAlas.InvalidChar",
-      "InvalidPrefixTemplate": "Gui.AddAlas.InvalidPrefixTemplate"
+      "PopupTitle": "Add new config",
+      "NewName": "New name",
+      "CopyFrom": "Copy from existing config",
+      "Confirm": "Add",
+      "FileExist": "A config with the same name exists, please choose another one",
+      "InvalidChar": "Config name cannot contain any of the following characters: .\\/:*?\"<>|",
+      "InvalidPrefixTemplate": "Config name cannot start with 'template'"
     },
     "Update": {
-      "UpToDate": "Gui.Update.UpToDate",
-      "HaveUpdate": "Gui.Update.HaveUpdate",
-      "UpdateStart": "Gui.Update.UpdateStart",
-      "UpdateWait": "Gui.Update.UpdateWait",
-      "UpdateRun": "Gui.Update.UpdateRun",
-      "UpdateSuccess": "Gui.Update.UpdateSuccess",
-      "UpdateFailed": "Gui.Update.UpdateFailed",
-      "UpdateChecking": "Gui.Update.UpdateChecking",
-      "UpdateCancel": "Gui.Update.UpdateCancel",
-      "UpdateFinish": "Gui.Update.UpdateFinish",
-      "Local": "Gui.Update.Local",
-      "Upstream": "Gui.Update.Upstream",
-      "Author": "Gui.Update.Author",
-      "Time": "Gui.Update.Time",
-      "Message": "Gui.Update.Message",
-      "DisabledWarn": "Gui.Update.DisabledWarn",
-      "DetailedHistory": "Gui.Update.DetailedHistory"
+      "UpToDate": "Latest version",
+      "HaveUpdate": "A new version is available",
+      "UpdateStart": "Start update",
+      "UpdateWait": "Waiting for all AAS complete current task",
+      "UpdateRun": "Updating",
+      "UpdateSuccess": "Update succeeded, restarting",
+      "UpdateFailed": "Update failed. Logs can be found in ./log/*_gui.txt",
+      "UpdateChecking": "Checking for updates",
+      "UpdateCancel": "Update canceled, restarting AAS",
+      "UpdateFinish": "Update succeeded, please restart manually",
+      "Local": "Local",
+      "Upstream": "Upstream",
+      "Author": "Author",
+      "Time": "Commit time",
+      "Message": "Commit message",
+      "DisabledWarn": "Updater module is disabled. You need to manually restart AAS to update",
+      "DetailedHistory": "Detailed Commit History"
     },
     "Remote": {
-      "Running": "Gui.Remote.Running",
-      "NotRunning": "Gui.Remote.NotRunning",
-      "NotEnable": "Gui.Remote.NotEnable",
-      "EntryPoint": "Gui.Remote.EntryPoint",
-      "ConfigureHint": "Gui.Remote.ConfigureHint",
-      "SSHNotInstall": "Gui.Remote.SSHNotInstall"
+      "Running": "Remote access on",
+      "NotRunning": "Not running, server disconnected or offline",
+      "NotEnable": "Disabled, set webui password in deploy.yaml and enable remote access",
+      "EntryPoint": "Entry point:",
+      "ConfigureHint": "Configuration tutorial:",
+      "SSHNotInstall": "No SSH command in your system. Please refer to the tutorial to download or install one"
     },
     "Text": {
-      "InvalidFeedBack": "Gui.Text.InvalidFeedBack",
-      "Clear": "Gui.Text.Clear"
+      "InvalidFeedBack": "Invalid format. Example: {0}",
+      "Clear": "Clear"
     }
   }
 }

module/config/i18n/zh-CN.json

@@ -76,13 +76,15 @@
       "name": "游戏服务器",
       "help": "无法区分国际服的不同地区，请手动选择服务器",
       "auto": "自动检测",
-      "JP-Official": "[日服]-官服"
+      "JP-Official": "[日服]-官服",
+      "OVERSEA-Global": "[国际服]-全球"
     },
     "GameLanguage": {
       "name": "游戏内文本语言",
       "help": "",
       "auto": "自动检测",
-      "jp": "日语"
+      "jp": "日语",
+      "en": "英语"
     },
     "ScreenshotMethod": {
       "name": "模拟器截图方案",
@@ -313,19 +315,19 @@
       "UpToDate": "已是最新版本",
       "HaveUpdate": "有新版本可用",
       "UpdateStart": "开始更新",
-      "UpdateWait": "等待所有 Alas 完成当前任务",
+      "UpdateWait": "等待所有 AAS 完成当前任务",
       "UpdateRun": "更新中",
       "UpdateSuccess": "更新成功，正在重启",
       "UpdateFailed": "更新失败，可在./log/*_gui.txt中找到错误日志",
       "UpdateChecking": "检查更新中",
-      "UpdateCancel": "取消更新，重启 Alas 中",
+      "UpdateCancel": "取消更新，重启 AAS 中",
       "UpdateFinish": "更新成功，请手动重启",
       "Local": "本地",
       "Upstream": "上游仓库",
       "Author": "作者",
       "Time": "提交时间",
       "Message": "提交信息",
-      "DisabledWarn": "更新模块未启用，你需要手动重启 Alas 进行更新",
+      "DisabledWarn": "更新模块未启用，你需要手动重启 AAS 进行更新",
       "DetailedHistory": "详细提交历史"
     },
     "Remote": {

module/config/server.py

@@ -5,9 +5,10 @@ Use 'import module.config.server as server' to import, don't use 'from xxx impor
 lang = 'jp'  # Setting default to cn, will avoid errors when using dev_tools
 server = 'JP-Official'
 
-VALID_LANG = ['jp']
+VALID_LANG = ['jp', 'en']
 VALID_SERVER = {
-    'JP-Official': 'com.YostarJP.BlueArchive'
+    'JP-Official': 'com.YostarJP.BlueArchive',
+    'OVERSEA-Global': 'com.nexon.bluearchive',
 }
 VALID_PACKAGE = set(list(VALID_SERVER.values()))
 

module/config/utils.py

@@ -13,6 +13,7 @@ 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),
 }
 DEFAULT_TIME = datetime(2020, 1, 1, 0, 0)
 

module/device/control.py

@@ -172,7 +172,7 @@ class Control(Hermit, Minitouch, Scrcpy, MaaTouch):
             self.click(ClickButton(button=area_offset(point_random, p2), name=name))
 
     # just used in cafe
-    def pinch(self, box=(33, 130, 1247, 569), name='PINCH'):
+    def pinch(self, box=(35, 130, 1250, 560), name='PINCH'):
         self.handle_control_check(name)
         middle_point = (box[0] + box[2]) // 2, (box[1] + box[3]) // 2
         width = box[2] - middle_point[0]

module/ui/stage_list.py

@@ -0,0 +1,181 @@
+import cv2
+import numpy as np
+
+from module.base.base import ModuleBase
+from module.base.button import ButtonWrapper, ClickButton
+from module.base.timer import Timer
+from module.base.utils import area_pad, area_size, area_offset, random_rectangle_vector_opted
+from module.logger import logger
+from module.ocr.ocr import Ocr
+
+
+class StageList:
+    drag_vector_range = (0.65, 0.85)
+
+    def __init__(
+            self,
+            name,
+            area_stage: ButtonWrapper,
+            area_index: ButtonWrapper,
+            area_item: ButtonWrapper,
+            button_enter: ButtonWrapper,
+            drag_direction: str = "down"
+    ):
+        self.name = name
+        self.stage = area_stage
+        self.index_ocr = Ocr(area_index, lang='en')
+        self.stage_item = area_item.button
+        self.enter = button_enter
+        self.drag_direction = drag_direction
+
+        self.current_index_min = 1
+        self.current_index_max = 1
+        self.current_indexes = []
+
+    def __str__(self):
+        return f'StageList({self.name})'
+
+    __repr__ = __str__
+
+    def __eq__(self, other):
+        return str(self) == str(other)
+
+    def __hash__(self):
+        return hash(self.name)
+
+    def _get_indexes(self) -> list[int]:
+        return list(map(lambda x: int(x.ocr_text), self.current_indexes))
+
+    def load_stage_indexes(self, main: ModuleBase):
+        self.current_indexes = list(
+            filter(lambda x: x.ocr_text.isdigit(), self.index_ocr.detect_and_ocr(main.device.image))
+        )
+        if not self.current_indexes:
+            logger.warning(f'No valid index in {self.index_ocr.name}')
+            return
+        indexes = self._get_indexes()
+
+        self.current_index_min = min(indexes)
+        self.current_index_max = max(indexes)
+        logger.attr(self.index_ocr.name, f'Index range: {self.current_index_min} - {self.current_index_max}')
+
+    def drag_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.drag_vector_range
+        vector = np.random.uniform(*vector_range)
+        width, height = area_size(self.stage.button)
+        if direction == 'up':
+            vector = (0, vector * height)
+        elif direction == 'down':
+            vector = (0, -vector * height)
+        else:
+            logger.warning(f'Unknown drag direction: {direction}')
+            return
+
+        if reverse:
+            vector = (-vector[0], -vector[1])
+        p1, p2 = random_rectangle_vector_opted(vector, box=self.stage.button)
+        main.device.drag(p1, p2, name=f'{self.name}_DRAG')
+
+    def insight_index(self, index: int, main: ModuleBase, skip_first_screenshot=True) -> bool:
+        """
+        Args:
+            index:
+            main:
+            skip_first_screenshot:
+
+        Returns:
+            If success
+        """
+        logger.info(f'Insight index: {index}')
+        last_indexes: set[int] = set()
+
+        while 1:
+            if skip_first_screenshot:
+                skip_first_screenshot = False
+            else:
+                main.device.screenshot()
+
+            self.load_stage_indexes(main=main)
+
+            if self.current_index_min <= index <= self.current_index_max:
+                break
+
+            if index < self.current_index_min:
+                self.drag_page(self.drag_direction, main, reverse=True)
+            elif index > self.current_index_max:
+                self.drag_page(self.drag_direction, main)
+
+            main.wait_until_stable(
+                self.stage.button,
+                timer=Timer(0, 0),
+                timeout=Timer(1.5, 5)
+            )
+
+            indexes = self._get_indexes()
+            if indexes and last_indexes == set(indexes):
+                logger.warning(f'No more index {index}')
+                return False
+            last_indexes = set(indexes)
+
+        return True
+
+    @staticmethod
+    def _match_clickable_points(image, template, threshold=0.85):
+        image = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
+        template = cv2.cvtColor(template, cv2.COLOR_BGR2GRAY)
+
+        res = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED)
+        loc = np.where(res >= threshold)
+        return [point for point in zip(*loc[::-1])]
+
+    def select_index_enter(
+            self,
+            index: int,
+            main: ModuleBase,
+            insight: bool = True,
+            skip_first_screenshot: bool = True,
+            interval: int = 5
+    ) -> bool:
+        if insight and not self.insight_index(index, main, skip_first_screenshot):
+            return False
+        logger.info(f'Select index: {index}')
+        click_interval = Timer(interval)
+        load_index_interval = Timer(1)
+        while 1:
+            if skip_first_screenshot:
+                skip_first_screenshot = False
+            else:
+                main.device.screenshot()
+
+            if load_index_interval.reached_and_reset():
+                self.load_stage_indexes(main=main)
+
+            index_box = next(filter(lambda x: int(x.ocr_text) == index, self.current_indexes), None)
+
+            if index_box is None:
+                logger.warning(f'No index {index} in {self.index_ocr.name}')
+                return False
+
+            stage_item_box = area_pad((0, 0, *area_size(self.stage_item)))
+            search_box = area_offset(stage_item_box, index_box.box[:2])
+            search_image = main.image_crop(search_box)
+            points = self._match_clickable_points(search_image, self.enter.matched_button.image)
+
+            if not points:
+                logger.warning(f'No clickable {self.enter.name}')
+                return False
+
+            point = area_offset((0, 0, *area_size(self.enter.button)), points[0])
+            click_button = ClickButton(area_offset(point, search_box[:2]), name=self.enter.name)
+
+            if click_interval.reached_and_reset():
+                main.device.click(click_button)
+                return True

module/webui/app.py

@@ -1110,7 +1110,7 @@ class AlasGUI(Frame):
                 """
             AAS is a free open source software, if you paid for AAS from any channel, please refund.
             AAS 是一款免费开源软件，如果你在任何渠道付费购买了AAS，请退款。
-            Project repository 项目地址：`https://github.com/TheFunny/ArisuAutoSrcipt`
+            Project repository 项目地址：`https://github.com/TheFunny/ArisuAutoSweeper`
             """
             ).style("text-align: center")
 

module/webui/utils.py

@@ -376,7 +376,7 @@ def add_css(filepath):
 
 
 def _read(path):
-    with open(path, "r") as f:
+    with open(path, "r", encoding="utf-8") as f:
         return f.read()
 
 

tasks/base/assets/assets_base_popup.py

@@ -13,6 +13,16 @@ AFFECTION_LEVEL_UP = ButtonWrapper(
         button=(882, 244, 1176, 476),
     ),
 )
+AP_EXCEED = ButtonWrapper(
+    name='AP_EXCEED',
+    jp=Button(
+        file='./assets/jp/base/popup/AP_EXCEED.png',
+        area=(610, 124, 669, 153),
+        search=(590, 104, 689, 173),
+        color=(139, 153, 168),
+        button=(535, 494, 746, 565),
+    ),
+)
 DAILY_NEWS = ButtonWrapper(
     name='DAILY_NEWS',
     jp=Button(
@@ -27,9 +37,9 @@ DAILY_REWARD = ButtonWrapper(
     name='DAILY_REWARD',
     jp=Button(
         file='./assets/jp/base/popup/DAILY_REWARD.png',
-        area=(854, 117, 1008, 165),
-        search=(834, 97, 1028, 185),
-        color=(178, 167, 112),
+        area=(416, 165, 434, 216),
+        search=(396, 145, 454, 236),
+        color=(203, 227, 237),
         button=(920, 632, 1140, 712),
     ),
 )
@@ -63,6 +73,16 @@ GET_REWARD_SKIP = ButtonWrapper(
         button=(1137, 34, 1243, 65),
     ),
 )
+ITEM_EXPIRED = ButtonWrapper(
+    name='ITEM_EXPIRED',
+    jp=Button(
+        file='./assets/jp/base/popup/ITEM_EXPIRED.png',
+        area=(612, 147, 668, 175),
+        search=(592, 127, 688, 195),
+        color=(131, 145, 162),
+        button=(537, 487, 742, 553),
+    ),
+)
 NETWORK_RECONNECT = ButtonWrapper(
     name='NETWORK_RECONNECT',
     jp=Button(
@@ -73,3 +93,13 @@ NETWORK_RECONNECT = ButtonWrapper(
         button=(663, 467, 870, 537),
     ),
 )
+NETWORK_RECONNECT_OK = ButtonWrapper(
+    name='NETWORK_RECONNECT_OK',
+    jp=Button(
+        file='./assets/jp/base/popup/NETWORK_RECONNECT_OK.png',
+        area=(744, 487, 791, 515),
+        search=(724, 467, 811, 535),
+        color=(91, 165, 196),
+        button=(665, 468, 870, 536),
+    ),
+)

tasks/base/popup.py

@@ -65,6 +65,8 @@ class PopupHandler(ModuleBase):
     def handle_network_reconnect(self, interval=5) -> bool:
         if self.appear_then_click(NETWORK_RECONNECT, interval=interval):
             return True
+        if self.appear_then_click(NETWORK_RECONNECT_OK, interval=interval):
+            return True
 
         return False
 
@@ -85,3 +87,15 @@ class PopupHandler(ModuleBase):
             return True
 
         return False
+
+    def handle_ap_exceed(self, interval=5) -> bool:
+        if self.appear_then_click(AP_EXCEED, interval=interval):
+            return True
+
+        return False
+
+    def handle_item_expired(self, interval=5) -> bool:
+        if self.appear_then_click(ITEM_EXPIRED, interval=interval):
+            return True
+
+        return False

tasks/base/ui.py

@@ -343,6 +343,10 @@ class UI(MainPage):
             return True
         if self.handle_new_student():
             return True
+        if self.handle_ap_exceed():
+            return True
+        if self.handle_item_expired():
+            return True
 
         return False
 

tasks/cafe/assets/assets_cafe.py

@@ -67,10 +67,10 @@ CLICKABLE_TEMPLATE = ButtonWrapper(
     name='CLICKABLE_TEMPLATE',
     jp=Button(
         file='./assets/jp/cafe/CLICKABLE_TEMPLATE.png',
-        area=(0, 0, 42, 56),
-        search=(0, 0, 62, 76),
-        color=(77, 63, 1),
-        button=(0, 0, 42, 56),
+        area=(619, 332, 660, 387),
+        search=(599, 312, 680, 407),
+        color=(79, 65, 1),
+        button=(619, 332, 660, 387),
     ),
 )
 GET_REWARD = ButtonWrapper(
@@ -103,6 +103,26 @@ GOT_REWARD = ButtonWrapper(
         button=(561, 501, 718, 556),
     ),
 )
+INVENTORY = ButtonWrapper(
+    name='INVENTORY',
+    jp=Button(
+        file='./assets/jp/cafe/INVENTORY.png',
+        area=(553, 94, 725, 122),
+        search=(533, 74, 745, 142),
+        color=(198, 205, 213),
+        button=(1130, 94, 1156, 120),
+    ),
+)
+MOMOTALK_CLOSE = ButtonWrapper(
+    name='MOMOTALK_CLOSE',
+    jp=Button(
+        file='./assets/jp/cafe/MOMOTALK_CLOSE.png',
+        area=(824, 82, 850, 108),
+        search=(804, 62, 870, 128),
+        color=(252, 182, 194),
+        button=(824, 82, 850, 108),
+    ),
+)
 OCR_CAFE = ButtonWrapper(
     name='OCR_CAFE',
     jp=Button(

tasks/cafe/cafe.py

@@ -63,15 +63,16 @@ class Cafe(UI):
 
     def _match_clickable_points(self, image, threshold=0.8):
         image = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
-        template = self.btn.matched_button.image
-        template = cv2.cvtColor(template, cv2.COLOR_BGR2GRAY)
+        template = cv2.cvtColor(self.btn.matched_button.image, cv2.COLOR_BGR2GRAY)
 
         res = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED)
         loc = np.where(res >= threshold)
         return [point for point in zip(*loc[::-1])]
 
     def _get_clickable_buttons(self, threshold=0.8, offset=(0, 0)):
-        image = cv2.copyMakeBorder(self.device.image, 20, 20, 10, 80, cv2.BORDER_CONSTANT, value=(0, 0, 0))
+        image = self.device.image
+        h, w = image.shape[:2]
+        image = cv2.rectangle(image, (0, 10), (w - 25, h - 10), (0, 0, 0), 50)
         image = self._extract_clickable_from_image(image)
         points = self._match_clickable_points(image, threshold)
         points = self.merge_points(points)
@@ -120,6 +121,13 @@ class Cafe(UI):
         logger.attr('Reward', num)
         return num
 
+    def _cafe_additional(self) -> bool:
+        if self.appear_then_click(INVENTORY):
+            return True
+        if self.appear_then_click(MOMOTALK_CLOSE):
+            return True
+        return False
+
     def _handle_cafe(self, status):
         match status:
             case CafeStatus.STUDENT_LIST:
@@ -206,7 +214,7 @@ class Cafe(UI):
 
             self.device.screenshot()
 
-            if self.ui_additional():
+            if self.ui_additional() or self._cafe_additional():
                 continue
 
             if not loading_timer.reached():

tasks/login/assets/assets_login.py

@@ -23,3 +23,13 @@ LOGIN_LOADING = ButtonWrapper(
         button=(34, 682, 60, 707),
     ),
 )
+UPDATE = ButtonWrapper(
+    name='UPDATE',
+    jp=Button(
+        file='./assets/jp/login/UPDATE.png',
+        area=(526, 87, 756, 117),
+        search=(506, 67, 776, 137),
+        color=(183, 192, 201),
+        button=(666, 527, 872, 595),
+    ),
+)

tasks/login/login.py

@@ -3,8 +3,7 @@ from module.exception import GameNotRunningError
 from module.logger import logger
 from tasks.base.page import page_main
 from tasks.base.ui import UI
-# from tasks.login.assets.assets_login import LOGIN_CONFIRM, USER_AGREEMENT_ACCEPT, LOGIN_LOADING
-from tasks.login.assets.assets_login import LOGIN_CONFIRM, LOGIN_LOADING
+from tasks.login.assets.assets_login import LOGIN_CONFIRM, LOGIN_LOADING, UPDATE
 
 
 class Login(UI):
@@ -77,6 +76,8 @@ class Login(UI):
             #     continue
             # if self.handle_popup_confirm():
             #     continue
+            if self.appear_then_click(UPDATE):
+                continue
             if self.ui_additional():
                 continue
 

tasks/tactical_challenge/tactical_challenge.py

@@ -116,8 +116,8 @@ class TacticalChallenge(UI):
                 if self.appear_then_click(CHALLENGE_LOSE):
                     return TCStatus.LOSE
             case TCStatus.WIN | TCStatus.LOSE:
-                if self.appear(CHALLENGE_WIN) or self.appear(CHALLENGE_LOSE):
-                    return TCStatus.RESULT
+                if self.appear_then_click(CHALLENGE_WIN) or self.appear_then_click(CHALLENGE_LOSE):
+                    return status
                 is_valid, ticket = self._get_ticket()
                 if not is_valid:
                     return status

webapp/packages/main/public/deploy.yaml.tpl

@@ -1,8 +1,8 @@
 Deploy:
   Git:
     # URL of AzurLaneAutoScript repository
-    # [CN user] Use 'cn' to get update from git-over-cdn service
-    # [Other] Use 'global' to get update from https://github.com/TheFunny/ArisuAutoSrcipt
+    # [CN user] Use 'cn' to get update from self-hosted git service
+    # [Other] Use 'global' to get update from https://github.com/TheFunny/ArisuAutoSweeper
     Repository: {{repository}}
     # Branch of Alas
     # [Developer] Use 'dev', 'app', etc, to try new features