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

refactor: 尝试修改烧热水的实现方式

Browse Source
This commit is contained in:
zzyyyl
2023-09-30 14:24:50 +08:00
parent 16882b2d6e
commit 6af6cd14ad
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resource/tasks.json
View File

@@ -9033,7 +9033,7 @@
"Roguelike@LastRewardConfirm"
]
},
"Roguelike@LastReward_stop": {
"Roguelike@LastReward_restart": {
"template": "empty.png",
"action": "ClickSelf",
"cache": false,
@@ -9045,6 +9045,20 @@
],
"next": []
},
"Roguelike@LastReward_stop": {
"template": "empty.png",
"action": "ClickSelf",
"cache": false,
"roi": [
171,
151,
935,
533
],
"next": [
"RoguelikeControlTaskPlugin-Stop"
]
},
"Roguelike@LastReward": {
"Doc": "你的上一次探索突破了至少两层困难，这一次可以获得更多支援——热水壶",
"baseTask": "Roguelike@LastReward_default",

20
src/MaaCore/Task/Interface/RoguelikeTask.cpp
View File

@@ -104,25 +104,23 @@ bool asst::RoguelikeTask::set_params(const json::value& params)
// 设置ocr第三层层名，设置识别到退出重进
Task.set_task_base(theme + "@Roguelike@LevelName", theme + "@Roguelike@LevelName_mode4");
if (!start_with_elite_two) {
// TODO: 烧水有更好的解决方案，用插件 set_enable(false)
// 获得热水壶和演讲时长延时
patch["Roguelike@LastReward"] = patch["Roguelike@LastReward4"] =
json::object { { "postDelay", 2147483647 } };
// 获得热水壶和演讲时停止肉鸽
Task.set_task_base("Roguelike@LastReward", "Roguelike@LastReward_stop");
Task.set_task_base("Roguelike@LastReward4", "Roguelike@LastReward_stop");
}
// 获得其他奖励时重开
Task.set_task_base("Roguelike@LastReward2", "Roguelike@LastReward_stop");
Task.set_task_base("Roguelike@LastReward3", "Roguelike@LastReward_stop");
Task.set_task_base("Roguelike@LastRewardRand", "Roguelike@LastReward_stop");
Task.set_task_base("Roguelike@LastReward2", "Roguelike@LastReward_restart");
Task.set_task_base("Roguelike@LastReward3", "Roguelike@LastReward_restart");
Task.set_task_base("Roguelike@LastRewardRand", "Roguelike@LastReward_restart");
}
else {
// 重置需要ocr的层名和next任务
Task.set_task_base(theme + "@Roguelike@LevelName", theme + "@Roguelike@LevelName_default");
// 重置获得热水壶和演讲延时
patch["Roguelike@LastReward"] = patch["Roguelike@LastReward4"] =
json::object { { "postDelay", 0 } };
// 重置其他奖励next
// 重置开局奖励next
Task.set_task_base("Roguelike@LastReward", "Roguelike@LastReward_default");
Task.set_task_base("Roguelike@LastReward2", "Roguelike@LastReward_default");
Task.set_task_base("Roguelike@LastReward3", "Roguelike@LastReward_default");
Task.set_task_base("Roguelike@LastReward4", "Roguelike@LastReward_default");
Task.set_task_base("Roguelike@LastRewardRand", "Roguelike@LastReward_default");
}
if (!patch.empty()) {