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

fix: 修复放弃招募任务链；避战识别不到得偿所愿 (#13395)

Browse Source 
* fix: 修复放弃招募任务链

* fix: 怎么还有大小写问题啊

* fix: 划不到点刺

* fix: 肉鸽地图识别加入对界园得偿所愿节点的支持

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
This commit is contained in:
Weiyou Wang
2025-07-29 13:35:18 +10:00
committed by GitHub
parent 0842c3572d
commit 69f3ab2a97
5 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resource/roguelike/JieGarden/map.json
View File

@@ -16,6 +16,10 @@
"type": "Encounter",
"template": ["JieGarden@Roguelike@MapNodeEncounter.png", "JieGarden@Roguelike@MapNodeEncounterGrey.png"]
},
{
"type": "Boons",
"template": ["JieGarden@Roguelike@MapNodeBoonspng", "JieGarden@Roguelike@MapNodeBoonsGrey.png"]
},
{
"type": "RogueTrader",
"template": ["JieGarden@Roguelike@MapNodeRogueTrader.png", "JieGarden@Roguelike@MapNodeRogueTraderGrey.png"]

16
resource/tasks/Roguelike/JieGarden.json
View File

@@ -10,9 +10,6 @@
"template": "JieGarden@Roguelike@ChooseOperConfirm.png",
"roi": [1031, 606, 249, 114]
},
"JieGarden@StartExplore@Roguelike@ChooseOperConfirmToGiveUp": {
"template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png"
},
"JieGarden@StartExplore@Roguelike@ChooseOperFlag": {
"template": "JieGarden@Roguelike@ChooseOperConfirm.png",
"roi": [1031, 606, 249, 114]
@@ -78,17 +75,6 @@
"template": "JieGarden@Roguelike@ChooseOperConfirm.png",
"roi": [1031, 606, 249, 114]
},
"JieGarden@Roguelike@ChooseOperConfirmToGiveUp": {
"baseTask": "JieGarden@Roguelike@StageEncounterGiveUpRecruitConfirm",
"template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png",
"next": [
"JieGarden@Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText",
"JieGarden@Roguelike@ChooseOperConfirmToGiveUp",
"JieGarden@Roguelike@RecruitOther",
"JieGarden@Roguelike@NextLevel",
"JieGarden@Roguelike@NextLevel#next"
]
},
"JieGarden@Roguelike@ChooseOperFlag": {
"template": "JieGarden@Roguelike@ChooseOperConfirm.png",
"roi": [1031, 606, 249, 114]
@@ -511,6 +497,8 @@
"JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png",
"JieGarden@Roguelike@MapNodeEncounter.png",
"JieGarden@Roguelike@MapNodeEncounterGrey.png",
"JieGarden@Roguelike@MapNodeBoons.png",
"JieGarden@Roguelike@MapNodeBoonsGrey.png",
"JieGarden@Roguelike@MapNodeRogueTrader.png",
"JieGarden@Roguelike@MapNodeRogueTraderGrey.png",
"JieGarden@Roguelike@MapNodeBoskyPassage.png",

12
resource/tasks/Roguelike/Sarkaz.json
View File

@@ -6,9 +6,6 @@
"Sarkaz@StartExplore@Roguelike@ChooseOperConfirm#next"
]
},
"Sarkaz@StartExplore@Roguelike@ChooseOperConfirmToGiveUp": {
"template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png"
},
"Sarkaz@StartExplore@Roguelike@EnterAfterRecruit": {
"template": "Sarkaz@Roguelike@EnterAfterRecruit.png",
"next": ["#self", "Sarkaz@Roguelike@NextLevel"]
@@ -95,15 +92,6 @@
"Sarkaz@Roguelike@ChooseOperConfirm#next"
]
},
"Sarkaz@Roguelike@ChooseOperConfirmToGiveUp": {
"baseTask": "Sarkaz@Roguelike@StageEncounterGiveUpRecruitConfirm",
"template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png",
"next": [
"Sarkaz@Roguelike@ChooseOperConfirmToGiveUp",
"Sarkaz@Roguelike@RecruitOther",
"Sarkaz@Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText"
]
},
"Sarkaz@Roguelike@ClickToDrops": {
"specificRect": [600, 600, 25, 25]
},

10
resource/tasks/Roguelike/base.json
View File

@@ -474,9 +474,9 @@
"baseTask": "Roguelike@StageEncounterGiveUpRecruitConfirm",
"template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png",
"next": [
"Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText",
"Roguelike@ChooseOperConfirmToGiveUp",
"Roguelike@RecruitOther",
"Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText"
"Roguelike@RecruitSkip#next"
]
},
"Roguelike@ChooseOperFlag": {
@@ -1789,10 +1789,12 @@
"baseTask": "Roguelike@StageEncounterGiveUpRecruitConfirm",
"template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png",
"next": [
"StartExplore@Roguelike@ChooseOperConfirmToGiveUp",
"StartExplore@Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText",
"StartExplore@Roguelike@RecruitOther",
"StartExplore@Roguelike@EnterAfterRecruit",
"StartExplore@Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText"
"Roguelike@NextLevel",
"Roguelike@NextLevel#next",
"StartExplore@Roguelike@ChooseOperConfirmToGiveUp"
]
},
"StartExplore@Roguelike@RecruitOther": {

4
src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp
View File

@@ -134,7 +134,7 @@ bool asst::RoguelikeCustomStartTaskPlugin::hijack_squad()
.run();
}
constexpr size_t SwipeTimes = 2;
constexpr size_t SwipeTimes = 7;
for (size_t i = 0; i != SwipeTimes; ++i) {
if (need_exit()) {
return false;
@@ -190,7 +190,7 @@ bool asst::RoguelikeCustomStartTaskPlugin::hijack_reward()
bool asst::RoguelikeCustomStartTaskPlugin::hijack_roles()
{
constexpr size_t SwipeTimes = 2;
constexpr size_t SwipeTimes = 7;
const std::string& required_role = m_customs[RoguelikeCustomType::Roles];
for (size_t i = 0; i != SwipeTimes; ++i) {