LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 00:19:24 +08:00
Code Activity
8,569 Commits 12 Branches 0 Tags
95a3fe236b2ef5a858f09e7af4937575baecbc34
Commit Graph

170 Commits

Author SHA1 Message Date
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
LmeSzinc
3e585ab8e7 Fix: Mark nemu_ipc unavailable if emulator instance not found 2024-04-14 01:06:04 +08:00
LmeSzinc
ac8000b753 Opt: Capture std only when having errors 2024-04-13 22:41:53 +08:00
LmeSzinc
5835289178 Opt: Increase nemu_ipc timeout to 0.15s for slow PCs 2024-04-13 01:41:54 +08:00
Zuosizhu
898f69f097 Merge branch 'LmeSzinc:master' into 20230309 2024-04-10 23:18:34 +08:00
LmeSzinc
024b7f3143 Fix: ev_run_sync timeout now does not include std capturing 2024-04-10 21:28:44 +08:00
Zuosizhu
69aebdcf30 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py
 2024-04-10 12:22:40 +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
2ebe71b774 Add: NemuIpc method 2024-04-08 04:04:35 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
06cd62f3ee Opt: [ALAS] Reuse image array to improve memory performance 2024-03-21 21:35:51 +08:00
LmeSzinc
f076ba12ed Add: [ALAS] Proxy element props 2024-03-16 16:02:07 +08:00
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00