LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 00:39:29 +08:00
Code Activity
9,097 Commits 12 Branches 0 Tags
ab99aca4c1b6efcedc76f97a6db041b54249df9b
Commit Graph

93 Commits

Author SHA1 Message Date
LA_DI_DA
7ea67e514e Merge branch 'refs/heads/0O0o0oOoO00-alas/master' into dev 2024-07-26 12:25:03 +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
2454d2aa2c Opt: Use MaaTouch as default control method 2024-07-25 02:19:45 +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
LA_DI_DA
023c332c62 Merge branch 'refs/heads/0O0o0oOoO00-alas/master' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-07-18 23:17:29 +08:00
LA_DI_DA
f963dd0b93 Merge branch 'refs/heads/lme-alas/master' 
# Conflicts:
#	alas.py
 2024-07-18 23:11:37 +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
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
LA_DI_DA
f8964c88d9 Merge branch 'refs/heads/0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	.gitignore
#	alas.py
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/task.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/handler/login.py
 2024-05-23 13:07:57 +08:00
LA_DI_DA
c0752fb0dc Revert "fix: adapt detect other's login" 
This reverts commit 5cebcb3535.
 2024-05-21 23:01:12 +08:00
LA_DI_DA
6669aa99b4 Revert "fix: check if has login" 
This reverts commit 8fd1c2122b.
 2024-05-21 23:01:07 +08:00
LA_DI_DA
8fd1c2122b fix: check if has login 2024-05-18 00:14:05 +08:00
LA_DI_DA
5cebcb3535 fix: adapt detect other's login 2024-05-17 22:16:36 +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
1be62c9c8f Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-04-27 16:01:37 +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
79b4a6deb9 Merge branch 'LmeSzinc:master' into 20230309 2024-04-22 13:20:05 +08:00
LmeSzinc
3757510ecd Fix: [ALAS] Re-init MaaTouch when orientation changed 2024-04-21 23:36:31 +08:00
LA_DI_DA
30112a617e Fix: merge mistakes, others' login check 2024-04-17 10:22:31 +08:00
Zuosizhu
4486c8cff6 Merge branch 'LmeSzinc:master' into 20230309 2024-04-15 23:25:52 +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
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
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
65c826a70f Opt: Release nemu_ipc connection during wait 2024-04-08 05:23:14 +08:00
LmeSzinc
2a74c338a3 Opt: Limit screenshot and control combinations when using nemu_ipc 2024-04-08 04:32:33 +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
LA-DI-DA
c45954c4b0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 
# Conflicts:
#	module/device/device.py
 2023-12-23 11:07:19 +08:00
Zuosizhu
bb50753c29 Merge branch 'master_lme' 
# Conflicts:
#	module/device/device.py
 2023-12-16 00:39:48 +08:00
LmeSzinc
10486b8b60 Dev: [ALAS] Show function calls on errors 2023-12-14 21:21:40 +08:00
LmeSzinc
208a6e9b61 Refactor: Use collections.Counter instead of poor implementation 2023-12-07 02:22:42 +08:00
LA-DI-DA
09f4a227bb Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/task.yaml
 2023-09-23 22:30:37 +08:00
LmeSzinc
4e6f51ed7c Sync: [SRC] Emulator settings 2023-09-10 15:04:32 +08:00
LmeSzinc
f80bd61562 Merge branch 'master' into feature 
# Conflicts:
#	module/config/i18n/zh-TW.json
 2023-08-28 18:12:08 +08:00
LA-DI-DA
43d7323bb7 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-08-11 18:24:40 +08:00
LmeSzinc
b40850200b Fix: Raise error if app_keep_alive is enabled in MuMu 12 2023-08-05 17:56:31 +08:00
LA-DI-DA
8974c229a3 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-08-04 18:22:15 +08:00
LmeSzinc
a53f6cf9e7 Fix: Temp fix for MuMu 12 before DroidCast updated (#2952) 2023-08-03 00:17:31 +08:00
LA-DI-DA
1bcf997e40 Extend the timeout period of non-combat continuous screenshots 2023-07-17 22:09:07 +08:00
LmeSzinc
c46feef6e8 Add: Auto start emulators 2023-04-25 23:51:54 +08:00
LmeSzinc
89d3d82925 Merge branch 'master' into feature 2023-04-12 13:01:56 +08:00