c9edec1895
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
2024-08-17 10:04:56 +08:00
LmeSzinc
c98f2dc825
Fix: Missing s in the directory of customer_config.json
2024-08-17 03:16:15 +08:00
LmeSzinc
d1b41367cb
Fix: Check app keep alive on mumu >= 4.0
2024-08-17 00:29:55 +08:00
407d12fede
Merge branch 'master' of LmeSzinc
2024-08-11 09:24:13 +08:00
LmeSzinc
14a3f57d78
Pref: [ALAS] Connect all possible serial at once
2024-08-11 00:45:07 +08:00
LmeSzinc
886736de45
Fix: [ALAS] Launch parameters on waydroid ( #4000 )
2024-08-11 00:45:00 +08:00
LmeSzinc
9c7f2fcb7d
Fix: [ALAS] Handle empty getprop on mumu12 >= 4.0
2024-08-10 23:56:29 +08:00
LmeSzinc
360bfa0474
Refactor: [ALAS] app_start_uiautomator2 to be the same as adb
2024-08-10 22:16:58 +08:00
c8e686a642
Add: BATTLE_STATUS_D withdraw
2024-08-10 12:24:57 +08:00
83caf9c287
Merge branch 'master' of LmeSzinc
2024-08-02 14:32:40 +08:00
LmeSzinc
342f444164
Fix: [ALAS] Catch Permission Denial on am start
2024-08-02 02:44:11 +08:00
LmeSzinc
debbbdae96
Refactor: [ALAS] Launch app with activity name
2024-08-01 23:26:56 +08:00
b1e80fbeb5
Merge branch 'master' of LmeSzinc
2024-07-26 06:54:28 +08:00
LmeSzinc
32649283ff
Opt: Lower default screenshot interval on ldopengl
2024-07-25 12:18:28 +08:00
LmeSzinc
ff3971b023
Fix: ctypes.WINFUNCTYPE is called on non-Windows
2024-07-25 12:14:49 +08:00
LmeSzinc
2454d2aa2c
Opt: Use MaaTouch as default control method
2024-07-25 02:19:45 +08:00
LmeSzinc
200a5116ce
Fix: Keep IScreenShotClass_Cap referenced
2024-07-25 02:16:38 +08:00
LmeSzinc
acbd5536bb
Fix: FileNotFoundError wasn't handled
2024-07-25 02:16:38 +08:00
LmeSzinc
733bb89b2d
Add: [ALAS] Add ldopengl setting
2024-07-25 02:16:34 +08:00
LmeSzinc
b285beed2b
Add: [ALAS] Add screenshot method ldopengl
2024-07-25 00:12:50 +08:00
LmeSzinc
13fed12ff6
Fix: [ALAS] Handle dynamic mumu serial in serial_to_id
2024-07-24 23:18:01 +08:00
LmeSzinc
dce6f5c150
Opt: [ALAS] Skip nemud_app_keep_alive check on non-mumu
2024-07-24 23:18:01 +08:00
LmeSzinc
70db762421
Fix: [ALAS] use ldconsole.exe
2024-07-24 23:17:56 +08:00
LmeSzinc
1375eba095
Fix: [ALAS] Release cache after adb_restart()
...
(cherry picked from commit 8d9e39fe5b9f359702c527e012eb03a04901b575)
2024-07-24 00:34:54 +08:00
LmeSzinc
8da1848a4b
Fix: [ALAS] Trying to handle MuMu12 port switches
...
(cherry picked from commit 73a84d10d2e2cfcec1e48900c352ef50fbecc186)
2024-07-24 00:34:54 +08:00
LmeSzinc
790fee8aa7
Fix: [ALAS] _maatouch_builder wasn't removed after adb_disconnect()
...
(cherry picked from commit e10087aaf108f629ed689224e80e45f76905cfac)
2024-07-24 00:34:54 +08:00
LmeSzinc
44b623c06c
Fix: [ALAS] Trying to handle AdbError: unknown host service
...
(cherry picked from commit 59ad8bd6fcd4b63ab9a557b1bd11aa92fb071e13)
2024-07-24 00:34:50 +08:00
LmeSzinc
59cef0fa9f
Fix: [ALAS] Device.__init__() was never called if EmulatorNotRunningError handled
...
(cherry picked from commit 37d45af63f65ed851c48116d4a9872b43dd2f5c9)
2024-07-24 00:28:27 +08:00
5fbc779c3f
Merge remote-tracking branch 'guoh064/gems_farming_gearcode'
2024-07-23 12:53:31 +08:00
9b86aa81f3
Merge branch 'master' of LmeSzinc
2024-07-19 00:46:09 +08:00
LmeSzinc
ccd19417ec
Fix: Auto-fill emulator info on Windows only
2024-07-18 21:59:24 +08:00
LmeSzinc
ff6307b09d
Fix: Allow Hermit on VMOS only
2024-07-18 21:56:48 +08:00
LmeSzinc
e1a469fcee
Add: [ALAS] Add interval on dump_hierarchy()
...
(cherry picked from commit 00f3bf749542c6db1aee77d2cc08081e1c3f5189)
2024-07-17 12:58:39 +08:00
Jose Suarez
746e511f82
Fix BlueStacks_nxt emulator auto-run ( #3987 )
...
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-07-12 18:49:03 +08:00
LmeSzinc
4135210550
Fix: brute_force_connect is called on non-windows
2024-07-12 12:42:14 +08:00
b119655c58
Merge branch 'master' of LmeSzinc
2024-07-12 03:15:15 +08:00
LmeSzinc
834ef85cdb
Fix: is_mumu_over_version_356 is True on mumu mac
2024-07-12 02:08:02 +08:00
LmeSzinc
6064457620
Chore: [ALAS] Abstract platform condition
2024-07-12 01:05:58 +08:00
4d9b59fbbd
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
2024-07-06 10:43:02 +08:00
f914502cd7
Process Battle Status C or D
2024-07-06 10:35:59 +08:00
LmeSzinc
6edb1dbe7b
Opt: [ALAS] Dynamic nemu_ipc timeout to fit screenshot interval
...
(cherry picked from commit 8e10b9989f260ad60a6813b027f168233512ac15)
2024-07-06 01:55:00 +08:00
LmeSzinc
2bc712fa69
Opt: Remove debug code
2024-07-06 00:38:14 +08:00
65761a2c8b
Merge branch 'master' of LmeSzinc
2024-06-28 14:40:37 +08:00
LmeSzinc
12bd302deb
Reverts test code in commit ea68f68d
2024-06-28 03:23:28 +08:00
5ffd84a61e
Merge branch 'master' of LmeSzinc
2024-06-28 03:15:29 +08:00
LmeSzinc
ea68f68dc9
Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() ( #3917 )
2024-06-27 22:20:09 +08:00
938ba056e3
Merge branch 'master' of LmeSzinc
2024-06-27 17:51:35 +08:00
guoh064
aa2e985fe8
Feature: Gear code for GemsFarming
2024-06-26 19:32:28 +08:00
PPPlatelet
a2312c5498
Opt: Add start/stop LDPlayer,NoxPlayer,BlueStack4,MEmuPlayer support. ( #3867 )
...
* Opt: Add start/stop LDPlayer,NoxPlayer,BlueStack4,MEmuPlayer support.
* Upd: fixed.
* fix
* Upd: Bug fix.
* Upd: fix
* Upd: Add single_to_console method.
* Upd: fix texts.
---------
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-06-26 12:41:38 +08:00
SevCrane
f05b61ed8e
Merge remote-tracking branch 'LmeSzinc:master'
2024-06-13 11:45:38 +08:00
LmeSzinc
4c98442422
Fix: [ALAS] Handle psutil.NoSuchProcess
2024-06-11 19:13:55 +08:00
LmeSzinc
dad0e0e963
Pref: Try nc command on android phones first
2024-06-07 16:21:14 +08:00
LmeSzinc
91fb329f96
Fix: More fool-proof serial input redirection
2024-06-07 16:12:35 +08:00
SevCrane
162ec3d14d
AlasGG
2024-06-06 00:27:00 +08:00
SevCrane
abfbbe5064
merge alas
2024-06-05 23:57:58 +08:00
SevCrane
3cb29a9a37
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
2024-06-05 23:53:03 +08:00
SevCrane
5e482958f6
AlasGG
2024-06-05 23:20:28 +08:00
LmeSzinc
6bd10d1a9d
Chore: [ALAS] Default image name in image_save
2024-05-09 18:46:53 +08:00
LmeSzinc
dbc80e3d26
Fix: [ALAS] socket timeout on scrcpy server startup
...
(cherry picked from commit 6e703ffb666fe9e2c4e7d42eee9fbd69f26451c7)
2024-05-08 01:04:04 +08:00
LmeSzinc
6e7f92aae3
Fix: Array typo in DroidCast image parse
2024-05-03 16:37:25 +08:00
LmeSzinc
24fa10c509
Opt: Faster DroidCast_raw image parsing
2024-05-02 16:35:34 +08:00
LmeSzinc
e7bc1c94a4
Fix: [ALAS] Log empty command list
2024-05-01 23:59:59 +08:00
LmeSzinc
75333193ea
Fix: [ALAS] insert_swipe() may return a length=1 list after deleting nearing points
2024-05-01 23:40:17 +08:00
LmeSzinc
741fc1c247
Chore: Remove debug loggers
2024-04-30 18:13:48 +08:00
LmeSzinc
107f88a275
Merge remote-tracking branch 'origin/dev' into sync_test
2024-04-30 17:43:32 +08:00
LmeSzinc
0fb6a96691
Refactor: Make MaaTouch inputs synchronous
2024-04-30 17:42:52 +08:00
LmeSzinc
152f5b596a
Chore: [ALAS] Patch uiautomator2 loggers so they can be logged in Alas
2024-04-30 00:06:40 +08:00
LmeSzinc
57d42a14ae
Chore: [ALAS] Add method uninstall_uiautomator2
2024-04-30 00:06:33 +08:00
LmeSzinc
4cff3e6283
Fix: [ALAS] Patch u2.init.appdir in runtime
2024-04-30 00:06:25 +08:00
LmeSzinc
c5415d15be
Fix: [ALAS] Allow removing non-existent forwards and reverses
2024-04-25 19:05:42 +08:00
LmeSzinc
a4f8bde695
Merge branch 'master' into dev
2024-04-23 01:13:02 +08:00
LmeSzinc
55b68d1f12
Fix: [ALAS] Old minitouch conn does not response to inputs after adb restarted
2024-04-23 00:16:29 +08:00
LmeSzinc
1ddc7d9365
Fix: [ALAS] _minitouch_client is not default value
2024-04-22 00:15:44 +08:00
LmeSzinc
bf52e6954a
Fix: [ALAS] Touch builders have no retries if called directly
2024-04-21 23:36:47 +08:00
LmeSzinc
3757510ecd
Fix: [ALAS] Re-init MaaTouch when orientation changed
2024-04-21 23:36:31 +08:00
LmeSzinc
6c09e29aca
Fix: [ALAS] Global MuMu 12 id
2024-04-21 23:34:34 +08:00
LmeSzinc
76f863ac59
Fix: [ALAS] Global MuMu 12 id
2024-04-19 22:38:49 +08:00
LmeSzinc
54ff40588c
Fix: [ALAS] Touch builders have no retries if called directly
2024-04-19 01:54:03 +08:00
LmeSzinc
00926388c8
Fix: site-packages detection on manual package builds
2024-04-19 01:52:51 +08:00
LmeSzinc
68b1af661f
Merge branch 'src_sync' into dev
2024-04-15 19:21:18 +08:00
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