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

427 Commits

Author SHA1 Message Date
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
Zuosizhu
c547c7ab86 Merge branch 'LmeSzinc:master' into 20230309 2024-04-12 23:41:14 +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
Zuosizhu
f5b3d11eac Merge branch 'LmeSzinc:master' into 20230309 2024-04-11 23:14:52 +08:00
xhqss
8226564773 Merge branch '20230309' into smallkai 2024-04-11 22:27:31 +08:00
xhqss
df2bfe0a06 Merge branch 'master1' into 20230309 2024-04-11 22:27:03 +08:00
xhqss
765eeed754 Merge branch '20230309' into smallkai 2024-04-11 22:12:34 +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
Zuosizhu
49b4547270 Merge branch 'LmeSzinc:master' into 20230309 2024-04-11 19:07:51 +08:00
LmeSzinc
13f5c1a6b3 Fix: Deredundant emulator path in lowercase 2024-04-11 02:11:59 +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
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
Zuosizhu
7719d10bec Merge branch 'LmeSzinc:master' into nemu-ipc-update 2024-04-10 14:09:24 +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
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