xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-29 02:57:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc 2023-11-16 13:38:29 +08:00
commit 2f0626c0a0
28 changed files with 230 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/character/Huohuo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
assets/share/base/popup/BATTLE_PASS_NOTIFICATION.BUTTON.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
assets/share/base/popup/BATTLE_PASS_NOTIFICATION.SEARCH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
assets/share/base/popup/BATTLE_PASS_NOTIFICATION.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
assets/share/forgotten_hall/team/CHARACTER_1.BUTTON.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
assets/share/forgotten_hall/team/CHARACTER_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
assets/share/forgotten_hall/team/CHARACTER_2.BUTTON.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
assets/share/forgotten_hall/team/CHARACTER_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
assets/share/forgotten_hall/team/CHARACTER_3.BUTTON.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
assets/share/forgotten_hall/team/CHARACTER_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
assets/share/forgotten_hall/team/CHARACTER_4.BUTTON.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
assets/share/forgotten_hall/team/CHARACTER_4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

16
module/config/argument/args.json
View File

@ -216,13 +216,15 @@
"Stagnant_Shadow_Abomination",
"Stagnant_Shadow_Scorch",
"Stagnant_Shadow_Celestial",
"Stagnant_Shadow_Perdition",
"Cavern_of_Corrosion_Path_of_Gelid_Wind",
"Cavern_of_Corrosion_Path_of_Jabbing_Punch",
"Cavern_of_Corrosion_Path_of_Drifting",
"Cavern_of_Corrosion_Path_of_Providence",
"Cavern_of_Corrosion_Path_of_Holy_Hymn",
"Cavern_of_Corrosion_Path_of_Conflagration",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers",
"Cavern_of_Corrosion_Path_of_Darkness"
]
},
"NameAtDoubleCalyx": {
@ -253,7 +255,8 @@
"Cavern_of_Corrosion_Path_of_Providence",
"Cavern_of_Corrosion_Path_of_Holy_Hymn",
"Cavern_of_Corrosion_Path_of_Conflagration",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers",
"Cavern_of_Corrosion_Path_of_Darkness"
]
},
"Team": {
@ -311,7 +314,8 @@
"Stagnant_Shadow_Puppetry",
"Stagnant_Shadow_Abomination",
"Stagnant_Shadow_Scorch",
"Stagnant_Shadow_Celestial"
"Stagnant_Shadow_Celestial",
"Stagnant_Shadow_Perdition"
]
},
"CavernOfCorrosion": {
@ -325,7 +329,8 @@
"Cavern_of_Corrosion_Path_of_Providence",
"Cavern_of_Corrosion_Path_of_Holy_Hymn",
"Cavern_of_Corrosion_Path_of_Conflagration",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers",
"Cavern_of_Corrosion_Path_of_Darkness"
]
}
},
@ -358,6 +363,7 @@
"Herta",
"Himeko",
"Hook",
"Huohuo",
"JingYuan",
"Jingliu",
"Kafka",
@ -374,7 +380,7 @@
"SilverWolf",
"Sushang",
"Tingyun",
"TopazandNumby",
"TopazNumby",
"TrailblazerDestruction",
"TrailblazerPreservation",
"Welt",

10
module/config/config_generated.py
View File

@ -40,20 +40,20 @@ class GeneratedConfig:
Optimization_WhenTaskQueueEmpty = 'goto_main' # stay_there, goto_main, close_game
# Group `Dungeon`
Dungeon_Name = 'Calyx_Golden_Treasures' # Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_The_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility, Stagnant_Shadow_Quanta, Stagnant_Shadow_Gust, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Blaze, Stagnant_Shadow_Spike, Stagnant_Shadow_Rime, Stagnant_Shadow_Mirage, Stagnant_Shadow_Icicle, Stagnant_Shadow_Doom, Stagnant_Shadow_Puppetry, Stagnant_Shadow_Abomination, Stagnant_Shadow_Scorch, Stagnant_Shadow_Celestial, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers
Dungeon_Name = 'Calyx_Golden_Treasures' # Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_The_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility, Stagnant_Shadow_Quanta, Stagnant_Shadow_Gust, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Blaze, Stagnant_Shadow_Spike, Stagnant_Shadow_Rime, Stagnant_Shadow_Mirage, Stagnant_Shadow_Icicle, Stagnant_Shadow_Doom, Stagnant_Shadow_Puppetry, Stagnant_Shadow_Abomination, Stagnant_Shadow_Scorch, Stagnant_Shadow_Celestial, Stagnant_Shadow_Perdition, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers, Cavern_of_Corrosion_Path_of_Darkness
Dungeon_NameAtDoubleCalyx = 'Calyx_Golden_Treasures' # do_not_participate, Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_The_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility
Dungeon_NameAtDoubleRelic = 'Cavern_of_Corrosion_Path_of_Providence' # do_not_participate, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers
Dungeon_NameAtDoubleRelic = 'Cavern_of_Corrosion_Path_of_Providence' # do_not_participate, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers, Cavern_of_Corrosion_Path_of_Darkness
Dungeon_Team = 1 # 1, 2, 3, 4, 5, 6
# Group `DungeonDaily`
DungeonDaily_CalyxGolden = 'Calyx_Golden_Treasures' # do_not_achieve, Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures
DungeonDaily_CalyxCrimson = 'Calyx_Crimson_Erudition' # do_not_achieve, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_The_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility
DungeonDaily_StagnantShadow = 'Stagnant_Shadow_Quanta' # do_not_achieve, Stagnant_Shadow_Quanta, Stagnant_Shadow_Gust, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Blaze, Stagnant_Shadow_Spike, Stagnant_Shadow_Rime, Stagnant_Shadow_Mirage, Stagnant_Shadow_Icicle, Stagnant_Shadow_Doom, Stagnant_Shadow_Puppetry, Stagnant_Shadow_Abomination, Stagnant_Shadow_Scorch, Stagnant_Shadow_Celestial
DungeonDaily_CavernOfCorrosion = 'Cavern_of_Corrosion_Path_of_Providence' # do_not_achieve, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers
DungeonDaily_StagnantShadow = 'Stagnant_Shadow_Quanta' # do_not_achieve, Stagnant_Shadow_Quanta, Stagnant_Shadow_Gust, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Blaze, Stagnant_Shadow_Spike, Stagnant_Shadow_Rime, Stagnant_Shadow_Mirage, Stagnant_Shadow_Icicle, Stagnant_Shadow_Doom, Stagnant_Shadow_Puppetry, Stagnant_Shadow_Abomination, Stagnant_Shadow_Scorch, Stagnant_Shadow_Celestial, Stagnant_Shadow_Perdition
DungeonDaily_CavernOfCorrosion = 'Cavern_of_Corrosion_Path_of_Providence' # do_not_achieve, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers, Cavern_of_Corrosion_Path_of_Darkness
# 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, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7th, Natasha, Pela, Qingque, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TopazandNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Yanqing, Yukong
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
# Group `DungeonStorage`
DungeonStorage_TrailblazePower = {}

2
module/config/config_updater.py
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 = []
unsupported_characters = ['Argenti','Hanya']
characters = [character.name for character in CharacterList.instances.values()
if character.name not in unsupported_characters]
option_add(keys='DungeonSupport.Character.option', options=characters)

22
module/config/i18n/en-US.json
View File

@ -236,15 +236,17 @@
"Stagnant_Shadow_Doom": "Ascension: Lightning (Kafka / Jing Yuan)",
"Stagnant_Shadow_Puppetry": "Ascension: Imaginary (Dan Heng • Imbibitor Lunae)",
"Stagnant_Shadow_Abomination": "Ascension: Quantum (Lynx / Fu Xuan)",
"Stagnant_Shadow_Scorch": "Ascension: Fire (Guinaifen / Topaz and Numby)",
"Stagnant_Shadow_Celestial": "Ascension: Wind (Blade)",
"Stagnant_Shadow_Scorch": "Ascension: Fire (Guinaifen / Topaz & Numby)",
"Stagnant_Shadow_Celestial": "Ascension: Wind (Blade / Huohuo)",
"Stagnant_Shadow_Perdition": "Ascension: Physical (Hanya / Argenti)",
"Cavern_of_Corrosion_Path_of_Gelid_Wind": "Relics: Ice Set & Wind Set (Path of Gelid Wind)",
"Cavern_of_Corrosion_Path_of_Jabbing_Punch": "Relics: Physical Set & Break Effect Set (Path of Jabbing Punch)",
"Cavern_of_Corrosion_Path_of_Drifting": "Relics: Healing Set & Musketeer Set (Path of Drifting)",
"Cavern_of_Corrosion_Path_of_Providence": "Relics: Guard Set & Quantum Set (Path of Providence)",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "Relics: DEF Set & Lighting Set (Path of Holy Hymn)",
"Cavern_of_Corrosion_Path_of_Conflagration": "Relics: Fire Set & Imaginary Set (Path of Conflagration)",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Relics: HP Set & SPD Set (Path of Elixir Seekers)"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Relics: HP Set & SPD Set (Path of Elixir Seekers)",
"Cavern_of_Corrosion_Path_of_Darkness": "Relics: Pursuit Set & Dot Set (Path of Darkness)"
},
"NameAtDoubleCalyx": {
"name": "At Double Calyx Event, choose dungeon",
@ -271,7 +273,8 @@
"Cavern_of_Corrosion_Path_of_Providence": "Relics: Guard Set & Quantum Set (Path of Providence)",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "Relics: DEF Set & Lighting Set (Path of Holy Hymn)",
"Cavern_of_Corrosion_Path_of_Conflagration": "Relics: Fire Set & Imaginary Set (Path of Conflagration)",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Relics: HP Set & SPD Set (Path of Elixir Seekers)"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Relics: HP Set & SPD Set (Path of Elixir Seekers)",
"Cavern_of_Corrosion_Path_of_Darkness": "Relics: Pursuit Set & Dot Set (Path of Darkness)"
},
"Team": {
"name": "Dungeon Team",
@ -324,8 +327,9 @@
"Stagnant_Shadow_Doom": "Ascension: Lightning (Kafka / Jing Yuan)",
"Stagnant_Shadow_Puppetry": "Ascension: Imaginary (Dan Heng • Imbibitor Lunae)",
"Stagnant_Shadow_Abomination": "Ascension: Quantum (Lynx / Fu Xuan)",
"Stagnant_Shadow_Scorch": "Ascension: Fire (Guinaifen / Topaz and Numby)",
"Stagnant_Shadow_Celestial": "Ascension: Wind (Blade)"
"Stagnant_Shadow_Scorch": "Ascension: Fire (Guinaifen / Topaz & Numby)",
"Stagnant_Shadow_Celestial": "Ascension: Wind (Blade / Huohuo)",
"Stagnant_Shadow_Perdition": "Ascension: Physical (Hanya / Argenti)"
},
"CavernOfCorrosion": {
"name": "Clear Cavern of Corrosion 1 times",
@ -337,7 +341,8 @@
"Cavern_of_Corrosion_Path_of_Providence": "Relics: Guard Set & Quantum Set (Path of Providence)",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "Relics: DEF Set & Lighting Set (Path of Holy Hymn)",
"Cavern_of_Corrosion_Path_of_Conflagration": "Relics: Fire Set & Imaginary Set (Path of Conflagration)",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Relics: HP Set & SPD Set (Path of Elixir Seekers)"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Relics: HP Set & SPD Set (Path of Elixir Seekers)",
"Cavern_of_Corrosion_Path_of_Darkness": "Relics: Pursuit Set & Dot Set (Path of Darkness)"
}
},
"DungeonSupport": {
@ -370,6 +375,7 @@
"Herta": "Herta",
"Himeko": "Himeko",
"Hook": "Hook",
"Huohuo": "Huohuo",
"JingYuan": "Jing Yuan",
"Jingliu": "Jingliu",
"Kafka": "Kafka",
@ -386,7 +392,7 @@
"SilverWolf": "Silver Wolf",
"Sushang": "Sushang",
"Tingyun": "Tingyun",
"TopazandNumby": "Topaz and Numby",
"TopazNumby": "Topaz & Numby",
"TrailblazerDestruction": "Trailblazer Destruction",
"TrailblazerPreservation": "Trailblazer Preservation",
"Welt": "Welt",

18
module/config/i18n/es-ES.json
View File

@ -237,14 +237,16 @@
"Stagnant_Shadow_Puppetry": "Ascension: Imaginario (Dan Heng - Imbibitor Lunae)",
"Stagnant_Shadow_Abomination": "Ascension: Cuántico (Lynx / Fu Xuan)",
"Stagnant_Shadow_Scorch": "Ascension: Fuego (Guinaifen / Topaz y Conti)",
"Stagnant_Shadow_Celestial": "Ascension: Viento (Blade)",
"Stagnant_Shadow_Celestial": "Ascension: Viento (Blade / Huohuo)",
"Stagnant_Shadow_Perdition": "Ascension: Físico (Hanya / Argenti)",
"Cavern_of_Corrosion_Path_of_Gelid_Wind": "Artefactos: Hielo y Viento (Senda del viento gélido)",
"Cavern_of_Corrosion_Path_of_Jabbing_Punch": "Artefactos: Físico y Efecto de Ruptura (Senda de los puños rápidos)",
"Cavern_of_Corrosion_Path_of_Drifting": "Artefactos: Curación y Pistolera de la espiga silvestre (Senda de la deriva)",
"Cavern_of_Corrosion_Path_of_Providence": "Artefactos: Guardia de la nieve y Cuántico (Senda de al providencia)",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "Artefactos: Defensa y Trueno (Senda del himno sagrado)",
"Cavern_of_Corrosion_Path_of_Conflagration": "Artefactos: Fuego e Imaginario (Senda de la conflagración)",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Artefactos: HP y SPD (Senda de los elixires)"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Artefactos: HP y SPD (Senda de los elixires)",
"Cavern_of_Corrosion_Path_of_Darkness": "Artefactos: Persecución y Dot (Senda de la oscuridad)"
},
"NameAtDoubleCalyx": {
"name": "En los eventos de x2 de Cáliz",
@ -271,7 +273,8 @@
"Cavern_of_Corrosion_Path_of_Providence": "Artefactos: Guardia de la nieve y Cuántico (Senda de al providencia)",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "Artefactos: Defensa y Trueno (Senda del himno sagrado)",
"Cavern_of_Corrosion_Path_of_Conflagration": "Artefactos: Fuego e Imaginario (Senda de la conflagración)",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Artefactos: HP y SPD (Senda de los elixires)"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Artefactos: HP y SPD (Senda de los elixires)",
"Cavern_of_Corrosion_Path_of_Darkness": "Artefactos: Persecución y Dot (Senda de la oscuridad)"
},
"Team": {
"name": "Equipo de mazmorra",
@ -325,7 +328,8 @@
"Stagnant_Shadow_Puppetry": "Ascension: Imaginario (Dan Heng - Imbibitor Lunae)",
"Stagnant_Shadow_Abomination": "Ascension: Cuántico (Lynx / Fu Xuan)",
"Stagnant_Shadow_Scorch": "Ascension: Fuego (Guinaifen / Topaz y Conti)",
"Stagnant_Shadow_Celestial": "Ascension: Viento (Blade)"
"Stagnant_Shadow_Celestial": "Ascension: Viento (Blade / Huohuo)",
"Stagnant_Shadow_Perdition": "Ascension: Físico (Hanya / Argenti)"
},
"CavernOfCorrosion": {
"name": "Completar Caverna de la corrosión 1 vez",
@ -337,7 +341,8 @@
"Cavern_of_Corrosion_Path_of_Providence": "Artefactos: Guardia de la nieve y Cuántico (Senda de al providencia)",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "Artefactos: Defensa y Trueno (Senda del himno sagrado)",
"Cavern_of_Corrosion_Path_of_Conflagration": "Artefactos: Fuego e Imaginario (Senda de la conflagración)",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Artefactos: HP y SPD (Senda de los elixires)"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Artefactos: HP y SPD (Senda de los elixires)",
"Cavern_of_Corrosion_Path_of_Darkness": "Artefactos: Persecución y Dot (Senda de la oscuridad)"
}
},
"DungeonSupport": {
@ -370,6 +375,7 @@
"Herta": "Herta",
"Himeko": "Himeko",
"Hook": "Hook",
"Huohuo": "Huohuo",
"JingYuan": "Jing Yuan",
"Jingliu": "Jingliu",
"Kafka": "Kafka",
@ -386,7 +392,7 @@
"SilverWolf": "Silver Wolf",
"Sushang": "Sushang",
"Tingyun": "Tingyun",
"TopazandNumby": "Topaz y Conti",
"TopazNumby": "Topaz y Conti",
"TrailblazerDestruction": "Trailblazer de Destrucción",
"TrailblazerPreservation": "Trailblazer de Conservación",
"Welt": "Welt",

20
module/config/i18n/ja-JP.json
View File

@ -237,14 +237,16 @@
"Stagnant_Shadow_Puppetry": "キャラクター昇格素材：虚数（丹恒・飲月）",
"Stagnant_Shadow_Abomination": "キャラクター昇格素材：量子（リンクス / 符玄）",
"Stagnant_Shadow_Scorch": "キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ）",
"Stagnant_Shadow_Celestial": "キャラクター昇格素材：風（刃）",
"Stagnant_Shadow_Celestial": "キャラクター昇格素材：風（刃 / フォフォ）",
"Stagnant_Shadow_Perdition": "キャラクター昇格素材：物理（寒鴉 / アルジェンティ）",
"Cavern_of_Corrosion_Path_of_Gelid_Wind": "侵蝕トンネル・霜風の路",
"Cavern_of_Corrosion_Path_of_Jabbing_Punch": "侵蝕トンネル・迅拳の路",
"Cavern_of_Corrosion_Path_of_Drifting": "侵蝕トンネル・漂泊の路",
"Cavern_of_Corrosion_Path_of_Providence": "侵蝕トンネル・睿治の路",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "侵蝕トンネル・聖頌の路",
"Cavern_of_Corrosion_Path_of_Conflagration": "侵蝕トンネル・野焔の路",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "侵蝕トンネル・薬使の路"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "侵蝕トンネル・薬使の路",
"Cavern_of_Corrosion_Path_of_Darkness": "侵蝕トンネル・幽冥の路"
},
"NameAtDoubleCalyx": {
"name": "Dungeon.NameAtDoubleCalyx.name",
@ -271,7 +273,8 @@
"Cavern_of_Corrosion_Path_of_Providence": "侵蝕トンネル・睿治の路",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "侵蝕トンネル・聖頌の路",
"Cavern_of_Corrosion_Path_of_Conflagration": "侵蝕トンネル・野焔の路",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "侵蝕トンネル・薬使の路"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "侵蝕トンネル・薬使の路",
"Cavern_of_Corrosion_Path_of_Darkness": "侵蝕トンネル・幽冥の路"
},
"Team": {
"name": "Dungeon.Team.name",
@ -325,7 +328,8 @@
"Stagnant_Shadow_Puppetry": "キャラクター昇格素材：虚数（丹恒・飲月）",
"Stagnant_Shadow_Abomination": "キャラクター昇格素材：量子（リンクス / 符玄）",
"Stagnant_Shadow_Scorch": "キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ）",
"Stagnant_Shadow_Celestial": "キャラクター昇格素材：風（刃）"
"Stagnant_Shadow_Celestial": "キャラクター昇格素材：風（刃 / フォフォ）",
"Stagnant_Shadow_Perdition": "キャラクター昇格素材：物理（寒鴉 / アルジェンティ）"
},
"CavernOfCorrosion": {
"name": "DungeonDaily.CavernOfCorrosion.name",
@ -337,7 +341,8 @@
"Cavern_of_Corrosion_Path_of_Providence": "侵蝕トンネル・睿治の路",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "侵蝕トンネル・聖頌の路",
"Cavern_of_Corrosion_Path_of_Conflagration": "侵蝕トンネル・野焔の路",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "侵蝕トンネル・薬使の路"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "侵蝕トンネル・薬使の路",
"Cavern_of_Corrosion_Path_of_Darkness": "侵蝕トンネル・幽冥の路"
}
},
"DungeonSupport": {
@ -370,6 +375,7 @@
"Herta": "ヘルタ",
"Himeko": "姫子",
"Hook": "フック",
"Huohuo": "フォフォ",
"JingYuan": "景元",
"Jingliu": "鏡流",
"Kafka": "カフカ",
@ -386,7 +392,7 @@
"SilverWolf": "銀狼",
"Sushang": "素裳",
"Tingyun": "停雲",
"TopazandNumby": "トパーズ&カブ",
"TopazNumby": "トパーズ&カブ",
"TrailblazerDestruction": "開拓者・壊滅",
"TrailblazerPreservation": "開拓者・存護",
"Welt": "ヴェルト",
@ -501,7 +507,7 @@
"not_supported": "not_supported"
},
"Inflict_Weakness_Break_5_times": {
"name": "累計で弱点撃破効果を5回発動する",
"name": "累計で弱点撃破効果を5回発動させる",
"help": "AchievableQuest.Inflict_Weakness_Break_5_times.help",
"achievable": "achievable",
"not_set": "not_set",

18
module/config/i18n/zh-CN.json
View File

@ -237,14 +237,16 @@
"Stagnant_Shadow_Puppetry": "角色晋阶材料：虚数（丹恒•饮月）",
"Stagnant_Shadow_Abomination": "角色晋阶材料：量子（玲可 / 符玄）",
"Stagnant_Shadow_Scorch": "角色晋阶材料：火（桂乃芬 / 托帕&账账）",
"Stagnant_Shadow_Celestial": "角色晋阶材料：风（刃）",
"Stagnant_Shadow_Celestial": "角色晋阶材料：风（刃 / 藿藿）",
"Stagnant_Shadow_Perdition": "角色晋阶材料：物理（寒鸦 / 银枝）",
"Cavern_of_Corrosion_Path_of_Gelid_Wind": "遗器：冰套+风套（霜风之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Jabbing_Punch": "遗器：物理套+击破套（迅拳之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Drifting": "遗器：治疗套+快枪手（漂泊之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Providence": "遗器：铁卫套+量子套（睿治之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "遗器：防御套+雷套（圣颂之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Conflagration": "遗器：火套+虚数套（野焰之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遗器：生命套+速度套（药使之径•侵蚀隧洞）"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遗器：生命套+速度套（药使之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Darkness": "遗器：追击套+dot套（幽冥之径•侵蚀隧洞）"
},
"NameAtDoubleCalyx": {
"name": "有双倍花活动时，选择副本",
@ -271,7 +273,8 @@
"Cavern_of_Corrosion_Path_of_Providence": "遗器：铁卫套+量子套（睿治之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "遗器：防御套+雷套（圣颂之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Conflagration": "遗器：火套+虚数套（野焰之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遗器：生命套+速度套（药使之径•侵蚀隧洞）"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遗器：生命套+速度套（药使之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Darkness": "遗器：追击套+dot套（幽冥之径•侵蚀隧洞）"
},
"Team": {
"name": "打本队伍",
@ -325,7 +328,8 @@
"Stagnant_Shadow_Puppetry": "角色晋阶材料：虚数（丹恒•饮月）",
"Stagnant_Shadow_Abomination": "角色晋阶材料：量子（玲可 / 符玄）",
"Stagnant_Shadow_Scorch": "角色晋阶材料：火（桂乃芬 / 托帕&账账）",
"Stagnant_Shadow_Celestial": "角色晋阶材料：风（刃）"
"Stagnant_Shadow_Celestial": "角色晋阶材料：风（刃 / 藿藿）",
"Stagnant_Shadow_Perdition": "角色晋阶材料：物理（寒鸦 / 银枝）"
},
"CavernOfCorrosion": {
"name": "完成1次侵蚀隧洞",
@ -337,7 +341,8 @@
"Cavern_of_Corrosion_Path_of_Providence": "遗器：铁卫套+量子套（睿治之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "遗器：防御套+雷套（圣颂之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Conflagration": "遗器：火套+虚数套（野焰之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遗器：生命套+速度套（药使之径•侵蚀隧洞）"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遗器：生命套+速度套（药使之径•侵蚀隧洞）",
"Cavern_of_Corrosion_Path_of_Darkness": "遗器：追击套+dot套（幽冥之径•侵蚀隧洞）"
}
},
"DungeonSupport": {
@ -370,6 +375,7 @@
"Herta": "黑塔",
"Himeko": "姬子",
"Hook": "虎克",
"Huohuo": "藿藿",
"JingYuan": "景元",
"Jingliu": "镜流",
"Kafka": "卡芙卡",
@ -386,7 +392,7 @@
"SilverWolf": "银狼",
"Sushang": "素裳",
"Tingyun": "停云",
"TopazandNumby": "托帕&账账",
"TopazNumby": "托帕&账账",
"TrailblazerDestruction": "开拓者•毁灭",
"TrailblazerPreservation": "开拓者•存护",
"Welt": "瓦尔特",

18
module/config/i18n/zh-TW.json
View File

@ -237,14 +237,16 @@
"Stagnant_Shadow_Puppetry": "角色晉階材料：虛數（丹恆•飲月）",
"Stagnant_Shadow_Abomination": "角色晉階材料：量子（玲可 / 符玄）",
"Stagnant_Shadow_Scorch": "角色晉階材料：火（桂乃芬 / 托帕&帳帳）",
"Stagnant_Shadow_Celestial": "角色晉階材料：風（刃）",
"Stagnant_Shadow_Celestial": "角色晉階材料：風（刃 / 藿藿）",
"Stagnant_Shadow_Perdition": "角色晉階材料：物理（寒鴉 / 銀枝）",
"Cavern_of_Corrosion_Path_of_Gelid_Wind": "遺器：冰套+風套（霜風之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Jabbing_Punch": "遺器：物理套+擊破套（迅拳之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Drifting": "遺器：治療套+快槍手（漂泊之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Providence": "遺器：鐵衛套+量子套（睿治之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "遺器：防禦套+雷套（聖頌之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Conflagration": "遺器：火套+虛數套（野焰之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遺器：生命套+速度套（藥使之徑•侵蝕隧洞）"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遺器：生命套+速度套（藥使之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Darkness": "遺器：追擊套+dot套（幽冥之徑•侵蝕隧洞）"
},
"NameAtDoubleCalyx": {
"name": "有雙倍花活動時，選擇副本",
@ -271,7 +273,8 @@
"Cavern_of_Corrosion_Path_of_Providence": "遺器：鐵衛套+量子套（睿治之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "遺器：防禦套+雷套（聖頌之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Conflagration": "遺器：火套+虛數套（野焰之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遺器：生命套+速度套（藥使之徑•侵蝕隧洞）"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遺器：生命套+速度套（藥使之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Darkness": "遺器：追擊套+dot套（幽冥之徑•侵蝕隧洞）"
},
"Team": {
"name": "打本隊伍",
@ -325,7 +328,8 @@
"Stagnant_Shadow_Puppetry": "角色晉階材料：虛數（丹恆•飲月）",
"Stagnant_Shadow_Abomination": "角色晉階材料：量子（玲可 / 符玄）",
"Stagnant_Shadow_Scorch": "角色晉階材料：火（桂乃芬 / 托帕&帳帳）",
"Stagnant_Shadow_Celestial": "角色晉階材料：風（刃）"
"Stagnant_Shadow_Celestial": "角色晉階材料：風（刃 / 藿藿）",
"Stagnant_Shadow_Perdition": "角色晉階材料：物理（寒鴉 / 銀枝）"
},
"CavernOfCorrosion": {
"name": "完成1次侵蝕隧洞",
@ -337,7 +341,8 @@
"Cavern_of_Corrosion_Path_of_Providence": "遺器：鐵衛套+量子套（睿治之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Holy_Hymn": "遺器：防禦套+雷套（聖頌之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Conflagration": "遺器：火套+虛數套（野焰之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遺器：生命套+速度套（藥使之徑•侵蝕隧洞）"
"Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遺器：生命套+速度套（藥使之徑•侵蝕隧洞）",
"Cavern_of_Corrosion_Path_of_Darkness": "遺器：追擊套+dot套（幽冥之徑•侵蝕隧洞）"
}
},
"DungeonSupport": {
@ -370,6 +375,7 @@
"Herta": "黑塔",
"Himeko": "姬子",
"Hook": "虎克",
"Huohuo": "藿藿",
"JingYuan": "景元",
"Jingliu": "鏡流",
"Kafka": "卡芙卡",
@ -386,7 +392,7 @@
"SilverWolf": "銀狼",
"Sushang": "素裳",
"Tingyun": "停雲",
"TopazandNumby": "托帕&帳帳",
"TopazNumby": "托帕&帳帳",
"TrailblazerDestruction": "開拓者•毀滅",
"TrailblazerPreservation": "開拓者•存護",
"Welt": "瓦爾特",

8
tasks/base/assets/assets_base_popup.py
View File

@ -7,10 +7,10 @@ BATTLE_PASS_NOTIFICATION = ButtonWrapper(
name='BATTLE_PASS_NOTIFICATION',
share=Button(
file='./assets/share/base/popup/BATTLE_PASS_NOTIFICATION.png',
area=(960, 601, 984, 625),
search=(940, 581, 1004, 645),
color=(137, 127, 109),
button=(895, 595, 1180, 630),
area=(922, 592, 944, 614),
search=(850, 589, 952, 618),
color=(122, 112, 93),
button=(918, 587, 1079, 619),
),
)
GET_CHARACTER = ButtonWrapper(

2
tasks/character/keywords/__init__.py
View File

@ -16,7 +16,7 @@ DICT_SORTED_RANGES = {
# Archer
'Archer': [
Yukong,
TopazandNumby,
TopazNumby,
March7th,
Bronya,
Asta,

105
tasks/character/keywords/character_list.py
View File

@ -3,8 +3,17 @@ from .classes import CharacterList
# This file was auto-generated, do not modify it manually. To generate:
# ``` python -m dev_tools.keyword_extract ```
Arlan = CharacterList(
Argenti = CharacterList(
id=1,
name='Argenti',
cn='银枝',
cht='銀枝',
en='Argenti',
jp='アルジェンティ',
es='Argenti',
)
Arlan = CharacterList(
id=2,
name='Arlan',
cn='阿兰',
cht='阿蘭',
@ -13,7 +22,7 @@ Arlan = CharacterList(
es='Arlan',
)
Asta = CharacterList(
id=2,
id=3,
name='Asta',
cn='艾丝妲',
cht='艾絲妲',
@ -22,7 +31,7 @@ Asta = CharacterList(
es='Asta',
)
Bailu = CharacterList(
id=3,
id=4,
name='Bailu',
cn='白露',
cht='白露',
@ -31,7 +40,7 @@ Bailu = CharacterList(
es='Bailu',
)
Blade = CharacterList(
id=4,
id=5,
name='Blade',
cn='刃',
cht='刃',
@ -40,7 +49,7 @@ Blade = CharacterList(
es='Blade',
)
Bronya = CharacterList(
id=5,
id=6,
name='Bronya',
cn='布洛妮娅',
cht='布洛妮婭',
@ -49,7 +58,7 @@ Bronya = CharacterList(
es='Bronya',
)
Clara = CharacterList(
id=6,
id=7,
name='Clara',
cn='克拉拉',
cht='克拉拉',
@ -58,7 +67,7 @@ Clara = CharacterList(
es='Clara',
)
DanHeng = CharacterList(
id=7,
id=8,
name='DanHeng',
cn='丹恒',
cht='丹恆',
@ -67,7 +76,7 @@ DanHeng = CharacterList(
es='Dan Heng',
)
DanHengImbibitorLunae = CharacterList(
id=8,
id=9,
name='DanHengImbibitorLunae',
cn='丹恒•饮月',
cht='丹恆•飲月',
@ -76,7 +85,7 @@ DanHengImbibitorLunae = CharacterList(
es='Dan Heng - Imbibitor Lunae',
)
FuXuan = CharacterList(
id=9,
id=10,
name='FuXuan',
cn='符玄',
cht='符玄',
@ -85,7 +94,7 @@ FuXuan = CharacterList(
es='Fu Xuan',
)
Gepard = CharacterList(
id=10,
id=11,
name='Gepard',
cn='杰帕德',
cht='傑帕德',
@ -94,7 +103,7 @@ Gepard = CharacterList(
es='Gepard',
)
Guinaifen = CharacterList(
id=11,
id=12,
name='Guinaifen',
cn='桂乃芬',
cht='桂乃芬',
@ -102,8 +111,17 @@ Guinaifen = CharacterList(
jp='桂乃芬',
es='Guinaifen',
)
Hanya = CharacterList(
id=13,
name='Hanya',
cn='寒鸦',
cht='寒鴉',
en='Hanya',
jp='寒鴉',
es='Hanya',
)
Herta = CharacterList(
id=12,
id=14,
name='Herta',
cn='黑塔',
cht='黑塔',
@ -112,7 +130,7 @@ Herta = CharacterList(
es='Herta',
)
Himeko = CharacterList(
id=13,
id=15,
name='Himeko',
cn='姬子',
cht='姬子',
@ -121,7 +139,7 @@ Himeko = CharacterList(
es='Himeko',
)
Hook = CharacterList(
id=14,
id=16,
name='Hook',
cn='虎克',
cht='虎克',
@ -129,8 +147,17 @@ Hook = CharacterList(
jp='フック',
es='Hook',
)
Huohuo = CharacterList(
id=17,
name='Huohuo',
cn='藿藿',
cht='藿藿',
en='Huohuo',
jp='フォフォ',
es='Huohuo',
)
JingYuan = CharacterList(
id=15,
id=18,
name='JingYuan',
cn='景元',
cht='景元',
@ -139,7 +166,7 @@ JingYuan = CharacterList(
es='Jing Yuan',
)
Jingliu = CharacterList(
id=16,
id=19,
name='Jingliu',
cn='镜流',
cht='鏡流',
@ -148,7 +175,7 @@ Jingliu = CharacterList(
es='Jingliu',
)
Kafka = CharacterList(
id=17,
id=20,
name='Kafka',
cn='卡芙卡',
cht='卡芙卡',
@ -157,7 +184,7 @@ Kafka = CharacterList(
es='Kafka',
)
Luka = CharacterList(
id=18,
id=21,
name='Luka',
cn='卢卡',
cht='盧卡',
@ -166,7 +193,7 @@ Luka = CharacterList(
es='Luka',
)
Luocha = CharacterList(
id=19,
id=22,
name='Luocha',
cn='罗刹',
cht='羅剎',
@ -175,7 +202,7 @@ Luocha = CharacterList(
es='Luocha',
)
Lynx = CharacterList(
id=20,
id=23,
name='Lynx',
cn='玲可',
cht='玲可',
@ -184,7 +211,7 @@ Lynx = CharacterList(
es='Lynx',
)
March7th = CharacterList(
id=21,
id=24,
name='March7th',
cn='三月七',
cht='三月七',
@ -193,7 +220,7 @@ March7th = CharacterList(
es='Siete de Marzo',
)
Natasha = CharacterList(
id=22,
id=25,
name='Natasha',
cn='娜塔莎',
cht='娜塔莎',
@ -202,7 +229,7 @@ Natasha = CharacterList(
es='Natasha',
)
Pela = CharacterList(
id=23,
id=26,
name='Pela',
cn='佩拉',
cht='佩拉',
@ -211,7 +238,7 @@ Pela = CharacterList(
es='Pela',
)
Qingque = CharacterList(
id=24,
id=27,
name='Qingque',
cn='青雀',
cht='青雀',
@ -220,7 +247,7 @@ Qingque = CharacterList(
es='Qingque',
)
Sampo = CharacterList(
id=25,
id=28,
name='Sampo',
cn='桑博',
cht='桑博',
@ -229,7 +256,7 @@ Sampo = CharacterList(
es='Sampo',
)
Seele = CharacterList(
id=26,
id=29,
name='Seele',
cn='希儿',
cht='希兒',
@ -238,7 +265,7 @@ Seele = CharacterList(
es='Seele',
)
Serval = CharacterList(
id=27,
id=30,
name='Serval',
cn='希露瓦',
cht='希露瓦',
@ -247,7 +274,7 @@ Serval = CharacterList(
es='Serval',
)
SilverWolf = CharacterList(
id=28,
id=31,
name='SilverWolf',
cn='银狼',
cht='銀狼',
@ -256,7 +283,7 @@ SilverWolf = CharacterList(
es='Silver Wolf',
)
Sushang = CharacterList(
id=29,
id=32,
name='Sushang',
cn='素裳',
cht='素裳',
@ -265,7 +292,7 @@ Sushang = CharacterList(
es='Sushang',
)
Tingyun = CharacterList(
id=30,
id=33,
name='Tingyun',
cn='停云',
cht='停雲',
@ -273,17 +300,17 @@ Tingyun = CharacterList(
jp='停雲',
es='Tingyun',
)
TopazandNumby = CharacterList(
id=31,
name='TopazandNumby',
TopazNumby = CharacterList(
id=34,
name='TopazNumby',
cn='托帕&账账',
cht='托帕&帳帳',
en='Topaz and Numby',
en='Topaz & Numby',
jp='トパーズ&カブ',
es='Topaz y Conti',
)
TrailblazerDestruction = CharacterList(
id=32,
id=35,
name='TrailblazerDestruction',
cn='Trailblazer•毁灭',
cht='Trailblazer•毀滅',
@ -292,7 +319,7 @@ TrailblazerDestruction = CharacterList(
es='Trailblazer: Destrucción',
)
TrailblazerPreservation = CharacterList(
id=33,
id=36,
name='TrailblazerPreservation',
cn='Trailblazer•存护',
cht='Trailblazer•存護',
@ -301,7 +328,7 @@ TrailblazerPreservation = CharacterList(
es='Trailblazer: Conservación',
)
Welt = CharacterList(
id=34,
id=37,
name='Welt',
cn='瓦尔特',
cht='瓦爾特',
@ -310,7 +337,7 @@ Welt = CharacterList(
es='Welt',
)
Yanqing = CharacterList(
id=35,
id=38,
name='Yanqing',
cn='彦卿',
cht='彥卿',
@ -319,7 +346,7 @@ Yanqing = CharacterList(
es='Yanqing',
)
Yukong = CharacterList(
id=36,
id=39,
name='Yukong',
cn='驭空',
cht='馭空',

2
tasks/daily/keywords/daily_quest.py
View File

@ -63,7 +63,7 @@ Inflict_Weakness_Break_5_times = DailyQuest(
cn='累计触发弱点击破效果5次',
cht='累積觸發弱點擊破效果5次',
en='Inflict Weakness Break 5 times',
jp='累計で弱点撃破効果を5回発動する',
jp='累計で弱点撃破効果を5回発動させる',
es='Inflige Ruptura de Debilidad 5 veces',
)
Defeat_a_total_of_20_enemies = DailyQuest(

65
tasks/dungeon/keywords/dungeon.py
View File

@ -210,8 +210,17 @@ Stagnant_Shadow_Celestial = DungeonList(
jp='凝結虚影・天人の形',
es='Forma de lo celestial',
)
Cavern_of_Corrosion_Path_of_Gelid_Wind = DungeonList(
Stagnant_Shadow_Perdition = DungeonList(
id=24,
name='Stagnant_Shadow_Perdition',
cn='幽府之形•凝滞虚影',
cht='幽府之形•凝滯虛影',
en='Shape of Perdition',
jp='凝結虚影・幽府の形',
es='Forma del aislamiento',
)
Cavern_of_Corrosion_Path_of_Gelid_Wind = DungeonList(
id=25,
name='Cavern_of_Corrosion_Path_of_Gelid_Wind',
cn='霜风之径•侵蚀隧洞',
cht='霜風之徑•侵蝕隧洞',
@ -220,7 +229,7 @@ Cavern_of_Corrosion_Path_of_Gelid_Wind = DungeonList(
es='Senda del viento gélido',
)
Cavern_of_Corrosion_Path_of_Jabbing_Punch = DungeonList(
id=25,
id=26,
name='Cavern_of_Corrosion_Path_of_Jabbing_Punch',
cn='迅拳之径•侵蚀隧洞',
cht='迅拳之徑•侵蝕隧洞',
@ -229,7 +238,7 @@ Cavern_of_Corrosion_Path_of_Jabbing_Punch = DungeonList(
es='Senda de los puños rápidos',
)
Cavern_of_Corrosion_Path_of_Drifting = DungeonList(
id=26,
id=27,
name='Cavern_of_Corrosion_Path_of_Drifting',
cn='漂泊之径•侵蚀隧洞',
cht='漂泊之徑•侵蝕隧洞',
@ -238,7 +247,7 @@ Cavern_of_Corrosion_Path_of_Drifting = DungeonList(
es='Senda de la deriva',
)
Cavern_of_Corrosion_Path_of_Providence = DungeonList(
id=27,
id=28,
name='Cavern_of_Corrosion_Path_of_Providence',
cn='睿治之径•侵蚀隧洞',
cht='睿治之徑•侵蝕隧洞',
@ -247,7 +256,7 @@ Cavern_of_Corrosion_Path_of_Providence = DungeonList(
es='Senda de la providencia',
)
Cavern_of_Corrosion_Path_of_Holy_Hymn = DungeonList(
id=28,
id=29,
name='Cavern_of_Corrosion_Path_of_Holy_Hymn',
cn='圣颂之径•侵蚀隧洞',
cht='聖頌之徑•侵蝕隧洞',
@ -256,7 +265,7 @@ Cavern_of_Corrosion_Path_of_Holy_Hymn = DungeonList(
es='Senda del himno sagrado',
)
Cavern_of_Corrosion_Path_of_Conflagration = DungeonList(
id=29,
id=30,
name='Cavern_of_Corrosion_Path_of_Conflagration',
cn='野焰之径•侵蚀隧洞',
cht='野焰之徑•侵蝕隧洞',
@ -265,7 +274,7 @@ Cavern_of_Corrosion_Path_of_Conflagration = DungeonList(
es='Senda de la conflagración',
)
Cavern_of_Corrosion_Path_of_Elixir_Seekers = DungeonList(
id=30,
id=31,
name='Cavern_of_Corrosion_Path_of_Elixir_Seekers',
cn='药使之径•侵蚀隧洞',
cht='藥使之徑•侵蝕隧洞',
@ -273,8 +282,17 @@ Cavern_of_Corrosion_Path_of_Elixir_Seekers = DungeonList(
jp='侵蝕トンネル・薬使の路',
es='Senda de los elixires',
)
Cavern_of_Corrosion_Path_of_Darkness = DungeonList(
id=32,
name='Cavern_of_Corrosion_Path_of_Darkness',
cn='幽冥之径•侵蚀隧洞',
cht='幽冥之徑•侵蝕隧洞',
en='Path of Darkness',
jp='侵蝕トンネル・幽冥の路',
es='Senda de la oscuridad',
)
Echo_of_War_Destruction_Beginning = DungeonList(
id=31,
id=33,
name='Echo_of_War_Destruction_Beginning',
cn='毁灭的开端•历战余响',
cht='毀滅的開端•歷戰餘響',
@ -283,7 +301,7 @@ Echo_of_War_Destruction_Beginning = DungeonList(
es='El principio de la Destrucción',
)
Echo_of_War_End_of_the_Eternal_Freeze = DungeonList(
id=32,
id=34,
name='Echo_of_War_End_of_the_Eternal_Freeze',
cn='寒潮的落幕•历战余响',
cht='寒潮的落幕•歷戰餘響',
@ -292,7 +310,7 @@ Echo_of_War_End_of_the_Eternal_Freeze = DungeonList(
es='El fin del Hielo Eterno',
)
Echo_of_War_Divine_Seed = DungeonList(
id=33,
id=35,
name='Echo_of_War_Divine_Seed',
cn='不死的神实•历战余响',
cht='不死的神實•歷戰餘響',
@ -301,7 +319,7 @@ Echo_of_War_Divine_Seed = DungeonList(
es='Semilla divina',
)
Simulated_Universe_World_1 = DungeonList(
id=34,
id=36,
name='Simulated_Universe_World_1',
cn='第一世界•模拟宇宙',
cht='第一世界•模擬宇宙',
@ -310,7 +328,7 @@ Simulated_Universe_World_1 = DungeonList(
es='Mundo 1',
)
Simulated_Universe_World_3 = DungeonList(
id=35,
id=37,
name='Simulated_Universe_World_3',
cn='第三世界•模拟宇宙',
cht='第三世界•模擬宇宙',
@ -319,7 +337,7 @@ Simulated_Universe_World_3 = DungeonList(
es='Mundo 3',
)
Simulated_Universe_World_4 = DungeonList(
id=36,
id=38,
name='Simulated_Universe_World_4',
cn='第四世界•模拟宇宙',
cht='第四世界•模擬宇宙',
@ -328,7 +346,7 @@ Simulated_Universe_World_4 = DungeonList(
es='Mundo 4',
)
Simulated_Universe_World_5 = DungeonList(
id=37,
id=39,
name='Simulated_Universe_World_5',
cn='第五世界•模拟宇宙',
cht='第五世界•模擬宇宙',
@ -337,7 +355,7 @@ Simulated_Universe_World_5 = DungeonList(
es='Mundo 5',
)
Simulated_Universe_World_6 = DungeonList(
id=38,
id=40,
name='Simulated_Universe_World_6',
cn='第六世界•模拟宇宙',
cht='第六世界•模擬宇宙',
@ -346,7 +364,7 @@ Simulated_Universe_World_6 = DungeonList(
es='Mundo 6',
)
Simulated_Universe_World_7 = DungeonList(
id=39,
id=41,
name='Simulated_Universe_World_7',
cn='第七世界•模拟宇宙',
cht='第七世界•模擬宇宙',
@ -354,8 +372,17 @@ Simulated_Universe_World_7 = DungeonList(
jp='第七世界・模擬宇宙',
es='Mundo 7',
)
Simulated_Universe_World_8 = DungeonList(
id=42,
name='Simulated_Universe_World_8',
cn='第八世界•模拟宇宙',
cht='第八世界•模擬宇宙',
en='Simulated Universe — World 8',
jp='第八世界・模擬宇宙',
es='Mundo 8',
)
The_Voyage_of_Navis_Astriger = DungeonList(
id=40,
id=43,
name='The_Voyage_of_Navis_Astriger',
cn='天艟求仙迷航录',
cht='天艟求仙迷航錄',
@ -364,7 +391,7 @@ The_Voyage_of_Navis_Astriger = DungeonList(
es='El viaje de las naves astriger',
)
The_Last_Vestiges_of_Towering_Citadel = DungeonList(
id=41,
id=44,
name='The_Last_Vestiges_of_Towering_Citadel',
cn='永屹之城遗秘',
cht='永屹之城遺秘',
@ -373,7 +400,7 @@ The_Last_Vestiges_of_Towering_Citadel = DungeonList(
es='Herencia de la Ciudadela Imponente',
)
Memory_of_Chaos = DungeonList(
id=42,
id=45,
name='Memory_of_Chaos',
cn='混沌回忆',
cht='混沌回憶',

21
tasks/dungeon/keywords/dungeon_detailed.py
View File

@ -107,16 +107,25 @@ Stagnant_Shadow_Scorch = DungeonDetailed(
name='Stagnant_Shadow_Scorch',
cn='角色晋阶材料：火（桂乃芬 / 托帕&账账）',
cht='角色晉階材料：火（桂乃芬 / 托帕&帳帳）',
en='Ascension: Fire (Guinaifen / Topaz and Numby)',
en='Ascension: Fire (Guinaifen / Topaz & Numby)',
jp='キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ）',
es='Ascension: Fuego (Guinaifen / Topaz y Conti)',
)
Stagnant_Shadow_Celestial = DungeonDetailed(
id=13,
name='Stagnant_Shadow_Celestial',
cn='角色晋阶材料：风（刃）',
cht='角色晉階材料：風（刃）',
en='Ascension: Wind (Blade)',
jp='キャラクター昇格素材：風（刃）',
es='Ascension: Viento (Blade)',
cn='角色晋阶材料：风（刃 / 藿藿）',
cht='角色晉階材料：風（刃 / 藿藿）',
en='Ascension: Wind (Blade / Huohuo)',
jp='キャラクター昇格素材：風（刃 / フォフォ）',
es='Ascension: Viento (Blade / Huohuo)',
)
Stagnant_Shadow_Perdition = DungeonDetailed(
id=14,
name='Stagnant_Shadow_Perdition',
cn='角色晋阶材料：物理（寒鸦 / 银枝）',
cht='角色晉階材料：物理（寒鴉 / 銀枝）',
en='Ascension: Physical (Hanya / Argenti)',
jp='キャラクター昇格素材：物理（寒鴉 / アルジェンティ）',
es='Ascension: Físico (Hanya / Argenti)',
)

24
tasks/forgotten_hall/assets/assets_forgotten_hall_team.py
View File

@ -7,39 +7,39 @@ CHARACTER_1 = ButtonWrapper(
name='CHARACTER_1',
share=Button(
file='./assets/share/forgotten_hall/team/CHARACTER_1.png',
area=(44, 166, 140, 190),
search=(24, 146, 160, 210),
area=(44, 172, 140, 196),
search=(24, 152, 160, 216),
color=(211, 210, 213),
button=(44, 100, 140, 211),
button=(44, 106, 140, 217),
),
)
CHARACTER_2 = ButtonWrapper(
name='CHARACTER_2',
share=Button(
file='./assets/share/forgotten_hall/team/CHARACTER_2.png',
area=(150, 166, 246, 190),
search=(130, 146, 266, 210),
area=(150, 172, 246, 196),
search=(130, 152, 266, 216),
color=(212, 211, 210),
button=(150, 100, 246, 212),
button=(150, 106, 246, 218),
),
)
CHARACTER_3 = ButtonWrapper(
name='CHARACTER_3',
share=Button(
file='./assets/share/forgotten_hall/team/CHARACTER_3.png',
area=(256, 166, 352, 190),
search=(236, 146, 372, 210),
area=(256, 172, 352, 196),
search=(236, 152, 372, 216),
color=(214, 211, 212),
button=(256, 100, 352, 212),
button=(256, 106, 352, 218),
),
)
CHARACTER_4 = ButtonWrapper(
name='CHARACTER_4',
share=Button(
file='./assets/share/forgotten_hall/team/CHARACTER_4.png',
area=(44, 298, 140, 322),
search=(24, 278, 160, 342),
area=(44, 304, 140, 328),
search=(24, 284, 160, 348),
color=(212, 211, 213),
button=(44, 232, 140, 344),
button=(44, 238, 140, 350),
),
)

9
tasks/map/interact/aim.py
View File

@ -126,7 +126,7 @@ def draw_circle(image, circle, points):
class Aim:
radius_enemy = (24, 25)
radius_item = (8, 10)
radius_item = (5, 7)
def __init__(self):
self.debug = False
@ -163,7 +163,7 @@ class Aim:
# Get white circle `y`
y = subtract_blur(h, 3, negative=False)
cv2.inRange(h, 168, 255, h)
cv2.inRange(h, 168, 255, dst=h)
cv2.bitwise_and(y, h, dst=y)
# Get red glow `v`
cv2.inRange(v, 168, 255, dst=v)
@ -228,11 +228,12 @@ class Aim:
# Draw circles
draw = np.zeros((height, width), dtype=np.uint8)
draw_circle(draw, self.circle_item, points)
draw = subtract_blur(draw, 5)
if self.debug:
self.draw_item = cv2.multiply(draw, 2)
self.draw_item = cv2.multiply(draw, 4)
# Find peaks
points = inrange(draw, lower=64)
points = inrange(draw, lower=12)
points = Points(points).group(threshold=10)
if points.shape[0] > 3:
logger.warning(f'AimDetector.predict_item() too many peaks: {points.shape}')