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,117 Commits 9 Branches 0 Tags 274 MiB
64c5b5e30f
Commit Graph

427 Commits

Author SHA1 Message Date
LmeSzinc
8376d62843 Sync: [ALAS] Minitouch multi-finger support 2024-04-15 19:17:18 +08:00
LmeSzinc
4858d55c46 Opt: Patch pkg_resources for faster startup 2024-04-15 18:43:42 +08:00
LmeSzinc
31da8d42a1 Opt: Early init minitouch and MaaTouch for faster startup 2024-04-15 03:48:37 +08:00
LmeSzinc
502558dbbd Fix: brute_force_connect() was called on linux 2024-04-15 00:57:40 +08:00
LmeSzinc
3e585ab8e7 Fix: Mark nemu_ipc unavailable if emulator instance not found 2024-04-14 01:06:04 +08:00
LmeSzinc
d67874ca68 Fix: Filter emulator instances by the running emulator path 2024-04-14 01:01:05 +08:00
LmeSzinc
d1ba75250a Fix: Ignore wrong emulator info when searching emulator instance 2024-04-14 00:57:05 +08:00
LmeSzinc
3e47e8aa33 Add: Iter running emulators when searching all emulators 2024-04-14 00:20:46 +08:00
LmeSzinc
ac8000b753 Opt: Capture std only when having errors 2024-04-13 22:41:53 +08:00
LmeSzinc
42af2e479f Chore: [ALAS] Abstract has_cached_image 2024-04-13 02:28:11 +08:00
LmeSzinc
5835289178 Opt: Increase nemu_ipc timeout to 0.15s for slow PCs 2024-04-13 01:41:54 +08:00
LmeSzinc
c1ed90dcf4 Fix: Handle MuMu12 port switches 2024-04-12 01:20:28 +08:00
LmeSzinc
c3408b2b30 Opt: Write serial if auto device detection found only one 
instead of searching again next time
 2024-04-12 00:03:37 +08:00
LmeSzinc
63b76fdb0e Fix: Convert emulator-* when finding emulator instances 2024-04-11 23:56:55 +08:00
LmeSzinc
76da1ce139 Fix: Allow nemu_ipc for screenshot only cuz bad swipes on slow PC 2024-04-11 22:04:22 +08:00
LmeSzinc
13f5c1a6b3 Fix: Deredundant emulator path in lowercase 2024-04-11 02:11:59 +08:00
LmeSzinc
024b7f3143 Fix: ev_run_sync timeout now does not include std capturing 2024-04-10 21:28:44 +08:00
LmeSzinc
6726293edf Fix: Emulator name was "None" in string 2024-04-10 19:19:53 +08:00
LmeSzinc
190da3a1d0 Fix: Exe from registry may in lower case 2024-04-10 19:10:17 +08:00
LmeSzinc
0226dd5df3 Opt: Allow nemu_ipc to have a lower default screenshot interval 2024-04-10 13:55:02 +08:00
LmeSzinc
76e148f860 Fix: Auto redirect MuMu12 from 127.0.0.1:7555 to 127.0.0.1:16xxx 2024-04-10 13:47:12 +08:00
LmeSzinc
e34b19d625 Fix: duped std was opened twice 2024-04-09 21:28:20 +08:00
LmeSzinc
840014f039 Fix: [ALAS] DroidCast image orientation on MuMu12 2024-04-09 00:35:56 +08:00
LmeSzinc
22618fe46c Fix: Failed to init nemu_ipc on empty emulator path (#3616) 2024-04-08 22:04:33 +08:00
LmeSzinc
6bae27cacc Fix: File descriptor leak in nested CaptureNemuIpc call 2024-04-08 21:56:23 +08:00
LmeSzinc
65c826a70f Opt: Release nemu_ipc connection during wait 2024-04-08 05:23:14 +08:00
LmeSzinc
5623f10ee6 Opt: [ALAS] Brute force connect if auto didn't find any emulators 2024-04-08 05:08:47 +08:00
LmeSzinc
2a74c338a3 Opt: Limit screenshot and control combinations when using nemu_ipc 2024-04-08 04:32:33 +08:00
LmeSzinc
2ebe71b774 Add: NemuIpc method 2024-04-08 04:04:35 +08:00
LmeSzinc
2e81cb7dc1 Add: Click method nemu_ipc 2024-04-08 03:14:33 +08:00
LmeSzinc
54f06bc91e Add: nemu_ipc screenshot and control proxy 2024-03-28 21:41:53 +08:00
LmeSzinc
ad766df910 Chore: [ALAS] Cache prop nemud.app_keep_alive 2024-03-28 19:17:16 +08:00
LmeSzinc
71318a3228 Chore: [ALAS] Expose one Platform class 2024-03-28 19:17:16 +08:00
LmeSzinc
a144908e14 Add: [ALAS] Auto emulator start 2024-03-28 19:17:14 +08:00
LmeSzinc
06cd62f3ee Opt: [ALAS] Reuse image array to improve memory performance 2024-03-21 21:35:51 +08:00
LmeSzinc
6a23f82e6c Fix: [ALAS] Enhance auto device detection, ignore 127.0.0.1:7555 from MuMu 12 2024-03-21 19:34:08 +08:00
LmeSzinc
f076ba12ed Add: [ALAS] Proxy element props 2024-03-16 16:02:07 +08:00
LmeSzinc
39f4c9cac4 Fix: [ALAS] Limit the length of screenshot deque 2024-01-01 22:17:06 +08:00
SC23
17e41a8bff
Fix: GUILD DISPATCH (#3392) 
* Fix_Gulid_DISPATCH

* Revert "Fix_Gulid_DISPATCH"

This reverts commit ba1f1f2ef5c3d56297f945e92ae2f73aaff8eb53.

* Fixed_Gulid_DISPATCH

* Fixed_GulidDISPATCH
 2023-12-29 09:47:30 +08:00
LmeSzinc
10486b8b60 Dev: [ALAS] Show function calls on errors 2023-12-14 21:21:40 +08:00
LmeSzinc
638ccb5c7c Fix: [ALAS] Retry check_mumu_app_keep_alive() 2023-12-09 18:09:34 +08:00
LmeSzinc
208a6e9b61 Refactor: Use collections.Counter instead of poor implementation 2023-12-07 02:22:42 +08:00
LmeSzinc
35c109a648 Fix: Revised serial should starts with 127 2023-10-01 01:51:22 +08:00
LmeSzinc
f6c56e1940 Fix: Log unexpected droidcast response 2023-09-30 17:04:36 +08:00
LmeSzinc
0dcdab461e Fix: Wait DroidCast server startup 2023-09-26 21:50:29 +08:00
Torther
69df0c26e4
Upd: Screenshot method DroidCast_raw update (#2881) 
* Upd: Screenshot method DroidCast_raw update

* Opt: Refactor module/device/method/droidcast.py for improved functionality

The module/device/method/droidcast.py has been refactored to improve its functionality and remove unnecessary code. Here are the key changes:

- Removed the unnecessary droidcast_raw_port attribute.
- Updated the droidcast_url method to use '/preview' as the default URL for DroidCast.
- Rename droidcast_init and droidcast_raw_init to droidcast_start and droidcast_raw_start.
- Add droidcast_init to reuse the common parts of droidcast_start and droidcast_raw_start.
- Removed the droidcast_raw_wait_startup method as it is no longer needed.
- Updated the droidcast_uninstall method to remove the deletion of DroidCast APK.

These changes aim to simplify the DroidCast class and improve its overall functionality.

* Opt: Refactor module/device/method/droidcast.py for improved functionality

The module/device/method/droidcast.py has been refactored to improve its functionality and remove unnecessary code. Here are the key changes:

- Removed the unnecessary droidcast_raw_port attribute.
- Updated the droidcast_url method to use '/preview' as the default URL for DroidCast.
- Rename droidcast_init and droidcast_raw_init to droidcast_start and droidcast_raw_start.
- Add droidcast_init to reuse the common parts of droidcast_start and droidcast_raw_start.
- Removed the droidcast_raw_wait_startup method as it is no longer needed.
- Updated the droidcast_uninstall method to remove the deletion of DroidCast APK.

These changes aim to simplify the DroidCast class and improve its overall functionality.

* Fix: Droidcast cannot start due to port occupation
 2023-09-25 18:51:56 +08:00
LmeSzinc
8987c9253b Add: Disable multi-instances on phone cloud environment 2023-08-28 17:30:46 +08:00
LmeSzinc
ae8172e580 Fix: Revise serial as fool-proof 2023-08-28 00:03:41 +08:00
LmeSzinc
a06061c2c5 Fix: Handle serial startswith "127.0.0.1." as a fool-proof 2023-08-23 12:39:30 +08:00
LmeSzinc
b40850200b Fix: Raise error if app_keep_alive is enabled in MuMu 12 2023-08-05 17:56:31 +08:00
LmeSzinc
98a29c88cd Fix: Disconnected the wrong offline device 2023-08-05 17:55:20 +08:00
LmeSzinc
a53f6cf9e7 Fix: Temp fix for MuMu 12 before DroidCast updated (#2952) 2023-08-03 00:17:31 +08:00
LmeSzinc
33bcd116a8 Fix: No orientation handle in MaaTouch 2023-08-01 19:28:36 +08:00
LmeSzinc
f18a7b1828 Add: Support BlueStacks Hyper-V Android 11 (Rvc64) 2023-06-09 00:26:22 +08:00
LmeSzinc
18cba1f9d0 Chore: Remove the use of np.int 2023-05-30 10:28:51 +08:00
LmeSzinc
8ceb15dafc Add: [CN] Channel server com.bilibili.blhx.dl 2023-05-27 22:46:30 +08:00
LmeSzinc
f98137108f Fix: Exact match instead of keywords to ignore random package names 2023-05-26 11:55:09 +08:00
LmeSzinc
3a9db10d70 Fix: Handle bugs in adbutils>=1.0 2023-05-23 00:09:39 +08:00
LmeSzinc
250145fd7f Fix: Prevent MaaTouch stream from being deleted 2023-05-23 00:09:25 +08:00
LmeSzinc
f59ac5885f Fix: Compatible with old and new adbutils 2023-05-16 23:41:00 +08:00
LmeSzinc
eb8c948198 Opt: Screenshot method fallback to auto if ascreencap unavailable 2023-04-04 03:07:12 +08:00
LmeSzinc
e295f08811 Fix: Missing init() call in uiautomator2 retries (#2424) 2023-03-31 00:48:35 +08:00
xausky
6c6511db60 Fix: Fix lanuch game in no physical keys device 2023-03-05 12:04:32 +08:00
LmeSzinc
61f2f4013d Fix: Handle empty cmdline in proc_list_uiautomator2() 2023-03-01 18:13:49 +08:00
LmeSzinc
19784c7a14 Fix: Handle chinese ： in serial 2023-02-26 01:18:50 +08:00
LmeSzinc
d94cf3f2e0 Fix: Disconnect offline devices before connecting 2023-02-19 20:42:34 +08:00
LmeSzinc
4866862652 Fix: Accept first 720x1280 screenshots 2023-02-16 21:15:14 +08:00
LmeSzinc
9861cbd449 Opt: No screenshot timer prints (#2051) 2023-02-16 21:12:41 +08:00
LmeSzinc
5fb26cf565 Opt: Re-use State.deploy_config when getting adb_binary 2023-02-11 16:26:17 +08:00
LmeSzinc
45aab15ed5 Opt: Add DroidCast_raw link 2023-02-11 15:20:28 +08:00
LmeSzinc
b128375a22
Merge pull request #2220 from Azusachan/master 
Add support for Bluestacks 5 Pie64 instances
 2023-02-08 11:46:56 +08:00
Azusa Nakano
b45149e283 Add support for Bluestacks 5 Pie64 instances 
Fix #2188 by matching either Nougat64 or Pie64 at the same time. Note that this creates a problem such that when first Nougat64 and Pie64 co-exists, the engine would fail to match Pie64.
 2023-02-08 14:28:23 +11:00
LmeSzinc
bfb5004dc1 Fix: Catch ReadTimeout in DroidCast_raw 2023-02-08 01:54:22 +08:00
LmeSzinc
278077f5b9 Opt: Faster resolution_uiautomator2() 2023-02-08 01:53:04 +08:00
LmeSzinc
3d174b19cb Opt: Auto-select the fastest screenshot method 2023-02-08 01:42:04 +08:00
LmeSzinc
8d06ce4987 Fix: Handle Runtime error raised by uiautoamtor2 2023-02-07 19:20:16 +08:00
LmeSzinc
835eb1e475 Fix: Too many clicks on SUBMARINE_READY in OpSi battles 2023-02-04 17:26:42 +08:00
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