LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 14:39:25 +08:00
Code Activity
10,175 Commits 12 Branches 0 Tags
d86d75735869ea2bc23a6548c6f4e040256c380d
Commit Graph

587 Commits

Author SHA1 Message Date
xhqss
a5dc9328c9 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/os_shop/shop.py
 2025-12-19 15:13:21 +08:00
LmeSzinc
90e438e75e Fix: [ALAS] Add retry on first nemuipc connect 2025-12-19 00:20:12 +08:00
xhqss
4137ff807c Merge branch 'master_lme' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/map/assets.py
#	module/shop/shop_reward.py
#	module/ui/assets.py
 2025-10-24 11:10:21 +08:00
LmeSzinc
6abe794e37 Fix: [ALAS] MuMuPlayer12 failing to close as expected 2025-10-23 23:31:46 +08:00
LmeSzinc
2cd83c683d Opt: [ALAS] Faster RGB565 to RGB888 2025-10-23 23:31:45 +08:00
LmeSzinc
d4142afa22 Refactor: Timer class 2025-10-22 01:09:45 +08:00
Zuosizhu
31c99d8953 Merge remote-tracking branch 'Lme/master' into dev 
# Conflicts:
#	module/campaign/os_run.py
#	module/config/argument/args.json
#	module/os/operation_siren.py
#	module/retire/assets.py
#	module/shop/shop_reward.py
#	module/shop/ui.py
#	module/ui/assets.py
 2025-10-12 11:28:13 +08:00
LmeSzinc
c0f6c52597 Fix: reverted local remote in _adb_reverse_transport (#5200) 2025-10-11 00:54:31 +08:00
LmeSzinc
f9eff1fe2d Fix: [ALAS] adb reverse 2025-10-09 18:10:49 +08:00
LmeSzinc
56f832e533 Fix: Fallback nemu_ipc and ldopengl if not running on windows 2025-09-23 01:37:09 +08:00
0O0o0oOoO00
f65933e89a Merge branch 'Lme/master' into dev 
# Conflicts:
#	README.md
#	module/config/argument/args.json
 2025-09-13 23:04:47 +08:00
LmeSzinc
8f79452fd3 Fix: [ALAS] Handle copy-pasted serial 5555,16384 to be fool-proof 2025-09-13 20:25:58 +08:00
LmeSzinc
327eb2f9b9 Fix: [ALAS] BlueStacks Air serial auto increase from 127.0.0.1:5555 + 10*n 2025-09-08 23:37:45 +08:00
0O0o0oOoO00
f96b13fea2 Merge branch 'Lme/master' into dev 
# Conflicts:
#	assets/cn/campaign/EVENT_20221124_ENTRANCE.png
#	campaign/event_20221124_cn/campaign_base.py
#	module/campaign/assets.py
#	module/config/argument/override.yaml
#	module/config/config_updater.py
#	module/retire/assets.py
#	module/shop/shop_reward.py
 2025-08-16 14:24:45 +08:00
LmeSzinc
c5f3afbf9a Fix: [ALAS] Handle copy-pasted serial 5555,16384 to be fool-proof 2025-08-11 12:45:07 +08:00
LmeSzinc
9f721033a8 Fix: [ALAS] Handle upside-down emulator in ldopengl screenshot 2025-08-11 12:37:59 +08:00
dragonheart107
a8f1110bbf Fix: nemu_ipc for global MuMu 
Fix: nemu_ipc for global MuMu
 2025-08-10 17:47:04 +08:00
Zuosizhu
b8d12c405f Merge branch 'master_lme' into brocore_dev 
# Conflicts:
#	config/template.json
#	module/awaken/awaken.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/menu.json
#	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
 2025-07-25 11:46:23 +08:00
LmeSzinc
09a3727166 Fix: [ALAS] Worker might graceful exited after killing 
it cleaned up itself, so main thread can't delete it
 2025-07-17 22:38:27 +08:00
LmeSzinc
bd73e038cf Fix: [ALAS] remove warnings from multiscreen devices 2025-07-17 22:38:17 +08:00
Zuosizhu
de303b492e Merge branch 'master_lme' into brocore_dev 
# Conflicts:
#	module/config/argument/override.yaml
#	module/research/selector.py
#	module/ui/ui.py
#	module/webui/app.py
 2025-07-11 23:03:05 +08:00
LmeSzinc
77569a4532 Fix: find_emulator_instance may return None 2025-07-11 22:05:37 +08:00
LmeSzinc
532e4c2eee Merge branch 'bug_fix' into dev 2025-07-11 00:14:29 +08:00
LmeSzinc
98501877ee Pref: [ALAS] Avoid global importing lz4 2025-07-04 20:34:21 +08:00
LmeSzinc
1764aef553 Fix: [ALAS] nemuipc lib might be None 2025-07-04 19:51:32 +08:00
LmeSzinc
ee6f360901 Fix: [ALAS] Handle JobTimeout at the nemu ipc connection trials 2025-07-03 22:59:22 +08:00
nEEtdo0d
b85b47d67c Merge branch 'master' into dev 2025-06-28 16:11:37 -04:00
0O0o0oOoO00
171520adfb Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/ui/ui.py
 2025-06-28 23:09:47 +08:00
LmeSzinc
d4f1a44d20 Pref: no copy of scrcpy screenshots 2025-06-26 01:09:56 +08:00
LmeSzinc
3f49aa47ad Fix: [ALAS] ascreencap returns read-only images 2025-06-24 23:29:18 +08:00
0O0o0oOoO00
f64bc96bb2 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	config/deploy.template-AidLux-cn.yaml
#	config/deploy.template-AidLux.yaml
#	config/deploy.template-cn.yaml
#	config/deploy.template-docker-cn.yaml
#	config/deploy.template-docker.yaml
#	config/deploy.template-linux-cn.yaml
#	config/deploy.template-linux.yaml
#	config/deploy.template.yaml
 2025-06-17 13:19:30 +08:00
nEEtdo0d
64c5b5e30f Merge branch 'master' into dev 2025-06-15 16:59:21 -04:00
LmeSzinc
3b4ac53d6c Fix: [ALAS] Ignore errors in brute force connect 2025-06-14 01:16:09 +08:00
LmeSzinc
b2724dca64 Fix: [ALAS] Add notice to disable network bridging 2025-06-14 01:10:22 +08:00
LmeSzinc
c15bce0ab5 Pref: [ALAS] Replace ThreadPoolExecutor with alas threadpool 2025-06-14 00:44:57 +08:00
LmeSzinc
eb084ed591 Fix: [ALAS] Match 7555 in vbox config with MuMu instance_id 2025-06-14 00:18:56 +08:00
LmeSzinc
ac3ce726a5 Add: [ALAS] Support MuMuPlayer12 5.0 2025-06-14 00:18:56 +08:00
LmeSzinc
d7d729e198 Fix: handle empty rows from "ldconsole.exe list2" (#4846) 2025-06-05 16:20:45 +08:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev 
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	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/handler/login.py
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
 2025-05-21 04:17:08 +08:00
LmeSzinc
79d72c4fa0 Merge branch 'master' into dev 
# Conflicts:
#	module/device/method/pool.py
 2025-05-18 03:15:41 +08:00
LmeSzinc
2a31b6a10a Fix: [ALAS] Remove render errors on waydroid 2025-05-13 21:44:35 +08:00
LmeSzinc
ae04093727 Fix: [ALAS] Inconsistent result for nemu_ipc_available and nemu_ipc 2025-05-04 22:17:20 +08:00
LmeSzinc
f6c106106c Fix: [ALAS] Various race condition in thread pool 2025-05-02 00:56:26 +08:00
LmeSzinc
31905ce946 Sync: [ALAS] thread pool 2025-04-26 18:55:48 +08:00
LA-DI-DA
62c33f27e0 Merge the remaining functions in MoreAlas 2025-04-24 23:30:50 +08:00
silvergundam
73eaab8ace Merge remote-tracking branch 'lme/master' into dev 2025-04-03 11:57:44 +08:00
LmeSzinc
19db66157e Fix: Wait emulator-* devices appear after reconnect 2025-04-01 01:04:27 +08:00
LmeSzinc
e917cbd47f Fix: Handle AdbError(rest) after granted root access 2025-04-01 01:04:27 +08:00
ZuoSiZhu
58a217d98f Merge branch 'master_lme' into dev 
# Conflicts:
#	module/webui/app.py
#	module/webui/config.py
 2025-03-28 00:23:16 +08:00
LmeSzinc
6dfe9204c4 Chore: Abstract app_current() 2025-03-25 11:55:39 +08:00