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

Merge pull request #341 from LmeSzinc/bug_fix

Browse Source 
Bug fix
This commit is contained in:
LmeSzinc 2024-02-24 00:46:48 +08:00 committed by GitHub
commit 59bd0e8a6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 120 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/share/combat/state/COMBAT_AUTO.BUTTON.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
assets/share/combat/state/COMBAT_SPEED_2X.BUTTON.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

4
config/template.json
View File

@ -173,6 +173,10 @@
"Weekly": {
"Name": "Echo_of_War_Divine_Seed",
"Team": 1
},
"DungeonSupport": {
"Use": "do_not_use",
"Character": "FirstCharacter"
}
},
"Rogue": {

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

@ -1276,6 +1276,67 @@
9
]
}
},
"DungeonSupport": {
"Use": {
"type": "select",
"value": "do_not_use",
"option": [
"always_use",
"do_not_use"
]
},
"Character": {
"type": "select",
"value": "FirstCharacter",
"option": [
"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"
]
}
}
},
"Rogue": {

6
module/config/argument/default.yaml
View File

@ -22,3 +22,9 @@ Assignment:
Freebies:
Scheduler:
Enable: true
# ==================== Weekly ====================
Weekly:
DungeonSupport:
Use: do_not_use

7
module/config/argument/override.yaml
View File

@ -30,3 +30,10 @@ DataUpdate:
value: true
option: [ true, ]
option_bold: [ true, ]
# ==================== Weekly ====================
Weekly:
DungeonSupport:
Use:
option: [ always_use, do_not_use ]

1
module/config/argument/task.yaml
View File

@ -54,6 +54,7 @@ Weekly:
Weekly:
- Scheduler
- Weekly
- DungeonSupport
Rogue:
- Scheduler
- RogueWorld

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

@ -223,13 +223,13 @@
"Name": {
"name": "Dungeon Name",
"help": "Default dungeon setting",
"Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-VI))",
"Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-Ⅵ))",
"Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: Character EXP (Bud of Memories (The Xianzhou Luofu))",
"Calyx_Golden_Memories_Penacony": "Material: Character EXP (Bud of Memories (Penacony))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-VI))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-Ⅵ))",
"Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: Light Cone EXP (Bud of Aether (The Xianzhou Luofu))",
"Calyx_Golden_Aether_Penacony": "Material: Light Cone EXP (Bud of Aether (Penacony))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-VI))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-Ⅵ))",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Credit (Bud of Treasures (The Xianzhou Luofu))",
"Calyx_Golden_Treasures_Penacony": "Material: Credit (Bud of Treasures (Penacony))",
"Calyx_Crimson_Destruction_Herta_StorageZone": "Trace: Destruction (Storage Zone)",
@ -272,13 +272,13 @@
"name": "At Double Calyx Event, choose dungeon",
"help": "Return to the default dungeon settings after double times exhausted",
"do_not_participate": "Dont participate in event",
"Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-VI))",
"Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-Ⅵ))",
"Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: Character EXP (Bud of Memories (The Xianzhou Luofu))",
"Calyx_Golden_Memories_Penacony": "Material: Character EXP (Bud of Memories (Penacony))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-VI))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-Ⅵ))",
"Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: Light Cone EXP (Bud of Aether (The Xianzhou Luofu))",
"Calyx_Golden_Aether_Penacony": "Material: Light Cone EXP (Bud of Aether (Penacony))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-VI))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-Ⅵ))",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Credit (Bud of Treasures (The Xianzhou Luofu))",
"Calyx_Golden_Treasures_Penacony": "Material: Credit (Bud of Treasures (Penacony))",
"Calyx_Crimson_Destruction_Herta_StorageZone": "Trace: Destruction (Storage Zone)",
@ -329,13 +329,13 @@
"name": "Clear Calyx Golden 1 times",
"help": "",
"do_not_achieve": "Don't Do This Quest",
"Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-VI))",
"Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-Ⅵ))",
"Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: Character EXP (Bud of Memories (The Xianzhou Luofu))",
"Calyx_Golden_Memories_Penacony": "Material: Character EXP (Bud of Memories (Penacony))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-VI))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-Ⅵ))",
"Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: Light Cone EXP (Bud of Aether (The Xianzhou Luofu))",
"Calyx_Golden_Aether_Penacony": "Material: Light Cone EXP (Bud of Aether (Penacony))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-VI))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-Ⅵ))",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Credit (Bud of Treasures (The Xianzhou Luofu))",
"Calyx_Golden_Treasures_Penacony": "Material: Credit (Bud of Treasures (Penacony))"
},
@ -404,7 +404,7 @@
},
"Character": {
"name": "Support Character",
"help": "Select a friend support character, if not found, select the default (first) role",
"help": "Select a friend support character, if not found, select the default (first) role\nSupport character should not be the same as the character in the team, recommended to prioritize friends.",
"FirstCharacter": "First Character",
"Argenti": "Argenti",
"Arlan": "Arlan",

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

@ -223,13 +223,13 @@
"Name": {
"name": "Nombre de la Mazmorra",
"help": "Ajustes predeterminados de las mazmorras",
"Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-VI))",
"Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-Ⅵ))",
"Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: EXP de personaje (Flor de los recuerdos (El Luofu de Xianzhou))",
"Calyx_Golden_Memories_Penacony": "Material: EXP de personaje (Flor de los recuerdos (Colonipenal))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-VI))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-Ⅵ))",
"Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: EXP de conos de luz (Flor de éter (El Luofu de Xianzhou))",
"Calyx_Golden_Aether_Penacony": "Material: EXP de conos de luz (Flor de éter (Colonipenal))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-VI))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-Ⅵ))",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Créditos (Flor de tesoros (El Luofu de Xianzhou))",
"Calyx_Golden_Treasures_Penacony": "Material: Créditos (Flor de tesoros (Colonipenal))",
"Calyx_Crimson_Destruction_Herta_StorageZone": "Rastros: Destrucción (Zona de almacenamiento)",
@ -272,13 +272,13 @@
"name": "En los eventos de x2 de Cáliz",
"help": "Se volverán a los ajustes predeterminados una vez se acaben los intentos del evento",
"do_not_participate": "No participar en el evento",
"Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-VI))",
"Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-Ⅵ))",
"Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: EXP de personaje (Flor de los recuerdos (El Luofu de Xianzhou))",
"Calyx_Golden_Memories_Penacony": "Material: EXP de personaje (Flor de los recuerdos (Colonipenal))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-VI))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-Ⅵ))",
"Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: EXP de conos de luz (Flor de éter (El Luofu de Xianzhou))",
"Calyx_Golden_Aether_Penacony": "Material: EXP de conos de luz (Flor de éter (Colonipenal))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-VI))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-Ⅵ))",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Créditos (Flor de tesoros (El Luofu de Xianzhou))",
"Calyx_Golden_Treasures_Penacony": "Material: Créditos (Flor de tesoros (Colonipenal))",
"Calyx_Crimson_Destruction_Herta_StorageZone": "Rastros: Destrucción (Zona de almacenamiento)",
@ -329,13 +329,13 @@
"name": "Completar Cáliz (oro) 1 vez",
"help": "",
"do_not_achieve": "No hacer esta misión",
"Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-VI))",
"Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-Ⅵ))",
"Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: EXP de personaje (Flor de los recuerdos (El Luofu de Xianzhou))",
"Calyx_Golden_Memories_Penacony": "Material: EXP de personaje (Flor de los recuerdos (Colonipenal))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-VI))",
"Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-Ⅵ))",
"Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: EXP de conos de luz (Flor de éter (El Luofu de Xianzhou))",
"Calyx_Golden_Aether_Penacony": "Material: EXP de conos de luz (Flor de éter (Colonipenal))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-VI))",
"Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-Ⅵ))",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Créditos (Flor de tesoros (El Luofu de Xianzhou))",
"Calyx_Golden_Treasures_Penacony": "Material: Créditos (Flor de tesoros (Colonipenal))"
},
@ -404,7 +404,7 @@
},
"Character": {
"name": "Personaje de apoyo",
"help": "Selecciona qué personaje de apoyo de un amigo se usará. Si no se encuentra, se seleccionará al predeterminado.",
"help": "Selecciona qué personaje de apoyo de un amigo se usará. Si no se encuentra, se seleccionará al predeterminado.\nEl personaje de apoyo no debe ser el mismo que el personaje del equipo, se recomienda priorizar a los amigos.",
"FirstCharacter": "Primer personaje",
"Argenti": "Argenti",
"Arlan": "Arlan",

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

@ -223,13 +223,13 @@
"Name": {
"name": "Dungeon.Name.name",
"help": "Dungeon.Name.help",
"Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-VI）：",
"Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-Ⅵ）：",
"Calyx_Golden_Memories_The_Xianzhou_Luofu": "素材：役割経験（回憶の蕾・仙舟羅浮）：",
"Calyx_Golden_Memories_Penacony": "素材：役割経験（回憶の蕾・ピノコニー）：",
"Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-VI）：",
"Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-Ⅵ）：",
"Calyx_Golden_Aether_The_Xianzhou_Luofu": "素材：武器経験（エーテルの蕾・仙舟羅浮）：",
"Calyx_Golden_Aether_Penacony": "素材：武器経験（エーテルの蕾・ピノコニー）：",
"Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-VI）",
"Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-Ⅵ）",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu": "素材：クレジット（秘蔵の蕾・仙舟羅浮）",
"Calyx_Golden_Treasures_Penacony": "素材：クレジット（秘蔵の蕾・ピノコニー）",
"Calyx_Crimson_Destruction_Herta_StorageZone": "軌跡素材：壊滅（収容部分）",
@ -272,13 +272,13 @@
"name": "Dungeon.NameAtDoubleCalyx.name",
"help": "Dungeon.NameAtDoubleCalyx.help",
"do_not_participate": "do_not_participate",
"Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-VI）：",
"Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-Ⅵ）：",
"Calyx_Golden_Memories_The_Xianzhou_Luofu": "素材：役割経験（回憶の蕾・仙舟羅浮）：",
"Calyx_Golden_Memories_Penacony": "素材：役割経験（回憶の蕾・ピノコニー）：",
"Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-VI）：",
"Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-Ⅵ）：",
"Calyx_Golden_Aether_The_Xianzhou_Luofu": "素材：武器経験（エーテルの蕾・仙舟羅浮）：",
"Calyx_Golden_Aether_Penacony": "素材：武器経験（エーテルの蕾・ピノコニー）：",
"Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-VI）",
"Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-Ⅵ）",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu": "素材：クレジット（秘蔵の蕾・仙舟羅浮）",
"Calyx_Golden_Treasures_Penacony": "素材：クレジット（秘蔵の蕾・ピノコニー）",
"Calyx_Crimson_Destruction_Herta_StorageZone": "軌跡素材：壊滅（収容部分）",
@ -329,13 +329,13 @@
"name": "DungeonDaily.CalyxGolden.name",
"help": "DungeonDaily.CalyxGolden.help",
"do_not_achieve": "do_not_achieve",
"Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-VI）：",
"Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-Ⅵ）：",
"Calyx_Golden_Memories_The_Xianzhou_Luofu": "素材：役割経験（回憶の蕾・仙舟羅浮）：",
"Calyx_Golden_Memories_Penacony": "素材：役割経験（回憶の蕾・ピノコニー）：",
"Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-VI）：",
"Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-Ⅵ）：",
"Calyx_Golden_Aether_The_Xianzhou_Luofu": "素材：武器経験（エーテルの蕾・仙舟羅浮）：",
"Calyx_Golden_Aether_Penacony": "素材：武器経験（エーテルの蕾・ピノコニー）：",
"Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-VI）",
"Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-Ⅵ）",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu": "素材：クレジット（秘蔵の蕾・仙舟羅浮）",
"Calyx_Golden_Treasures_Penacony": "素材：クレジット（秘蔵の蕾・ピノコニー）"
},

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

@ -404,7 +404,7 @@
},
"Character": {
"name": "好友支援角色",
"help": "选择好友支援角色，未找到则选择默认（第一个）角色",
"help": "选择好友支援角色，未找到则选择默认（第一个）角色\n支援角色不要与队伍中的角色重复，建议置顶好友角色",
"FirstCharacter": "支援列表第一个角色",
"Argenti": "银枝",
"Arlan": "阿兰",

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

@ -404,7 +404,7 @@
},
"Character": {
"name": "好友支援角色",
"help": "選擇好友支援角色，未找到則選擇默認（第一個）角色",
"help": "選擇好友支援角色，未找到則選擇默認（第一個）角色\n支援角色不要與隊伍中的角色重複，建議置頂好友角色",
"FirstCharacter": "支援列表第一個角色",
"Argenti": "銀枝",
"Arlan": "阿蘭",

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

@ -6,6 +6,7 @@ from tasks.character.keywords.classes import CharacterList, CombatType
DICT_SORTED_RANGES = {
# Mage, hit instantly, no trajectories
'Mage': [
RuanMei,
DanHengImbibitorLunae,
Welt,
FuXuan,

4
tasks/combat/assets/assets_combat_state.py
View File

@ -10,7 +10,7 @@ COMBAT_AUTO = ButtonWrapper(
area=(1113, 22, 1183, 58),
search=(1093, 2, 1203, 78),
color=(135, 137, 131),
button=(1113, 22, 1183, 58),
button=(1136, 31, 1161, 49),
),
)
COMBAT_PAUSE = ButtonWrapper(
@ -30,6 +30,6 @@ COMBAT_SPEED_2X = ButtonWrapper(
area=(1029, 22, 1099, 58),
search=(1009, 2, 1119, 78),
color=(138, 143, 146),
button=(1029, 22, 1099, 58),
button=(1047, 29, 1079, 49),
),
)

4
tasks/combat/combat.py
View File

@ -265,8 +265,12 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
self.device.click(COMBAT_EXIT)
self.interval_reset(COMBAT_AGAIN)
continue
# Dropped light cone from weekly
if self.handle_get_light_cone():
continue
# Having any character died
if self.handle_popup_confirm():
continue
def combat_exit(self, skip_first_screenshot=True):
"""

3
tasks/combat/state.py
View File

@ -67,7 +67,8 @@ class CombatState(UI):
return False
if not self.is_combat_executing():
if not self._combat_auto_checked and auto:
if self._combat_click_interval.started() and not self._combat_click_interval.reached():
# >=0.2s after clicking the button to avoid random noice
if self._combat_click_interval.current() >= 0.15 and not self._combat_click_interval.reached():
logger.info('Combat on going, _combat_auto_checked')
self._combat_auto_checked = True
return False

3
tasks/dungeon/weekly.py
View File

@ -15,8 +15,7 @@ class WeeklyDungeon(Dungeon):
skip_ui_switch: bool = False):
if team is None:
team = self.config.Weekly_Team
# No support
support_character = ''
skip_ui_switch = True
return super()._dungeon_run(
dungeon=dungeon, team=team, wave_limit=wave_limit,