LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 22:19:26 +08:00
Code Activity
8,621 Commits 12 Branches 0 Tags
185af2808f41b6329bb7bd034600ef1dfeb9eae9
Commit Graph

467 Commits

Author SHA1 Message Date
LA_DI_DA
a12a831419 Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	alas.py
 2024-07-18 23:12:53 +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
Jose Suarez
746e511f82 Fix BlueStacks_nxt emulator auto-run (#3987) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-07-12 18:49:03 +08:00
LmeSzinc
4135210550 Fix: brute_force_connect is called on non-windows 2024-07-12 12:42:14 +08:00
ReLU
fceeff25e0 Merge remote-tracking branch 'upstream/master' into dev 2024-07-12 03:54:22 +08:00
LmeSzinc
834ef85cdb Fix: is_mumu_over_version_356 is True on mumu mac 2024-07-12 02:08:02 +08:00
LmeSzinc
6064457620 Chore: [ALAS] Abstract platform condition 2024-07-12 01:05:58 +08:00
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
Zuosizhu
1e31cb6de5 Merge branch 'master_lme' into AlasGGdev 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py
 2024-06-28 16:01:16 +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
PPPlatelet
a2312c5498 Opt: Add start/stop LDPlayer,NoxPlayer,BlueStack4,MEmuPlayer support. (#3867) 
* Opt: Add start/stop LDPlayer,NoxPlayer,BlueStack4,MEmuPlayer support.

* Upd: fixed.

* fix

* Upd: Bug fix.

* Upd: fix

* Upd: Add single_to_console method.

* Upd: fix texts.

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-06-26 12:41:38 +08:00
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/os/fleet.py
 2024-06-22 20:31:35 +08:00
LmeSzinc
4c98442422 Fix: [ALAS] Handle psutil.NoSuchProcess 2024-06-11 19:13:55 +08:00
LmeSzinc
dad0e0e963 Pref: Try nc command on android phones first 2024-06-07 16:21:14 +08:00
LmeSzinc
91fb329f96 Fix: More fool-proof serial input redirection 2024-06-07 16:12:35 +08:00
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