diff --git a/module/config/argument/args.json b/module/config/argument/args.json index ebca4d7..3b5c3d0 100644 --- a/module/config/argument/args.json +++ b/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": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 61eca1d..6412674 100644 --- a/module/config/argument/argument.yaml +++ b/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 ] diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 6ab8b9d..0af1766 100644 --- a/module/config/config_generated.py +++ b/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 diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 2d8bafb..8262550 100644 --- a/module/config/i18n/en-US.json +++ b/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", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index f6b9ca3..5aecf51 100644 --- a/module/config/i18n/zh-CN.json +++ b/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": "模拟器截图方案", diff --git a/module/config/server.py b/module/config/server.py index 6e789d7..cd50b12 100644 --- a/module/config/server.py +++ b/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())) diff --git a/module/config/utils.py b/module/config/utils.py index 84cecd4..ae39235 100644 --- a/module/config/utils.py +++ b/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)