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

Merge branch 'master' into feature_matching

Browse Source
This commit is contained in:
MistEO
2021-08-14 23:24:09 +08:00
parent fb9907af9d 79d7a5863d
commit d0819cc241
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MeoAssistance/include/Version.h
View File

@@ -1,5 +1,5 @@
#pragma once
namespace asst {
constexpr static const char* Version = "release.beta.06.02";
constexpr static const char* Version = "release.beta.06.03";
}

4
MeoAsstGui/MainWindow.xaml.cs
View File

@@ -154,7 +154,7 @@ namespace MeoAsstGui
break;
}
++retry_times;
button_Click_startSanity(null, null);
AsstStart(p_asst, "SanityBegin");
}
else if (task_chain == "VisitBegin")
{
@@ -166,7 +166,7 @@ namespace MeoAsstGui
break;
}
++retry_times;
button_Click_visit(null, null);
AsstStart(p_asst, "VisitBegin");
}
}
break;

2
MeoAsstGui/MeoAsstGui.csproj
View File

@@ -29,7 +29,7 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>0.6.2.0</ApplicationVersion>
<ApplicationVersion>0.6.3.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>

3
resource/config.json
View File

@@ -238,6 +238,7 @@
"template": "StartButton2.png",
"type": "clickSelf",
"rearDelay": 20000,
"templThreshold": 0.95,
"next": [
"StartButton2",
"PRTS"
@@ -313,7 +314,7 @@
},
"Loading": {
"template": "Loading.png",
"threshold": 0.8,
"templThreshold": 0.8,
"type": "doNothing",
"next": [
"StartButton1"