1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 10:59:24 +08:00
Commit Graph

186 Commits

Author SHA1 Message Date
xhqss
14d1b739f3 Fix:Missing s in the directory of customer config,json 2024-08-17 13:35:27 +08:00
xhqss
eb83dcb403 Merge branch 'master_lme' 2024-08-17 02:54:22 +08:00
LmeSzinc
d1b41367cb Fix: Check app keep alive on mumu >= 4.0 2024-08-17 00:29:55 +08:00
xhqss
b7cc5db354 Merge branch 'refs/heads/master_lme' 2024-08-12 02:47:51 +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
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
xhqss
fbe58bd329 Merge branch 'refs/heads/master_lme'
# Conflicts:
#	module/campaign/gems_farming.py
#	module/device/method/adb.py
#	module/device/screenshot.py
2024-07-26 10:28:26 +08:00
LmeSzinc
ff3971b023 Fix: ctypes.WINFUNCTYPE is called on non-Windows 2024-07-25 12:14:49 +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
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
44b623c06c Fix: [ALAS] Trying to handle AdbError: unknown host service
(cherry picked from commit 59ad8bd6fcd4b63ab9a557b1bd11aa92fb071e13)
2024-07-24 00:34:50 +08:00
LA_DI_DA
5ab8cfdee5 Merge branch 'refs/heads/lme-alas/master' into dev
# Conflicts:
#	README.md
2024-07-06 19:17:11 +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
LmeSzinc
12bd302deb Reverts test code in commit ea68f68d 2024-06-28 03:23:28 +08:00
LmeSzinc
ea68f68dc9 Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() (#3917) 2024-06-27 22:20:09 +08:00
Zuosizhu
5123bd9949 Merge branch 'lme_master'
# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment_change.py
2024-05-19 00:50:11 +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
Zuosizhu
a3e1d994bb Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 19:58:18 +08:00
LmeSzinc
6e7f92aae3 Fix: Array typo in DroidCast image parse 2024-05-03 16:37:25 +08:00
Zuosizhu
af1f0a9056 Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 12:58:36 +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
Zuosizhu
77e7276902 Merge branch 'lme_master'
# Conflicts:
#	module/equipment/equipment_change.py
2024-04-30 11:12:03 +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
Zuosizhu
055720dd52 Merge branch 'master_lme'
# Conflicts:
#	deploy/config.py
2024-04-26 03:18:16 +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
Zuosizhu
79b4a6deb9 Merge branch 'LmeSzinc:master' into 20230309 2024-04-22 13:20:05 +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
Zuosizhu
bdc7d43c97 Merge branch 'dev-revert-gemsfarming'
# Conflicts:
#	assets/cn/handler/MOB_MOVE_CANCEL.png
#	module/device/method/utils.py
#	module/handler/fast_forward.py
2024-04-20 15:16:09 +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
Zuosizhu
4486c8cff6 Merge branch 'LmeSzinc:master' into 20230309 2024-04-15 23:25:52 +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
31da8d42a1 Opt: Early init minitouch and MaaTouch for faster startup 2024-04-15 03:48:37 +08:00