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

Merge pull request #406 from zzyyyl/fix/reconnect

Browse Source 
fix.修复某些情况下断线重连可能卡住的问题
This commit is contained in:
MistEO
2022-05-03 22:01:22 +08:00
committed by GitHub
parent 6130cff3b3 269a0a8e9b
commit f5b351fe6c
3 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
resource/tasks.json
View File

@@ -5,6 +5,8 @@
"next": [
"GameStart",
"StartToWakeUp",
"StartUpConnectingFlag",
"StartLoginBServer",
"Terminal",
"CloseAnno",
"TodaysSupplies",
@@ -461,6 +463,7 @@
200,
120
],
"cache": false,
"templThreshold": 0.7,
"rearDelay": 3000,
"maskRange": [
@@ -470,6 +473,7 @@
"next": [
"StartToWakeUp",
"StartUpConnectingFlag",
"StartLoginBServer",
"Terminal",
"CloseAnno",
"OfflineConfirm",
@@ -477,7 +481,7 @@
]
},
"StartUpConnectingFlag": {
"action": "doNothing",
"action": "clickSelf",
"roi": [
0,
635,
@@ -485,6 +489,8 @@
85
],
"next": [
"StartToWakeUp",
"StartLoginBServer",
"StartUpConnectingFlag",
"Terminal",
"CloseAnno",
@@ -492,6 +498,23 @@
"TodaysSupplies"
]
},
"StartLoginBServer": {
"action": "clickSelf",
"roi": [
440,
370,
400,
80
],
"next": [
"StartUpConnectingFlag",
"StartLoginBServer",
"Terminal",
"CloseAnno",
"OfflineConfirm",
"TodaysSupplies"
]
},
"ReturnToTerminal": {
"template": "Return.png",
"action": "clickSelf",
@@ -1002,6 +1025,8 @@
"FightMissionFailed",
"EndOfAction",
"StartToWakeUp",
"StartUpConnectingFlag",
"StartLoginBServer",
"OfflineConfirm",
"StartButton1"
]
@@ -1021,6 +1046,8 @@
"next": [
"EndOfAction",
"StartToWakeUp",
"StartUpConnectingFlag",
"StartLoginBServer",
"OfflineConfirm",
"StartButton1"
]
@@ -1039,7 +1066,9 @@
"PRTS2",
"PrtsErrorConfirm",
"OfflineConfirm",
"StartToWakeUp"
"StartToWakeUp",
"StartUpConnectingFlag",
"StartLoginBServer"
]
},
"OfflineConfirm": {
@@ -1058,6 +1087,7 @@
"CloseAnno",
"StartToWakeUp",
"StartUpConnectingFlag",
"StartLoginBServer",
"OfflineConfirm",
"TodaysSupplies"
]
@@ -1073,6 +1103,7 @@
"next": [
"StartToWakeUp",
"StartUpConnectingFlag",
"StartLoginBServer",
"Terminal",
"CloseAnno",
"OfflineConfirm",
@@ -4071,6 +4102,25 @@
100
],
"next": [
"StartToWakeUpToRoguelike1",
"StartUpConnectingToRoguelike1",
"TerminalToRoguelike1",
"CloseAnnoToRoguelike1",
"TodaysSuppliesToRoguelike1"
]
},
"StartUpConnectingToRoguelike1": {
"template": "StartUpConnectingFlag.png",
"action": "doNothing",
"roi": [
520,
460,
240,
100
],
"next": [
"StartToWakeUpToRoguelike1",
"StartUpConnectingToRoguelike1",
"TerminalToRoguelike1",
"CloseAnnoToRoguelike1",
"TodaysSuppliesToRoguelike1"
@@ -4194,6 +4244,7 @@
"next": [
"CloseAnnoToRoguelike1",
"StartToWakeUpToRoguelike1",
"StartUpConnectingToRoguelike1",
"OfflineConfirmToRoguelike1"
]
},
@@ -4211,6 +4262,7 @@
"ReturnToRoguelike1Confirm",
"OfflineConfirmToRoguelike1",
"StartToWakeUpToRoguelike1",
"StartUpConnectingToRoguelike1",
"StageSNReturnToRoguelike1"
]
},

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

7
src/MeoAssistant/ProcessTask.cpp
View File

@@ -123,7 +123,12 @@ bool ProcessTask::_run()
}
if (exec_times >= max_times) {
Log.info("exec times exceeds the limit", info.to_string());
info["details"] = json::object{
{ "task", cur_name },
{ "exec_times", exec_times },
{ "max_times", max_times }
};
Log.info("exec times exceeded the limit", info.to_string());
m_cur_tasks_name = cur_task_ptr->exceeded_next;
sleep(task_delay);
continue;