sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code
8,551 Commits 9 Branches 0 Tags 274 MiB
5c7f57f3b2
Commit Graph

450 Commits

Author SHA1 Message Date
LmeSzinc
36e1f01cb7 Add: Control method MaaTouch 2023-02-02 01:47:48 +08:00
LmeSzinc
cdff9f61fc Fix: Mumu6 failed on ADB screenshot 2023-01-26 21:47:53 +08:00
LmeSzinc
27ba7c1cfe Refactor: Benchmark settings based on test scenes 2023-01-25 17:07:57 +08:00
LmeSzinc
c9539b88fd Fix: Catch connection hijack when connecting adb server 2023-01-25 14:51:12 +08:00
LmeSzinc
5fd923d1c6 Fix: Skip adb connect on android serial 2023-01-25 14:49:41 +08:00
LmeSzinc
5693f2499e Fix: Add minimal delay to ADB click 2023-01-25 01:36:54 +08:00
LmeSzinc
a5c0b2abb9 Merge branch 'master' into dev 2023-01-25 00:21:30 +08:00
LmeSzinc
965c46f800 Add: Screenshot method DroidCast_raw 2023-01-25 00:21:07 +08:00
LmeSzinc
a0fe83699a Upd: Tips for pure black screenshots from MuMu X 2023-01-18 17:32:42 +08:00
LmeSzinc
21fe98d2f5 Refactor: Catching truncated image 2023-01-18 01:05:54 +08:00
LmeSzinc
29758051dd Refactor: Abstract resolution_check_uiautomator2() 2023-01-18 00:33:32 +08:00
SarContDeli
73b5154505
Fix: Unable to install minitouch in MuMu X (#2134) 2023-01-17 22:37:56 +08:00
SarContDeli
15d80175d3
Add: Start app by adb shell am start (#2124) 2023-01-16 22:32:55 +08:00
LmeSzinc
afbe0f628e Fix: If condition in dragging (fixed #2094) 2023-01-09 12:13:41 +08:00
LmeSzinc
e59c7f7fc0 Fix: Remove emulator calls before refactored 2023-01-09 00:16:48 +08:00
LmeSzinc
81106a4dda Fix: Resolution check for scrcpy 2023-01-07 02:43:52 +08:00
LmeSzinc
6c768de2a5 Fix: Different return of command not found (#2088) 2023-01-06 20:38:11 +08:00
LmeSzinc
9963f4f4e2 Fix: Missing retry_sleep import in DroidCast 2023-01-04 17:33:29 +08:00
LmeSzinc
4dc37ef4ca Merge branch 'master' into dev 2023-01-03 23:27:17 +08:00
LmeSzinc
44f6e35fac
Merge pull request #2066 from LmeSzinc/bug_fix 
Bug fix
 2023-01-03 23:18:53 +08:00
LmeSzinc
f0da5fcf76 Fix: Netcat loopback on BlueStacks Pie 2023-01-03 22:55:40 +08:00
LmeSzinc
264a34683f Merge branch 'bug_fix' into dev 2023-01-03 03:19:36 +08:00
LmeSzinc
b727752e45 Fix: Set timeout on socket objects 2023-01-03 03:18:58 +08:00
LmeSzinc
9efc45ed32 Opt: Change Mumu X screenshot tips to scrcpy 2023-01-03 02:47:18 +08:00
LmeSzinc
332f6b87d3 Merge branch 'master' into dev 2023-01-01 17:17:53 +08:00
LmeSzinc
82917619e9 Fix: Typo in 63ad648f 2023-01-01 17:16:56 +08:00
LmeSzinc
63ad648ff6 Fix: Disable u2 float window (#2059) 2023-01-01 15:32:53 +08:00
LmeSzinc
37e0d70e0d Opt: Stop scrcpy server during wait 2023-01-01 02:36:28 +08:00
LmeSzinc
2285b716cf Refactor: Faster device retrying 2022-12-29 19:22:55 +08:00
LmeSzinc
1d96582c1f Fix: Catch _scrcpy_stream_loop_thread died 2022-12-29 18:57:04 +08:00
LmeSzinc
b3d8fd4f1a Fix: Locking scrcpy screenshot and control 2022-12-29 18:20:09 +08:00
LmeSzinc
d18b13d760 Fix: Catch av import error 2022-12-29 13:37:49 +08:00
LmeSzinc
a3604d8100 Add: Screenshot method scrcpy 
Control via scrcpy is supported but not exposed because swipes ended at the middle
 2022-12-29 12:49:11 +08:00
LmeSzinc
687079290a Add: Basic platform interfaces 2022-12-23 17:16:15 +08:00
LmeSzinc
5436287550 Fix: Disconnect offline device before connecting 2022-12-20 22:07:11 +08:00
LmeSzinc
1ef1bac26f Fix: Disconnect offline device before connecting 2022-12-20 00:03:59 +08:00
LmeSzinc
e18758360b Opt: Retry black screenshots at startup 2022-12-07 20:13:55 +08:00
LmeSzinc
4c1b7ecf3c Opt: DroidCast help messages 2022-12-07 12:27:25 +08:00
LmeSzinc
c51350caac Add: DroidCast screenshot 2022-12-04 23:53:43 +08:00
LmeSzinc
85fbbcbc42 Opt: Faster local emulator connection on uiautomator2 2022-12-04 23:31:31 +08:00
LmeSzinc
f577f21e8d
Merge pull request #1915 from SaiCateDoan/emu 
Opt: Independent option to restart emulator daily
 2022-12-02 00:10:13 +08:00
SarContDeli
6a4d3b5da5 Opt: Independent option to restart emulator daily 2022-12-01 15:20:14 +08:00
SarContDeli
e6cd0043cf
Fix: Error 10054 when install uiautomator2 (#1878) 2022-11-21 23:14:02 +08:00
LmeSzinc
59b7730daf Refactor: Move out AdbDeviceWithStatus 2022-11-06 17:10:21 +08:00
LmeSzinc
5c70364353 Refactor: Abstract CampaignStatus class and fix task balancer in Raid 2022-10-30 14:49:04 +08:00
LmeSzinc
3182175ec2 Fix: command "nc" not found on Android 9 emulators 2022-10-30 02:11:52 +08:00
SarContDeli
7029375ca3 Fix: UnicodeDecodeError when getting serial 2022-10-17 22:09:58 +08:00
LmeSzinc
87bf8ec7ee
Merge pull request #1657 from SaiCateDoan/maa 
Add: Submodule AlasMaaBridge (experimental)
 2022-10-06 14:16:43 +08:00
LmeSzinc
b161f14532 Fix: Connecting device over http 2022-09-30 12:18:25 +08:00
LmeSzinc
4dd2a5a8b5 Refactor: Move del_cached_property to module.base.decorator 2022-09-25 00:31:42 +08:00
SarContDeli
764e216c98 Add: First executable prototype 2022-09-17 16:02:06 +08:00
LmeSzinc
be0c1b666b Fix: Missing BlueStacks 5 hyper-v CN support (#1604) 
- Opt: Add help text when mis-using serials of BlueStacks hyper-v
 2022-09-10 00:48:53 +08:00
LmeSzinc
d8f4986d64 Merge branch 'master' into dev 2022-09-03 14:59:36 +08:00
LmeSzinc
d17a39ebae Fix: Optimizations for NC screenshot methods broke the non-NCs 2022-09-02 21:56:51 +08:00
LmeSzinc
f1ef87ca50 Merge branch 'master' into dev 
# Conflicts:
#	module/device/emulator.py
 2022-09-02 00:13:11 +08:00
LmeSzinc
2540f6fd1f
Merge pull request #1588 from LmeSzinc/bug_fix 
Bug fix
 2022-09-02 00:06:09 +08:00
LmeSzinc
3c108303e5 Opt: Faster remove_shell_warning() and lower CPU usage in *_nc screenshot methods 2022-09-01 23:03:06 +08:00
SarContDeli
ab9f6dfcc7 Fix: Unexpected None from detect_emulator(Fix #1580) 2022-08-31 11:25:27 +08:00
LmeSzinc
34e72e7e51 Opt: Faster remove_shell_warning() and lower CPU usage in *_nc screenshot methods 2022-08-29 22:59:34 +08:00
SarContDeli
e5d2bad60b Fix: Restart the emulator after startup timeout 2022-08-24 23:54:59 +08:00
Horizon101011
3c9c63c27a Opt: Sort import 2022-08-19 01:54:44 +08:00
Horizon101011
4f25c799b8 Fix: No module winreg (temporary) 2022-08-19 01:42:11 +08:00
LmeSzinc
302a7caa29 Add: Event entrance of Operation Convergence (event_20220818_cn) 2022-08-18 23:46:57 +08:00
SarContDeli
ac5466e5dc Upd: Modified some options for restart emulator 2022-08-17 20:22:11 +08:00
SarContDeli
0207dd2bcb Opt: Split task_kill() from emulator_kill() 2022-08-05 16:55:51 +08:00
SarContDeli
938b95a145 Fix: The emulator will also be shut down when closing Alas 2022-08-05 09:53:33 +08:00
SarContDeli
df26bc4e7a Opt: Refactored some code of emulator.py 2022-08-05 09:53:33 +08:00
SarContDeli
f1c78de429 Add: Emulator auto detect of Bluestacks 5 2022-08-05 09:53:31 +08:00
SarContDeli
3d6d777413 Add: Emulator auto detect and restart(experimental) 2022-08-05 09:53:28 +08:00
LmeSzinc
6702ec234a Fix: Catch server hot fix and restart game immediately 
- Pretty Timer print
 2022-07-31 23:34:40 +08:00
Quadro
db169546a9
Fix: Clear shell warnings with loose match (#1454) 
* Update adb.py

* Update utils.py

* Update adb.py

* Update utils.py

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2022-07-31 23:03:56 +08:00
LmeSzinc
d32856cb90 Fix: Remove shell warnings (#1425) 2022-07-30 01:51:26 +08:00
LmeSzinc
5eceb6623d Del: Remove aScreenCap support over http, just no plan 2022-07-16 15:04:13 +08:00
LmeSzinc
7d14b5c446 Fix: Restart minitouch service at every startup 
- Remove `-p` argument in screencap when connect over http
 2022-07-04 00:44:53 +08:00
LmeSzinc
a80fbb45e4 Fix: Coordinate calculation when orientation==1 and device over http 
- Fix RuntimeError: There is no current event loop in thread
 2022-07-04 00:44:53 +08:00
LmeSzinc
591a1a9535 Add: Minitouch over 2022-07-04 00:44:53 +08:00
LmeSzinc
ec66a28bbd Add: adb shell over atx agent 2022-07-04 00:44:52 +08:00
LmeSzinc
620e6510bc Refactor: Split out ConnectionAttr and refactor minitouch command builder 
- Upgrade uiautomator2 to 2.16.17 to fix bugs
- Use numpy.frombuffer() since numpy.fromstring() is deprecated
 2022-07-04 00:44:44 +08:00
LmeSzinc
a9d3cc2743 Fix: Wait minitouch initialized (#1244) 2022-06-26 01:03:41 +08:00
LmeSzinc
a46b50edd7 Fix: adb shell is executed before device connect 2022-06-23 22:59:15 +08:00
LmeSzinc
16b016c0c6
Merge pull request #1240 from n0k0m3/patch_emulator 
Fix nc server loopback IP for AVD (fix #1236)
 2022-06-23 02:10:40 +08:00
n0k0m3
8f96b30b45 Fix nc server loopback IP for AVD 
Avoid using hostname loopback on linux

use ro.hardware.audio.primary instead of ro.product.board

Newer Android Studio use ranchu board

reduce adb_shell calls

Move AVD detection to detect_device()

use cached_property for is_avd

Linting
 2022-06-22 12:10:51 -04:00
LmeSzinc
2321db0849 Opt: Set Emulator.PackageName if auto package detect worked for faster startup 2022-06-22 22:58:11 +08:00
LmeSzinc
ef82bb801e Opt: Faster is_port_using() on startup 
From 1s to almost 0ms
 2022-06-22 19:31:33 +08:00
LmeSzinc
8543ed5e03 Fix: Use environ variable ANDROID_ADB_SERVER_PORT (#1233) 2022-06-21 02:13:57 +08:00
n0k0m3
23ca75d15e Rename ascreencap dist 2022-06-20 13:57:53 -04:00
n0k0m3
f41f2458c3 Add ascreencap for android 8 (oreo) and 9 (pie) 2022-06-20 11:47:15 -04:00
LmeSzinc
c177c23697 Fix: Use adb reverse on BlueStacks hyper-v 2022-06-16 21:00:11 +08:00
LmeSzinc
96012c4333 Fix: *_nc methods on virtual network (#1202) 2022-06-12 01:05:45 +08:00
LmeSzinc
412f6385e1 Fix: Device auto detection on LDPlayer 2022-06-11 23:10:25 +08:00
cangular
53910a728c
Add: adb restart (#1167) 
* Add files via upload

* some addition on one device and muti

* Update connection.py

remove some redundant

* name change

* more name change

* no need to de serial check

* some rollback

* add adb restart gui and some minor update

* make adb gui independent from game manager

* pep 8

* add detect device

* remove ds_store

* add to alas-emulator

add to alas-emulator

* rm DS_Store

* Delete .DS_Store

* some add on
 2022-06-11 23:09:47 +08:00
LmeSzinc
27212529c0 Opt: Log unexpected ascreencap screenshots 2022-06-07 23:02:12 +08:00
LmeSzinc
db58202263 Fix: Cleanup after subprocess.Popen.communicate() 2022-06-07 01:35:53 +08:00
LmeSzinc
25a4162d27 Fix: Add LDPlayer serial auto switching 
- Opt: Show help text for wrong serial
 2022-06-05 06:38:43 +08:00
LmeSzinc
210fc5bded Fix: *_nc screenshot method failed because of bugs in adb reverse 
https://issuetracker.google.com/issues/37066218
 2022-06-05 02:15:16 +08:00
hgjazhgj
2c961f6dab Fix: Utf-8 in BlueStacks Hyper-V connection 2022-06-03 16:19:57 +08:00
LmeSzinc
2555588740 Opt: Show unexpected screenshot in ascreencap 2022-06-03 01:29:38 +08:00
hgjazhgj
bc8d5caf05 Opt: BlueStacks Hyper-V connection improvement 2022-06-02 16:14:49 +08:00
LmeSzinc
32d8492c89 Fix: Catch ConnectionResetError in iter_device() 2022-06-02 01:58:41 +08:00
LmeSzinc
500c8204a3 Fix: Add retry to Connection methods 2022-05-15 00:04:36 +08:00
LmeSzinc
6c526a273b Fix: Orientate regex (#1071) 2022-05-13 22:59:22 +08:00
LmeSzinc
d9332a7325 Add: Hierarchy button support 2022-05-01 22:10:40 +08:00
LmeSzinc
49a2ec6519 Fix: Handle AdbError: unknown host service 2022-04-23 22:24:27 +08:00
LmeSzinc
211a398911 Add: [TW] MyCard channel server com.hkmanjuu.azurlane.gp.mc 
- Fix: Package name detection in lower/upper case
 2022-04-20 00:05:50 +08:00
LmeSzinc
618fa52bcb Opt: Merge Emulator.PackageName and Emulator.Server into one dropdown 2022-04-19 01:00:07 +08:00
LmeSzinc
beabf938fc Opt: Add auto device detection and auto package detection, should be foolproof 
- Add: Real-time server change
 2022-04-19 01:00:07 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
hgjazhgj
867d3d2bbd Fix: Add timeout to ADB and aScreencap screenshot 2022-04-14 11:12:08 +08:00
LmeSzinc
6614ec795a Opt: Reduce config read/write at WSA startup 2022-04-14 00:48:23 +08:00
LmeSzinc
d2f56c5af8 Opt: Lower stuck timer in battle to 3min 2022-04-14 00:17:00 +08:00
hgjazhgj
0f96eb3bbc Fix: add [at]wraps to retry_wrapper 
to display actual function name in benchmark log output
 2022-04-13 16:53:37 +08:00
LmeSzinc
c251ef98b3 Opt: Show possible devices and packages when user had a wrong input 2022-04-12 20:17:24 +08:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
hgjazhgj
4ebfa21873 Fix: reconnect when device offline 2022-04-09 01:20:48 +08:00
LmeSzinc
5ba2f5c5ac Add: Faster screenshot methods ADB_nc and aScreenCap_nc 
- Allow config names when creating Device instances
- Add "Ultra Fast" level in performance test
 2022-03-23 21:27:08 +08:00
LmeSzinc
69995df7b2 Fix: Rotate screenshots only when there're not 1280x720 (#964) 2022-03-20 16:22:33 +08:00
SarContDeli
4785c361f6 Fix: Improved the logic of getting package name on WSA 2022-03-19 00:39:00 +08:00
SarContDeli
3e3a199c66 Add:When using WSA, the screenshot method and control method will be locked to uiautomator2 2022-03-18 23:52:33 +08:00
SarContDeli
b12edf27ca Fix:a A hint when trying to use '127.0.0.1:58526' but not 'wsa-0' as serial 2022-03-18 23:25:39 +08:00
SarContDeli
22d1cb98f6 Fix:Optimized logic for resize the display on wsa-0 2022-03-18 18:43:44 +08:00
SarContDeli
86bacf6243 Fix:StopIteration detection of get_main_activity_name is added 
Fix:Display detection of wsa-0 has been improved
 2022-03-17 19:45:33 +08:00
SarContDeli
357b5cb1c9 Fix:display_resize_wsa has an argument(display) of the wrong type: str -> int 2022-03-17 18:00:00 +08:00
saicatedoan
12fe5d9a92 Modified the way to realize the WSA solution 
Fix：A rare situation caused the game to shut down during restart in WSA solution
 2022-03-17 14:06:33 +08:00
saicatedoan
ebf0bc45b6 Add: WSA solution on display 0 (experimental) 2022-03-17 14:06:13 +08:00
LmeSzinc
1ad23dbe90 Fix: Watch device orientate when starting app 
- Opt: Skip screen size check at the first screenshot when game is not started
 2022-03-06 19:18:35 +08:00
LmeSzinc
022acd336a Fix: Handle BrokenPipeError in minitouch 
- Fix: Remove cached session globally when disconnecting to ADB
- Fix: Typo in del_cached_property()
 2022-03-06 15:01:57 +08:00
LmeSzinc
d586e5563a Fix: Handle screen rotation 2022-03-05 13:33:24 +08:00
LmeSzinc
be8269b555 Fix: Stuck in minitouch init 
- Fix: Handle AdbError(closed)
 2022-03-05 09:22:45 +08:00
LmeSzinc
bf87a69c17 Fix: Deleting a cached property will calculate it 2022-03-05 09:22:45 +08:00
Ala
42d345a70c render annotations in english 2022-02-20 15:23:31 +08:00
Ala
2eda0a66a6 适配 vmos pro 的adb截图 2022-02-20 10:09:38 +08:00
LmeSzinc
6cfa57c9b9 Opt: Better help text for app start/stop (#932) 2022-02-12 18:27:04 +08:00
LmeSzinc
27a666daab Fix: Safely delete minitouch_builder 2022-02-10 02:28:43 +08:00
LmeSzinc
5348c6f58f Fix: Spaces around package name cause inequality 2022-02-07 23:38:14 +08:00
LmeSzinc
8bd650d02c Fix: Handle errors of error handling in device connection 2022-02-07 22:53:43 +08:00
LmeSzinc
1916d8b1e1 Fix: Handle AdbTimeout 2022-02-06 18:57:24 +08:00
LmeSzinc
b3e1715d04 Fix: ADB Image pre-process on MuMu (#920) 2022-02-06 17:32:19 +08:00
LmeSzinc
3a35df69fd Fix: Minor issues when running Alas on AidLux+VMOS 
- Redundant "" in pip_install
- Hide Hermit after accessibility service turned on
 2022-02-06 01:29:17 +08:00
LmeSzinc
95d4da328b Add: Image de-dithering 2022-02-05 17:10:37 +08:00
LmeSzinc
36d805fea7 Fix: Minor issues when running Alas on AidLux+VMOS 
- Rename function names in research_optimizer to avoid tests
- Remove watch_memory decorator and psutil dependency
- Fix typo of Hermit
 2022-02-04 00:47:34 +08:00
LmeSzinc
7b0981fd48 Add: Screenshot interval in non-combat to help reduce CPU 2022-02-02 00:46:06 +08:00
LmeSzinc
df310b9d09 Opt: Remove unnecessary use of drags, fallback to swipe+click if drag is a must 2022-02-01 21:49:57 +08:00
LmeSzinc
7c4dfd8948 Fix: Accessibility service handing in different languages 2022-01-30 22:52:07 +08:00
LmeSzinc
1b1968dab4 Opt: Don't stop app if HandleError disabled 2022-01-27 17:11:46 +08:00
LmeSzinc
e95a145653 Add: Hermit, another control method 
- Add: Dump hierarchy via ADB and uiautomator2
- Fix: Device screenshot saving
 2022-01-27 16:57:25 +08:00
LmeSzinc
25076cf5e5 Fix: Not enough values to unpack in app_current_adb() 2022-01-25 21:47:39 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
6df7684a37 Opt: Show help message when having bad port 2022-01-22 23:02:06 +08:00
LmeSzinc
bb68096cfc Fix: Handle adb disconnect, add delay between retries 2022-01-22 23:02:03 +08:00
LmeSzinc
8374174d55 Refactor: module/device, separate all screenshot method and control methods 
- Better screenshot and control retries, handle common exceptions
 2022-01-22 17:42:47 +08:00
LmeSzinc
803e7a5813 Opt: Show exceptions under retry decorator 2022-01-13 17:47:17 +08:00
LmeSzinc
5dc207bb69 Del: Modifying CombatScreenshotInterval is not allowed anymore 2022-01-11 21:09:04 +08:00
LmeSzinc
26cee178a9 Opt: Show empty screenshots 2022-01-05 20:34:57 +08:00
LmeSzinc
342bed6255 Opt: Show minitouch init messages 2022-01-04 01:23:29 +08:00
LmeSzinc
afd44097b2 Fix: Typo in bf5316 2021-12-18 23:54:27 +08:00
LmeSzinc
bf53167572 Opt: ADB screenshots loader 
Try other loaders if loader fixed but unable to parse
 2021-12-18 23:33:11 +08:00
LmeSzinc
b6b1700407 Fix: Replace retrying with retry 2021-12-06 10:01:19 +08:00
LmeSzinc
c5599fb011 Fix: Screenshot retry decorator 2021-12-06 01:25:30 +08:00
LmeSzinc
7a0c566a9e Fix: Map swipe optimize should use local map view to generate blacklist 
- Opt: Take less screenshots during swipe, reuse local view object as possible
- Refactor: handle_boss_appear_refocus()
- Fix: Update swipe box area in map, avoid clicking auto search
 2021-11-22 18:09:38 +08:00
LmeSzinc
501467ed4c Opt: Reduce swipes become clicks when game is randomly stuck (#743) 
Optimise the swipe path so that it ends on land
 2021-11-17 22:28:19 +08:00
LmeSzinc
e984859ad6 Add: Goto main page when task queue is empty 
- Refactor: Task waiting
- Fix: Saving config twice in nested multiset wrapper
 2021-11-14 01:10:36 +08:00
Tiefeng Wei
4eca5f6b6f change: move import winreg from head to def 2021-11-12 23:39:53 +08:00
LmeSzinc
963437acb4 Opt: Use absolute ADB path 
- AzurLaneUncensored failed to push when using relative path
 2021-11-09 22:17:20 +08:00
LmeSzinc
377f5be445 Fix: [CN] Increase timeout of pushing AzurLaneUncensored files 2021-11-08 20:44:29 +08:00
muyeyifeng
60c1884416 Add: Bluestacks5 Hyper-v method 
Add: find_bluestacks5_hyperv method
Fix: Serial help document
 2021-11-05 10:34:55 +08:00
LmeSzinc
3098aa31aa Fix: Stop scheduler if a task failed 3 or more times 
- Add: Clear click record
- Opt: Check the type of user setting and display invalid settings
 2021-11-03 20:46:34 +08:00
LmeSzinc
366774db57 Opt: Recommend best method in benchmark 2021-10-26 17:44:11 +08:00
LmeSzinc
dd7b389797 Add: Semi-auto, Opsi semi-auto and benchmark 
- Add: dependency prettytable
- Fix: Running an Alas module directly
- Del: Remove all assets in daemon module, because it's redundant
 2021-10-25 18:49:56 +08:00
LmeSzinc
2122852ba5 Opt: Help text for BlueStacks Hyper-V auto connection 
- Refactor: find_bluestacks_hyperv()
 2021-10-24 12:30:51 +08:00
FishMagic
a827a0ce2e
Read Bluestacks4 Hyper-V Beta Realtime ADB port 2021-10-24 11:24:45 +08:00
LmeSzinc
a964f4e068 Merge branch 'master' into app 2021-10-23 14:53:06 +08:00
vlziw9y8
55b9cc59e7
Fix invalid warning when do first adb connect 2021-10-23 14:09:13 +08:00
LmeSzinc
9043a0d684 Refactor: Upgrade uiautomator2 to 2.16.7 2021-09-29 18:06:32 +08:00
LmeSzinc
019ce4f1dd Del: Remove the use of tinydb and notifypy 2021-09-26 05:00:10 +08:00
LmeSzinc
61cbe75527 Refactor: More accurate exceptions and add friendly advices 2021-09-16 12:09:00 +08:00
LmeSzinc
abdfbb713a Refactor: Rename auto search configs 
- Refactor device/app configs
- Fix: Research finish detection
 2021-09-15 23:50:30 +08:00
LmeSzinc
46d8d2fadb Refactor: Rename main configs 
- Faster chapter selection and page_campaign
- Rename some old Chinglish variables in map info
 2021-09-15 23:32:31 +08:00
LmeSzinc
67dfb7b83c Add drag log and fix ValueError in insert_swipe 2021-09-14 14:56:28 +08:00
LmeSzinc
a0d823bcd0 Rename configs in device, and research 2021-09-14 14:43:14 +08:00
SaigyoujiYukon
c9820e5ff3 跳过尝试连接emulator 
connect连的是ip+端口，应该连不上emulator-55xx吧（
 2021-08-21 18:33:41 +08:00
LmeSzinc
f1f190a2ad Fix: Raise error if clicking between 2 buttons 2021-07-16 21:33:33 +08:00
LmeSzinc
7a39232b41 Fix: Add ADB connection retry 2021-06-09 09:45:31 +08:00
Fernando Ayats
dc31a05e0b Linux compatibility 2021-05-30 17:54:25 +02:00
LmeSzinc
322cdddf6e Opt: Clean minitouch swipe way points 2021-02-25 18:08:17 +08:00
LmeSzinc
2d48654def Merge branch 'master' into dev 2021-02-20 17:35:56 +08:00
whoamikyo
7bf5499fc2 Opt: Minor improvements on toast notifications 2021-02-19 19:59:46 -03:00
LmeSzinc
5b8fa84db2 Fix: Delete nearing swipe way points, to prevent AL treats it as click 2021-02-18 16:46:03 +08:00
LmeSzinc
c22bf91e39 Fix: win10toast_persist import 
For compatibility with older Alas, users who don't enable notifications don't need to import win10toast_persist.
 2021-02-11 18:04:24 +08:00
whoamikyo
95c1008e5a Added: added toast notifications support to windows 10 2021-02-11 06:24:16 -03:00
LmeSzinc
02c67c468a Fix: Limit the setting of combat screenshot interval to 1.0s at max when enable auto search (#333) 
to avoid missing the detection of page switching
 2021-02-08 01:52:53 +08:00
LmeSzinc
7506a1bc28 Fix: Trigger device stuck detection in semi auto 
- Add disable_stuck_detection to disable that
 2021-01-09 18:33:10 +08:00
LmeSzinc
93dbca0346 Fix: Login failed more than 3 due to GameTooManyClickError in last login 2020-12-31 13:47:50 +08:00
LmeSzinc
16ea207cde Fix: Research reset save research_projects in stage folder not base folder 2020-12-11 22:19:12 +08:00
LmeSzinc
632fd4df30 Fix: Show warning if screen size is 720x1280 2020-11-28 16:27:26 +08:00
LmeSzinc
7aadddbd66 Opt: Add tips to handle AssertionError during u2.connect() 2020-11-08 13:52:38 +08:00
LmeSzinc
d17cedab88 Fix: Comment debug code in minitouch 2020-09-22 04:07:54 +08:00
LmeSzinc
0494b9403c Opt: Revert greedy optimization 2020-09-22 02:59:58 +08:00
LmeSzinc
b7c578f367 Add: T5 HT5 in Dreamwaker's Butterfly 2020-09-20 03:47:41 +08:00
LmeSzinc
9e933bc1c2 Add: T4 HT4 in Dreamwaker's Butterfly 
- Fix use boss fleet as mob when push_forward and triggered enemy round
- Opt speed up minitouch
 2020-09-19 20:48:19 +08:00
LmeSzinc
5b38d82f06 Opt: Serial in ADB commands now optional 2020-09-03 22:16:16 +08:00
LmeSzinc
1206839e27 Fix: Minitouch maximum X and Y doesn't match display size 2020-08-25 02:38:45 +08:00
LmeSzinc
e3d0cfe72c Opt: Minitouch random swipe path 2020-08-25 01:21:07 +08:00
whoamikyo
09d3f695de Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev"" 
This reverts commit ac9303012c.
 2020-08-18 20:48:14 -03:00
whoamikyo
ac9303012c Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev" 
This reverts commit bdc5aa0720, reversing
changes made to 6ee7a62edf.
 2020-08-18 20:47:27 -03:00
LmeSzinc
ccc91d2c7c Add: minitouch support, a faster way to control Android 2020-08-19 01:02:44 +08:00
LmeSzinc
3d5f57f460 Add: minitouch basic config 2020-08-17 18:31:31 +08:00
LmeSzinc
82870143b6 Opt: Move ascreencap into one file 2020-08-15 22:47:52 +08:00
LmeSzinc
c6736507ef Fix: Multi-click triggers click check 2020-08-14 10:27:39 +08:00
LmeSzinc
2c7ef03abd Fix: Handle game stuck when login 2020-08-05 16:21:18 +08:00
LmeSzinc
295849d216 Add: Handle commission list flashing bug 2020-08-02 22:42:20 +08:00
LmeSzinc
14c3966874 Add: Game stuck handler 
- Add ensure game running when running alas functions
 2020-08-01 17:53:00 +08:00
LmeSzinc
618ca784da Add: Research module 2020-07-17 05:32:22 +08:00
LmeSzinc
8d5739a11a Merge branch 'master' into dev 2020-07-07 21:10:48 +08:00
LmeSzinc
29106b08a0 Add: Check screenshot when running emulator settings 2020-07-07 20:45:45 +08:00
LmeSzinc
cf719b212f Fix: Installation problems 
- Disable update check
- Add max retry attempt to screenshot
 2020-07-07 19:58:08 +08:00
LmeSzinc
2a08c8c327 Opt: Move ascreencap to bin/ascreencap 
- Fix empty image after aScreenCap init
 2020-07-06 01:49:03 +08:00
LmeSzinc
4ed424fc20 Opt: Move point2str to module/base/utils.py 2020-07-05 22:59:46 +08:00
LmeSzinc
480439ecf2 Add: Warnings when get stuck 2020-07-04 07:42:48 +08:00
LmeSzinc
31fc6b5e1f Fix: Timezone awareness of handle_night_commission 2020-07-02 19:35:25 +08:00
whoamikyo
911d2893d7 Fix: changed the path to match with alas.bat 2020-06-25 17:30:34 -03:00
LmeSzinc
834b30e0ef Add: Able to use existing adb.exe 2020-06-24 11:40:07 +08:00
LmeSzinc
5202a0cbaa Fix: Swipes now join infinite clicking check 2020-06-23 01:09:56 +08:00
LmeSzinc
e25adcf8fc Fix: Increase adb_command timeout to 10 seconds 2020-06-22 23:30:41 +08:00
LmeSzinc
0ebbe181e7 Opt: Lazy aScreenCap initialization 2020-06-22 11:35:31 +08:00
LmeSzinc
383ff448ad Doc: aScreenCap benchmarks 
- Fix emulator test config
- Add instruction when no suitable aScreenCap lib
 2020-06-16 18:28:24 +08:00
LmeSzinc
d0867262e2 Optimize: Reuse device instance in the same function 
- Speed up retire confirm
- Set default server to CN
- Improve log appearance of aScreenCap init
 2020-06-16 08:55:44 +08:00
LmeSzinc
97b85160cd Add: aScreenCap support 
- Optimize adb command call
 2020-06-16 07:39:51 +08:00
LmeSzinc
7bd3d65701 Optimize: Faster screen size check 2020-05-31 03:33:51 +08:00
LmeSzinc
fba270471d Fix: using old api in Screen size check 2020-05-30 00:35:43 +08:00
LmeSzinc
a8333f55d4 Add: Screen size check 2020-05-29 22:44:35 +08:00
LmeSzinc
f9f0b59657 Fix: 修复夜间委托捕捉 2020-05-05 22:04:36 +08:00
LmeSzinc
ef5885767e Optimize: 战斗中放慢截图速度, 降低CPU使用 2020-04-28 12:53:24 +08:00
LmeSzinc
fc84f5e610 Fix: 修复开荒 
- 修复低级图出BOSS后报错的问题
- 修复了开荒进度0%时的章节名OCR
- 修复打完BOSS有时会卡住的问题
 2020-04-27 19:32:58 +08:00
LmeSzinc
6b56215d71 Fix: 修复地图特效导致的章节名识别错误和进图等待 
- 章节名识别错误时有20次重试的机会
- 进图时不再使用章节图标识别
- 更改了exception文件的位置
 2020-04-25 17:10:22 +08:00
LmeSzinc
516c16beae Fix: 增加复刻苍红的回响CD图, 国服热更又把地图视角改回去了 
- 修复点击时报类型错误的问题
- 修复无透视图片不被更新的问题
- 增加了灭点和距点的log
 2020-04-24 23:20:34 +08:00
LmeSzinc
bea05d396e Add: 适配复刻苍红的回响AB图 
- 开荒模式移动至出击设置
- 增加开荒模式自动启用, 无脑开就完事了
- 将透视识别参数放到了config里, 这样就可以用地图config覆盖了
- 适配小地图模式, 参数抄A1就行了
- 修复了章节名OCR的识别位置
- 修复了开荒会把BOSS当作精英打问题
- 增加战斗中的剧情跳过
- 注释掉了截图和点击的retry
- 增加了捕捉目标点超出移动范围
 2020-04-24 15:26:11 +08:00
LmeSzinc
a674198365 Add: 适配了第四章 
- 稍微移动了章节OCR的位置, 因为4-4会识别为14-4
- 针对第四章这种偏红的地图做了一些优化
- 稍微延长了敌人刷新时的等待时间
- 更改出错截图文件名为格式化的时间
 2020-04-18 00:19:50 +08:00
LmeSzinc
007d14c1d7 Fix: 修复和优化 
- 纠正了5-3刷新数据
- 更改出错截图文件名为毫秒时间戳
- 修复了伏击出现时, 仍会识别队伍的情况
- 修复了不开启截图时获得紧急委托时不点击的情况
 2020-04-17 17:19:09 +08:00
LmeSzinc
708c972161 Add: 增加登录时更新和回归奖励的适配 
- 更改了登录时的点击位置
 2020-04-16 16:09:23 +08:00
LmeSzinc
49ddd8d85f Add: 增加了出错时保存log和截图的功能 
- 更改了Log的目录名称
 2020-04-16 14:05:37 +08:00
LmeSzinc
91e83271a4 Add: 增加了使用一键退役的支持 
- 增加了根据设置选择切换函数的装饰器
- 增加了ADB截图和点击的设置, 默认使用ADB截图, uiautomator2点击
- 更新了assets.py文件, 上次commit忘记了
 2020-04-14 12:26:57 +08:00
LmeSzinc
5b3dc4ec85 Fix: 修复一些bug 
- 修复了删除空列时, 边缘仍然存在, 导致网格定位出错的问题
- 修复了在边缘外有错误的内部线时, 会把边缘删除的问题
- 调整了一图的边缘识别参数
- 修复了紧急委托过多时, 会触发同一按钮点击过多停止的问题
  委托列表拖动方式从 拖动-点击 改为 拖拽抖动
  独立出random_rectangle_vector函数
  增加random_line_segments函数
- 更改: 索敌时默认使用地图权重
- 修复了收菜获取物品过多时会卡住的问题
- 写死了1-1的相机移动, 防止因为地图太小导致透视识别错误
 2020-04-13 18:49:28 +08:00
LmeSzinc
be00742c3c Add: 适配第一章, 修复大量bug 
- 修复处理夜间委托时, 出现递归调用的问题
- 增加红脸出击确认的功能
- 增加了透视识别错误图片保存的开关
- 修复了地图太小时, 透视识别报错的问题
- 修复了相机位于地图外时, 透视识别出错的问题
- 修复了离开退役时, 会连击的问题
- 修复了同时出现低心情和船坞已满弹窗时, 卡住的问题
- 更新了一键退役实装后的安全点击的位置
- 修复了换装滑动失败时, 卡住的问题
- 修复了关闭自动收获后, 出现委托完成的提示是, 进图卡住的问题
- 修复了, 无正在跑的委托时, 报错的问题
 2020-04-11 15:26:42 +08:00
LmeSzinc
f1c2d182db Fix: 修复使用ADB时, 疯狂弹窗口的问题 
- 中止运行时仍然会弹窗, 是gooey的锅
- 修正了拼写错误
 2020-04-10 19:11:33 +08:00
LmeSzinc
0c5bded2c7 Fix: 增加连续点击一个按钮时, 停止运行的功能 
- 增加靠边缘修正相机位置时的log
- 修复了频繁报Enemy searching timeout的问题
- 修复周回模式下, 已经进图时, 会按有伏击运行的问题
 2020-04-10 18:39:47 +08:00
LmeSzinc
ae94260ff8 Add: 支持App控制, 支持自动登录 
- 修复了12-4地图信息的错误
 2020-04-10 14:18:10 +08:00
LmeSzinc
b6bc70e1c6 Add: 增加了血量平衡和低血量撤退的功能 
- 修改了年久失修的血量平衡模块
- 修改了拖拽操作
- 修复了12-4练级时, boss刷新后卡住的问题
- 修复了频繁报enemy searching timeout的问题
 2020-04-07 22:08:06 +08:00
LmeSzinc
87554793d3 Fix: 修复了一堆bug 
- 修复了上一场战斗的队伍位置信息会保留到下一场战斗的问题
- 修复了领取大量任务时, 不会等待的问题
- 修复了不计算BOSS队心情消耗的问题
- 增加了碰磁BOSS所有刷新点的方法
- 修复了没有检测到BOSS时停滞的问题
- 修复了处理夜间委托
- 修复了丢失地图信息补全不起作用的问题
- 修复了换装滑动失败后, 陷入死循环的问题
- 删除了微层混合AB图的一些多余逻辑
- 7-2现在会优先捡全部问号了, 不需要先捡附近的来减少行走距离.
 2020-04-07 11:20:38 +08:00
LmeSzinc
d85453e03f Add: 处理夜间委托的弹窗 
在晚上21点的前后5秒钟, 会暂停所有动作, 等待弹窗. 需保证系统时间正确
 2020-03-31 22:16:21 +08:00
LmeSzinc
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00