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

447 Commits

Author SHA1 Message Date
xhqss
c0c4913353 Merge branch '20230309' into smallkai 
# Conflicts:
#	module/config/i18n/zh-CN.json
 2024-05-23 08:25:21 +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
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
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
LA_DI_DA
219bb4764b Del: screenshot interval limit 2024-04-28 23:36:09 +08:00
LA_DI_DA
e6f317de1b Revert "Del: screenshot interval limit" 
This reverts commit 860bcf5760.
 2024-04-28 23:34:16 +08:00
LA_DI_DA
efb36a7f45 Fix: should reset record que after loading config 2024-04-28 23:32:57 +08:00
LA_DI_DA
928b61978d Add: more setting for click record check 2024-04-28 23:06:32 +08:00
LA_DI_DA
860bcf5760 Del: screenshot interval limit 2024-04-28 22:19:09 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
 2024-04-27 15:56:34 +08:00
Zuosizhu
8fd3c7eedd Merge branch 'master_lme_to_merge' 
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
 2024-04-27 13:00:39 +08:00
Zuosizhu
055720dd52 Merge branch 'master_lme' 
# Conflicts:
#	deploy/config.py
 2024-04-26 03:18:16 +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
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
LmeSzinc
6c09e29aca Fix: [ALAS] Global MuMu 12 id 2024-04-21 23:34:34 +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
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
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
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