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

feat.新增选关-剿灭；新增开始唤醒选项

Browse Source
This commit is contained in:
MistEO
2021-12-20 01:35:09 +08:00
parent a5f9e55fe2
commit f165e0b2b2
5 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
resource/tasks.json
View File

@@ -56,6 +56,21 @@
80
]
},
"Annihilation": {
"doc": "剿灭作战，一般本周的满了也不会有人再刷的，所以只识别右上角ToDoList里的剿灭就可以了",
"template": "StageAnnihilation.png",
"action": "clickSelf",
"roi": [
900,
70,
380,
400
],
"maskRange": [
1,
255
]
},
"StageBegin": {
"algorithm": "justreturn",
"action": "doNothing",
@@ -76,7 +91,8 @@
"action": "doNothing",
"next": [
"UsePrts",
"StartButton1"
"StartButton1",
"LastBattle"
]
},
"GameStart": {
@@ -485,6 +501,7 @@
],
"action": "clickSelf",
"next": [
"UsePrts",
"StartButton1"
]
},

BIN
resource/template/StageAnnihilation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

6
src/MeoAssistant/Assistant.cpp
View File

@@ -203,8 +203,10 @@ bool asst::Assistant::append_fight(const std::string& stage, int mecidine, int s
std::unique_lock<std::mutex> lock(m_mutex);
m_tasks_queue.emplace(terminal_task_ptr);
m_tasks_queue.emplace(stage_task_ptr);
if (!stage.empty()) {
m_tasks_queue.emplace(terminal_task_ptr);
m_tasks_queue.emplace(stage_task_ptr);
}
m_tasks_queue.emplace(fight_task_ptr);
if (!only_append) {

7
src/MeoAsstGui/Helper/AsstProxy.cs
View File

@@ -35,6 +35,8 @@ namespace MeoAsstGui
[DllImport("MeoAssistant.dll")] private static extern bool AsstCatchCustom(IntPtr ptr, string address);
[DllImport("MeoAssistant.dll")] private static extern bool AsstAppendStartUp(IntPtr ptr);
[DllImport("MeoAssistant.dll")] private static extern bool AsstAppendFight(IntPtr ptr, string stage, int max_medicine, int max_stone, int max_times);
[DllImport("MeoAssistant.dll")] private static extern bool AsstAppendAward(IntPtr ptr);
@@ -340,6 +342,11 @@ namespace MeoAsstGui
return AsstAppendAward(_ptr);
}
public bool AsstAppendStartUp()
{
return AsstAppendStartUp(_ptr);
}
public bool AsstAppendVisit()
{
return AsstAppendVisit(_ptr);

12
src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
View File

@@ -37,9 +37,10 @@ namespace MeoAsstGui
public void InitializeItems()
{
string[] task_list = new string[] { "刷理智", "基建换班", "自动公招", "访问好友", "收取信用及购物", "领取日常奖励" };
string[] task_list = new string[] { "开始唤醒", "刷理智", "自动公招", "基建换班", "访问好友", "收取信用及购物", "领取日常奖励" };
var temp_order_list = new List<DragItemViewModel>(new DragItemViewModel[task_list.Length]);
int order_offset = 0;
for (int i = 0; i != task_list.Length; ++i)
{
var task = task_list[i];
@@ -49,16 +50,19 @@ namespace MeoAsstGui
if (!parsed || order < 0)
{
temp_order_list[i] = new DragItemViewModel(task, "TaskQueue.");
++order_offset;
}
else
{
temp_order_list[order] = new DragItemViewModel(task, "TaskQueue.");
temp_order_list[order + order_offset] = new DragItemViewModel(task, "TaskQueue.");
}
}
TaskItemViewModels = new ObservableCollection<DragItemViewModel>(temp_order_list);
StageList = new List<CombData>();
StageList.Add(new CombData { Display = "当前关卡", Value = "" });
StageList.Add(new CombData { Display = "上次作战", Value = "LastBattle" });
StageList.Add(new CombData { Display = "剿灭作战", Value = "Annihilation" });
StageList.Add(new CombData { Display = "龙门币-5", Value = "CE-5" });
}
@@ -110,6 +114,10 @@ namespace MeoAsstGui
{
ret &= appendInfrast();
}
else if (item.Name == "开始唤醒")
{
ret &= asstProxy.AsstAppendStartUp();
}
else if (item.Name == "刷理智")
{
ret &= appendFight();