fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

适配纵向进点

Browse Source
This commit is contained in:
Lancarus
2023-09-02 09:38:09 +08:00
parent 9263a9f69b
commit 2d5f168efa
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
resource/tasks.json
View File

@@ -9019,7 +9019,8 @@
"baseTask": "Roguelike@StageVerticalConfirm",
"template": "Roguelike@StageVerticalConfirm.png",
"next": [
"Roguelike@StageEncounterEnter"
"Roguelike@StageEncounterEnter",
"Roguelike@StageEncounterJudgeClick"
]
},
"Roguelike@StageEncounterGiveUpRecruitConfirm": {
@@ -9198,7 +9199,10 @@
"baseTask": "Roguelike@StageVerticalConfirm",
"template": "Roguelike@StageVerticalConfirm.png",
"next": [
"Roguelike@StageSafeHouseEnter"
"Roguelike@StageSafeHouseEnter",
"Roguelike@StageSafeHouseEnter",
"Roguelike@StageEncounterOptions#next",
"Roguelike@StageEncounterClickToLeave"
]
},
"Roguelike@StageTrader": {
@@ -9229,7 +9233,12 @@
"template": "Roguelike@StageVerticalConfirm.png",
"baseTask": "Roguelike@StageVerticalConfirm",
"next": [
"Roguelike@StageTraderEnter"
"Roguelike@StageTraderEnter",
"Roguelike@StageTraderEnter",
"Roguelike@StageTraderRefreshWithDice",
"Roguelike@StageTraderInvestSystem",
"Roguelike@TraderRandomShopping",
"Roguelike@StageTraderLeave"
]
},
"Roguelike@StageTraderInvestCancel": {
@@ -10910,6 +10919,7 @@
},
"Sami@Roguelike@SquadDefault": {},
"Sami@Roguelike@StageVerticalConfirm": {
"action": "ClickSelf",
"next": [
"#back"
]
@@ -10957,7 +10967,8 @@
"template": "Sami@Roguelike@StageVerticalConfirm.png",
"baseTask": "Sami@Roguelike@StageVerticalConfirm",
"next": [
"Sami@Roguelike@StageBoonsEnter"
"Sami@Roguelike@StageBoonsEnter",
"Sami@Roguelike@StageEncounterJudgeClick"
]
},
"Sami@Roguelike@StageBoskyPassage": {
@@ -11004,7 +11015,8 @@
"template": "Sami@Roguelike@StageVerticalConfirm.png",
"baseTask": "Sami@Roguelike@StageVerticalConfirm",
"next": [
"Sami@Roguelike@StageBoskyPassageEnter"
"Sami@Roguelike@StageBoskyPassageEnter",
"Sami@Roguelike@StageEncounterJudgeClick"
]
},
"Sami@Roguelike@StageCambatDps": {
@@ -11358,7 +11370,9 @@
"template": "Sami@Roguelike@StageVerticalConfirm.png",
"baseTask": "Sami@Roguelike@StageVerticalConfirm",
"next": [
"Sami@Roguelike@StageSafeHouseEnter"
"Sami@Roguelike@StageSafeHouseEnter",
"Sami@Roguelike@StageSafeHouseEnter",
"Sami@Roguelike@StageEncounterJudgeClick"
]
},
"Sami@Roguelike@StageTrader": {

2
src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp
View File

@@ -93,7 +93,7 @@ bool asst::RoguelikeBattleTaskPlugin::_run()
void asst::RoguelikeBattleTaskPlugin::wait_until_start_button_clicked()
{
std::string theme = status()->get_properties(Status::RoguelikeTheme).value();
ProcessTask(*this, { theme + "Roguelike@WaitForStartButtonClicked" }).set_task_delay(0).set_retry_times(0).run();
ProcessTask(*this, { theme + "@Roguelike@WaitForStartButtonClicked" }).set_task_delay(0).set_retry_times(0).run();
}
std::string asst::RoguelikeBattleTaskPlugin::oper_name_in_config(const battle::DeploymentOper& oper) const