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

fix.修复雷电、夜神模拟器连接问题

Browse Source
This commit is contained in:
MistEO
2021-11-03 22:30:57 +08:00
parent 41833cbe5c
commit db698caa1c
3 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -89,11 +89,11 @@ A game assistance for Arknights
#### MuMu模拟器
支持
完美支持
#### 雷电模拟器
勉强支持，偶尔能用偶尔用不了，莫名其妙的，有空再修，暂时不建议用_(:з」∠)_
支持
#### 逍遥模拟器

41
resource/config.json
View File

@@ -72,14 +72,14 @@
"screencap": "[Adb] -s 127.0.0.1:7555 exec-out screencap -p"
}
},
"LDPlayer": {
"LDPlayerLocal": {
"handle": {
"class": "LDPlayerMainFrame",
"window": "雷电模拟器"
"window": ""
},
"adb": {
"path": "[EmulatorPath]adb.exe",
"connect": "[Adb] connect 127.0.0.1:5555",
"connect": "[Adb] devices",
"click": "[Adb] -s emulator-5554 shell input tap [x] [y]",
"swipe": "[Adb] -s emulator-5554 shell input swipe [x1] [y1] [x2] [y2] [duration]",
"display": "[Adb] -s emulator-5554 shell dumpsys window displays | grep init= | awk ' { print $3 } '",
@@ -87,19 +87,19 @@
"screencap": "[Adb] -s emulator-5554 shell screencap -p"
}
},
"LDPlayer64": {
"LDPlayerRemote": {
"handle": {
"class": "LDPlayerMainFrame",
"window": "雷电模拟器(64)"
"window": ""
},
"adb": {
"path": "[EmulatorPath]adb.exe",
"connect": "[Adb] connect 127.0.0.1:5555",
"click": "[Adb] -s emulator-5554 shell input tap [x] [y]",
"swipe": "[Adb] -s emulator-5554 shell input swipe [x1] [y1] [x2] [y2] [duration]",
"display": "[Adb] -s emulator-5554 shell dumpsys window displays | grep init= | awk ' { print $3 } '",
"click": "[Adb] -s 127.0.0.1:5555 shell input tap [x] [y]",
"swipe": "[Adb] -s 127.0.0.1:5555 shell input swipe [x1] [y1] [x2] [y2] [duration]",
"display": "[Adb] -s 127.0.0.1:5555 shell dumpsys window displays | grep init= | awk ' { print $3 } '",
"displayRegex": "cur=%dx%d",
"screencap": "[Adb] -s emulator-5554 shell screencap -p"
"screencap": "[Adb] -s 127.0.0.1:5555 shell screencap -p"
}
},
"Nox": {
@@ -117,6 +117,21 @@
"screencap": "[Adb] -s 127.0.0.1:62001 exec-out screencap -p"
}
},
"NoxPort2": {
"handle": {
"class": "Qt5QWindowIcon",
"window": "夜神模拟器"
},
"adb": {
"path": "[EmulatorPath]nox_adb.exe",
"connect": "[Adb] connect 127.0.0.1:59865",
"click": "[Adb] -s 127.0.0.1:59865 shell input tap [x] [y]",
"swipe": "[Adb] -s 127.0.0.1:59865 shell input swipe [x1] [y1] [x2] [y2] [duration]",
"display": "[Adb] -s 127.0.0.1:59865 shell dumpsys window displays | grep init= | awk ' { print $3 } '",
"displayRegex": "cur=%dx%d",
"screencap": "[Adb] -s 127.0.0.1:59865 exec-out screencap -p"
}
},
"XYAZ": {
"handle": {
"class": "Qt5QWindowIcon",
@@ -158,11 +173,11 @@
"Doc": "USB连接暂时不兼容多设备的情况",
"path": "[ExecDir]platform-tools\\adb.exe",
"connect": "[Adb] devices",
"click": "[Adb] shell input tap [x] [y]",
"swipe": "[Adb] shell input swipe [x1] [y1] [x2] [y2] [duration]",
"display": "[Adb] shell dumpsys window displays | grep init= | awk ' { print $3 } '",
"click": "[Adb] -d shell input tap [x] [y]",
"swipe": "[Adb] -d shell input swipe [x1] [y1] [x2] [y2] [duration]",
"display": "[Adb] -d shell dumpsys window displays | grep init= | awk ' { print $3 } '",
"displayRegex": "cur=%dx%d",
"screencap": "[Adb] exec-out screencap -p"
"screencap": "[Adb] -d exec-out screencap -p"
}
}
}

2
src/MeoAssistance/Controller.cpp
View File

@@ -121,7 +121,7 @@ void asst::Controller::pipe_working_proc()
bool Controller::try_capture(const EmulatorInfo& info, bool without_handle)
{
LogTraceFunction;
LogTraceScope("try_capture | " + info.name);
const HandleInfo& handle_info = info.handle;
std::string adb_dir;