feat: add en and Global server options

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

@@ -76,19 +76,21 @@
       "name": "Game Server",
       "help": "Can't distinguish different regions of oversea servers, please select the server manually.",
       "auto": "Auto-detect",
-      "JP-Official": "[JP]-Official"
+      "JP-Official": "[JP]-Official",
+      "OVERSEA-Global": "[OVERSEA]-Global"
     },
     "GameLanguage": {
       "name": "In-game Text Language",
-      "help": "Currently, only Simplified Chinese and English are supported. Please set the text language in game to one of them.",
+      "help": "",
       "auto": "Auto-detect",
-      "jp": "Japanese"
+      "jp": "Japanese",
+      "en": "English"
     },
     "ScreenshotMethod": {
       "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": "ADB",
       "ADB_nc": "ADB_nc",
       "uiautomator2": "uiautomator2",
       "aScreenCap": "aScreenCap",

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": "模拟器截图方案",

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/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")
 

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