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 |
|
LmeSzinc
|
3eaac0999f
|
Fix: No compress in u2.dump_hierarchy
Donno why setting compressed=True may drop resource-id of nodes
|
2025-03-25 11:55:20 +08:00 |
|
LA_DI_DA
|
93b7a2f54b
|
fix: add adc_push timeout parameter to avoid timeout
|
2025-03-21 20:11:57 +08:00 |
|
LmeSzinc
|
6c7afee2ed
|
Fix: [ALAS] netcat loopback address on MuMu Pro
|
2025-03-19 16:41:41 +08:00 |
|
LmeSzinc
|
477f917262
|
Refactor: deep methods reworked for better performance
|
2025-03-17 01:39:06 +08:00 |
|
ZuoSiZhu
|
39c18d8103
|
Merge remote-tracking branch 'lme/master' into dev
# Conflicts:
# deploy/AidLux/0.92/requirements.txt
# module/campaign/campaign_event.py
# module/os/map.py
# module/os_ash/ash.py
# module/webui/config.py
|
2025-02-28 11:01:23 +08:00 |
|
LmeSzinc
|
9e74c43c93
|
Fix: [ALAS] Don't redirect 5555 to MuMu serials on MAC as BlueStacks Air would use it
|
2025-02-28 02:05:06 +08:00 |
|
LmeSzinc
|
6c081fd855
|
Fix: [ALAS] Missing import due to in-file running
|
2025-02-23 03:23:14 +08:00 |
|
LA_DI_DA
|
5deca96c05
|
add: builder of AzurLaneConfig and Device
|
2025-02-14 14:15:57 +08:00 |
|
LmeSzinc
|
2d9556d21b
|
Fix: [ALAS] Emulator tree-killed when Alas gets killed
|
2025-02-12 01:41:03 +08:00 |
|
LmeSzinc
|
3dc3e7682b
|
Fix: [ALAS] netcat loopback address on BlueStacks Air
|
2025-02-01 00:14:12 +08:00 |
|
xhqss
|
2ddc7fff1c
|
Merge branch 'master_lme'
# Conflicts:
# module/campaign/gems_farming.py
# module/config/config_manual.py
# module/handler/assets.py
# module/retire/retirement.py
# module/tactical/tactical_class.py
|
2025-01-16 08:52:42 +08:00 |
|
LmeSzinc
|
546f25d646
|
Chore: [ALAS] Directly mark nemuipc and ldopengl unavailable on non-Windows
|
2025-01-07 12:18:40 +08:00 |
|
LmeSzinc
|
38da2aba17
|
Fix: [ALAS] Patch to fix atx_agent_url on arm64-v8a
|
2025-01-07 11:35:20 +08:00 |
|