LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 15:19:28 +08:00
Code Activity
7,580 Commits 12 Branches 0 Tags
79e449a258d2cc20eb8e23e1c95b2d930c8454bb
Commit Graph

317 Commits

Author SHA1 Message Date
LA_DI_DA
8368cce3fb Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
 2023-09-03 19:13:52 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	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/webui/app.py
 2023-09-02 17:47:24 +08:00
LmeSzinc
8987c9253b Add: Disable multi-instances on phone cloud environment 2023-08-28 17:30:46 +08:00
LmeSzinc
ae8172e580 Fix: Revise serial as fool-proof 2023-08-28 00:03:41 +08:00
LmeSzinc
a06061c2c5 Fix: Handle serial startswith "127.0.0.1." as a fool-proof 2023-08-23 12:39:30 +08:00
LA-DI-DA
43d7323bb7 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-08-11 18:24:40 +08:00
Zuosizhu
72730a4147 Merge branch 'LmeSzinc:master' into 20230309 2023-08-08 20:40:20 +08:00
LmeSzinc
b40850200b Fix: Raise error if app_keep_alive is enabled in MuMu 12 2023-08-05 17:56:31 +08:00
LmeSzinc
98a29c88cd Fix: Disconnected the wrong offline device 2023-08-05 17:55:20 +08:00
LA-DI-DA
8974c229a3 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-08-04 18:22:15 +08:00
Zuosizhu
c22157a548 Merge branch 'LmeSzinc:master' into 20230309 2023-08-04 00:20:16 +08:00
LmeSzinc
a53f6cf9e7 Fix: Temp fix for MuMu 12 before DroidCast updated (#2952) 2023-08-03 00:17:31 +08:00
LmeSzinc
33bcd116a8 Fix: No orientation handle in MaaTouch 2023-08-01 19:28:36 +08:00
LA-DI-DA
1bcf997e40 Extend the timeout period of non-combat continuous screenshots 2023-07-17 22:09:07 +08:00
LA-DI-DA
84b2dde422 Merge branch 'wait' into smallkai 
# Conflicts:
#	README.md
#	alas.py
#	assets/cn/gg_handler/BUTTON_GG_ENTER_POS.png
#	assets/cn/gg_handler/BUTTON_GG_TAB_SEARCH_POS.png
#	assets/gui/css/alas.css
#	config/template.json
#	module/campaign/assets.py
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/task.yaml
#	module/config/config_updater.py
#	module/config/i18n/ja-JP.json
#	module/log_res/log_res.py
 2023-07-17 18:45:43 +08:00
LA-DI-DA
bbcd8c898d Merge branch 'lme-alas/master' into wait 2023-06-11 22:45:14 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
LmeSzinc
f18a7b1828 Add: Support BlueStacks Hyper-V Android 11 (Rvc64) 2023-06-09 00:26:22 +08:00
LA-DI-DA
b7a11837e1 Merge branch 'lme-alas/master' into wait 2023-06-04 00:05:54 +08:00
Zuosizhu
b308b65cde Merge branch 'LmeSzinc:master' into 20230309 2023-06-02 03:55:50 +08:00
LmeSzinc
18cba1f9d0 Chore: Remove the use of np.int 2023-05-30 10:28:51 +08:00
LA-DI-DA
2f63c37a9c Merge branch 'lme-alas/master' into wait 
# Conflicts:
#	README.md
 2023-05-28 00:00:38 +08:00
Zuosizhu
bd04ff6708 Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-05-27 23:48:02 +08:00
LmeSzinc
8ceb15dafc Add: [CN] Channel server com.bilibili.blhx.dl 2023-05-27 22:46:30 +08:00
Zuosizhu
987423a96f Merge branch 'LmeSzinc:master' into 20230309 2023-05-27 20:30:22 +08:00
LmeSzinc
f98137108f Fix: Exact match instead of keywords to ignore random package names 2023-05-26 11:55:09 +08:00
Zuosizhu
72e5e200ed Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-05-26 00:26:23 +08:00
LA-DI-DA
e67a4c3cca Merge branch 'lme-alas/master' into wait 
# Conflicts:
#	README.md
 2023-05-25 23:25:07 +08:00
Zuosizhu
dba6d7e4e4 Merge branch 'LmeSzinc:master' into 20230309 2023-05-25 13:54:56 +08:00
LmeSzinc
3a9db10d70 Fix: Handle bugs in adbutils>=1.0 2023-05-23 00:09:39 +08:00
LmeSzinc
250145fd7f Fix: Prevent MaaTouch stream from being deleted 2023-05-23 00:09:25 +08:00
LmeSzinc
f59ac5885f Fix: Compatible with old and new adbutils 2023-05-16 23:41:00 +08:00
Zuosizhu
b5ac3cc06a Merge branch 'LmeSzinc:master' into 20230309 2023-04-07 15:46:07 +08:00
LA-DI-DA
cfa850a77d Merge branch 'lme-master' into wait 2023-04-04 20:57:11 +08:00
LmeSzinc
eb8c948198 Opt: Screenshot method fallback to auto if ascreencap unavailable 2023-04-04 03:07:12 +08:00
Zuosizhu
32c09b1e0a Merge branch 'master_lme' 2023-04-03 09:32:47 +08:00
LA-DI-DA
ecc488e76c Merge branch 'LmeSzinc:master' into wait 2023-03-31 13:20:23 +08:00
LmeSzinc
e295f08811 Fix: Missing init() call in uiautomator2 retries (#2424) 2023-03-31 00:48:35 +08:00
0O0o0oOoO00
ec8cefb4ae Merge pull request from 0O0o0oOoO00 
Screenshot interval change
 2023-03-26 17:21:08 +08:00
Zuosizhu
2728b60d28 Merge branch 'LmeSzinc:master' into master 2023-03-09 00:54:24 +08:00
xausky
6c6511db60 Fix: Fix lanuch game in no physical keys device 2023-03-05 12:04:32 +08:00
Zuosizhu
9c91fe2e59 Merge branch 'LmeSzinc:master' into master 2023-03-01 18:54:34 +08:00
LmeSzinc
61f2f4013d Fix: Handle empty cmdline in proc_list_uiautomator2() 2023-03-01 18:13:49 +08:00
Zuosizhu
a94d7b58a5 Merge branch 'master_lme' 
# Conflicts:
#	module/ui/ui.py
 2023-02-26 17:35:50 +08:00
LmeSzinc
19784c7a14 Fix: Handle chinese ： in serial 2023-02-26 01:18:50 +08:00
Zuosizhu
b072baa596 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	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/retire/retirement.py
 2023-02-20 12:35:43 +08:00
LmeSzinc
d94cf3f2e0 Fix: Disconnect offline devices before connecting 2023-02-19 20:42:34 +08:00
Zuosizhu
9bd33e15a0 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	module/config/i18n/ja-JP.json
 2023-02-17 03:01:04 +08:00
LmeSzinc
4866862652 Fix: Accept first 720x1280 screenshots 2023-02-16 21:15:14 +08:00
LmeSzinc
9861cbd449 Opt: No screenshot timer prints (#2051) 2023-02-16 21:12:41 +08:00