Merge 5feb46040c into 2f4d64e5d0

module/config/argument/args.json

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

module/config/argument/argument.yaml

@@ -23,7 +23,7 @@ Emulator:
     option: [ auto, ]
   GameLanguage:
     value: auto
-    option: [ auto, jp, en ]
+    option: [ auto, jp ]
   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, OVERSEA-Global
-    Emulator_GameLanguage = 'auto'  # auto, jp, en
+    Emulator_PackageName = 'auto'  # auto, JP-Official
+    Emulator_GameLanguage = 'auto'  # auto, jp
     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,21 +76,19 @@
       "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"
+      "JP-Official": "[JP]-Official"
     },
     "GameLanguage": {
       "name": "In-game Text Language",
-      "help": "",
+      "help": "Currently, only Simplified Chinese and English are supported. Please set the text language in game to one of them.",
       "auto": "Auto-detect",
-      "jp": "Japanese",
-      "en": "English"
+      "jp": "Japanese"
     },
     "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,15 +76,13 @@
       "name": "游戏服务器",
       "help": "无法区分国际服的不同地区，请手动选择服务器",
       "auto": "自动检测",
-      "JP-Official": "[日服]-官服",
-      "OVERSEA-Global": "[国际服]-全球"
+      "JP-Official": "[日服]-官服"
     },
     "GameLanguage": {
       "name": "游戏内文本语言",
       "help": "",
       "auto": "自动检测",
-      "jp": "日语",
-      "en": "英语"
+      "jp": "日语"
     },
     "ScreenshotMethod": {
       "name": "模拟器截图方案",

module/config/server.py

@@ -5,10 +5,9 @@ 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', 'en']
+VALID_LANG = ['jp']
 VALID_SERVER = {
-    'JP-Official': 'com.YostarJP.BlueArchive',
-    'OVERSEA-Global': 'com.nexon.bluearchive',
+    'JP-Official': 'com.YostarJP.BlueArchive'
 }
 VALID_PACKAGE = set(list(VALID_SERVER.values()))
 

module/config/utils.py

@@ -13,7 +13,6 @@ 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)