Merge branch 'master' into dev

This commit is contained in:
LmeSzinc 2023-12-11 01:01:48 +08:00
commit d968150a4c
11 changed files with 15 additions and 3 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
assets/character/Hanya.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -349,6 +349,7 @@
"value": "FirstCharacter",
"option": [
"FirstCharacter",
"Argenti",
"Arlan",
"Asta",
"Bailu",
@ -360,6 +361,7 @@
"FuXuan",
"Gepard",
"Guinaifen",
"Hanya",
"Herta",
"Himeko",
"Hook",

View File

@ -53,7 +53,7 @@ class GeneratedConfig:
# Group `DungeonSupport`
DungeonSupport_Use = 'when_daily' # always_use, when_daily, do_not_use
DungeonSupport_Character = 'FirstCharacter' # FirstCharacter, Arlan, Asta, Bailu, Blade, Bronya, Clara, DanHeng, DanHengImbibitorLunae, FuXuan, Gepard, Guinaifen, Herta, Himeko, Hook, Huohuo, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7th, Natasha, Pela, Qingque, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Yanqing, Yukong
DungeonSupport_Character = 'FirstCharacter' # FirstCharacter, Argenti, Arlan, Asta, Bailu, Blade, Bronya, Clara, DanHeng, DanHengImbibitorLunae, FuXuan, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7th, Natasha, Pela, Qingque, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Yanqing, Yukong
# Group `DungeonStorage`
DungeonStorage_TrailblazePower = {}

View File

@ -92,7 +92,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 = ['Argenti','Hanya']
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)

View File

@ -361,6 +361,7 @@
"name": "Support Character",
"help": "Select a friend support character, if not found, select the default (first) role",
"FirstCharacter": "First Character",
"Argenti": "Argenti",
"Arlan": "Arlan",
"Asta": "Asta",
"Bailu": "Bailu",
@ -372,6 +373,7 @@
"FuXuan": "Fu Xuan",
"Gepard": "Gepard",
"Guinaifen": "Guinaifen",
"Hanya": "Hanya",
"Herta": "Herta",
"Himeko": "Himeko",
"Hook": "Hook",

View File

@ -361,6 +361,7 @@
"name": "Personaje de apoyo",
"help": "Selecciona qué personaje de apoyo de un amigo se usará. Si no se encuentra, se seleccionará al predeterminado.",
"FirstCharacter": "Primer personaje",
"Argenti": "Argenti",
"Arlan": "Arlan",
"Asta": "Asta",
"Bailu": "Bailu",
@ -372,6 +373,7 @@
"FuXuan": "Fu Xuan",
"Gepard": "Gepard",
"Guinaifen": "Guinaifen",
"Hanya": "Hanya",
"Herta": "Herta",
"Himeko": "Himeko",
"Hook": "Hook",

View File

@ -361,6 +361,7 @@
"name": "DungeonSupport.Character.name",
"help": "DungeonSupport.Character.help",
"FirstCharacter": "FirstCharacter",
"Argenti": "アルジェンティ",
"Arlan": "アーラン",
"Asta": "アスター",
"Bailu": "白露",
@ -372,6 +373,7 @@
"FuXuan": "符玄",
"Gepard": "ジェパード",
"Guinaifen": "桂乃芬",
"Hanya": "寒鴉",
"Herta": "ヘルタ",
"Himeko": "姫子",
"Hook": "フック",

View File

@ -361,6 +361,7 @@
"name": "好友支援角色",
"help": "选择好友支援角色,未找到则选择默认(第一个)角色",
"FirstCharacter": "支援列表第一个角色",
"Argenti": "银枝",
"Arlan": "阿兰",
"Asta": "艾丝妲",
"Bailu": "白露",
@ -372,6 +373,7 @@
"FuXuan": "符玄",
"Gepard": "杰帕德",
"Guinaifen": "桂乃芬",
"Hanya": "寒鸦",
"Herta": "黑塔",
"Himeko": "姬子",
"Hook": "虎克",

View File

@ -361,6 +361,7 @@
"name": "好友支援角色",
"help": "選擇好友支援角色,未找到則選擇默認(第一個)角色",
"FirstCharacter": "支援列表第一個角色",
"Argenti": "銀枝",
"Arlan": "阿蘭",
"Asta": "艾絲妲",
"Bailu": "白露",
@ -372,6 +373,7 @@
"FuXuan": "符玄",
"Gepard": "傑帕德",
"Guinaifen": "桂乃芬",
"Hanya": "寒鴉",
"Herta": "黑塔",
"Himeko": "姬子",
"Hook": "虎克",

View File

@ -282,7 +282,7 @@ class StoredEchoOfWar(StoredCounter, StoredExpiredAtMonday0400):
class StoredBattlePassLevel(StoredCounter):
FIXED_TOTAL = 50
FIXED_TOTAL = 70
class StoredBattlePassTodayQuest(StoredCounter, StoredExpiredAt0400):