diff --git a/assets/character/Sparkle.png b/assets/character/Sparkle.png new file mode 100644 index 000000000..fc5b3e4c5 Binary files /dev/null and b/assets/character/Sparkle.png differ diff --git a/dev_tools/screenshot.py b/dev_tools/screenshot.py index 90ce49bd0..746be65d4 100644 --- a/dev_tools/screenshot.py +++ b/dev_tools/screenshot.py @@ -50,12 +50,12 @@ def handle_sensitive_info(image): _ = EmptyConnection() name = input( - '输入alas配置文件名称,或者模拟器serial,或者模拟器端口号: (默认输入 "alas"):\n' - '例如:"alas", "127.0.0.1:16384", "7555"\n' + '输入src配置文件名称,或者模拟器serial,或者模拟器端口号: (默认输入 "src"):\n' + '例如:"src", "127.0.0.1:16384", "7555"\n' ) name = name.strip().strip('"').strip() if not name: - name = 'alas' + name = 'src' if name.isdigit(): name = f'127.0.0.1:{name}' if name in alas_instance(): diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 85586dacc..c85879ceb 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -421,6 +421,7 @@ "Seele", "Serval", "SilverWolf", + "Sparkle", "Sushang", "Tingyun", "TopazNumby", @@ -1326,6 +1327,7 @@ "Seele", "Serval", "SilverWolf", + "Sparkle", "Sushang", "Tingyun", "TopazNumby", diff --git a/module/config/config_generated.py b/module/config/config_generated.py index b3e344ea7..8af4d7616 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -53,7 +53,7 @@ class GeneratedConfig: # Group `DungeonSupport` DungeonSupport_Use = 'when_daily' # always_use, when_daily, do_not_use - DungeonSupport_Character = 'FirstCharacter' # FirstCharacter, Argenti, Arlan, Asta, Bailu, BlackSwan, Blade, Bronya, Clara, DanHeng, DanHengImbibitorLunae, DrRatio, FuXuan, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7th, Misha, Natasha, Pela, Qingque, RuanMei, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Xueyi, Yanqing, Yukong + DungeonSupport_Character = 'FirstCharacter' # FirstCharacter, Argenti, Arlan, Asta, Bailu, BlackSwan, Blade, Bronya, Clara, DanHeng, DanHengImbibitorLunae, DrRatio, FuXuan, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7th, Misha, Natasha, Pela, Qingque, RuanMei, Sampo, Seele, Serval, SilverWolf, Sparkle, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Xueyi, Yanqing, Yukong # Group `DungeonStorage` DungeonStorage_TrailblazePower = {} diff --git a/module/config/config_updater.py b/module/config/config_updater.py index e71ef205a..0f10f4d41 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -100,7 +100,7 @@ class ConfigGenerator: options=[dungeon.name for dungeon in DungeonList.instances.values() if dungeon.is_Echo_of_War]) # Insert characters from tasks.character.keywords import CharacterList - unsupported_characters = ['Sparkle'] + unsupported_characters = [] characters = [character.name for character in CharacterList.instances.values() if character.name not in unsupported_characters] option_add(keys='DungeonSupport.Character.option', options=characters) diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 35706dd1e..b6dad37bd 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -441,6 +441,7 @@ "Seele": "Seele", "Serval": "Serval", "SilverWolf": "Silver Wolf", + "Sparkle": "Sparkle", "Sushang": "Sushang", "Tingyun": "Tingyun", "TopazNumby": "Topaz & Numby", diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index 255b71091..e9a468347 100644 --- a/module/config/i18n/es-ES.json +++ b/module/config/i18n/es-ES.json @@ -441,6 +441,7 @@ "Seele": "Seele", "Serval": "Serval", "SilverWolf": "Silver Wolf", + "Sparkle": "Sparkle", "Sushang": "Sushang", "Tingyun": "Tingyun", "TopazNumby": "Topaz y Conti", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index eda548e63..a09ba1f54 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -441,6 +441,7 @@ "Seele": "ゼーレ", "Serval": "セーバル", "SilverWolf": "銀狼", + "Sparkle": "花火", "Sushang": "素裳", "Tingyun": "停雲", "TopazNumby": "トパーズ&カブ", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 52539cc65..4f8a58c57 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -441,6 +441,7 @@ "Seele": "希儿", "Serval": "希露瓦", "SilverWolf": "银狼", + "Sparkle": "花火", "Sushang": "素裳", "Tingyun": "停云", "TopazNumby": "托帕&账账", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 4e180d426..b77f7b05f 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -441,6 +441,7 @@ "Seele": "希兒", "Serval": "希露瓦", "SilverWolf": "銀狼", + "Sparkle": "花火", "Sushang": "素裳", "Tingyun": "停雲", "TopazNumby": "托帕&帳帳",