LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 01:29:24 +08:00
Code Activity
9,160 Commits 12 Branches 0 Tags
f4fdde02285df90df41dceec05bfb5bb6d05b404
Commit Graph

212 Commits

Author SHA1 Message Date
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
6c081fd855 Fix: [ALAS] Missing import due to in-file running 2025-02-23 03:23:14 +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
LmeSzinc
3d112b4c6c Opt: [ALAS] Dynamically extends nemu_ipc timeout on retries for slow PCs 2024-12-27 23:45:00 +08:00
LmeSzinc
a6f81729e5 Refactor: [ALAS] Use trio-like thread pool in nemu_ipc instead of asyncio.run_in_executor() 2024-12-27 23:39:58 +08:00
LA_DI_DA
2dd2e37bef Merge branch 'refs/heads/dev' 2024-10-27 18:32:44 +08:00
LA_DI_DA
a2e6986dcd Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
 2024-10-25 12:01:29 +08:00
LmeSzinc
1ca4f6388a Fix: [ALAS] Missing wait after down event 2024-10-10 22:13:47 +08:00
LmeSzinc
f45c21f250 Fix: [ALAS] Skip trying ldopengl if it is not a LDPlayer 2024-09-29 12:10:33 +08:00
LmeSzinc
f95f51b165 Fix: Update ldopengl minimal version 
Signed-off-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2024-09-23 19:05:58 +08:00
LA_DI_DA
adba220e19 Merge branch 'refs/heads/dev' 2024-09-15 18:08:11 +08:00
LA_DI_DA
15dbb46cc3 Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/exercise/combat.py
#	module/os/map.py
 2024-09-15 18:06:15 +08:00
LmeSzinc
afb6015286 Opt: [ALAS] Skip trying nemu_ipc on MuMu Global 2024-09-15 02:42:12 +08:00
LmeSzinc
67ae28ac61 Fix: Get info after loading DLL, so DLL existence can act as a version check 2024-09-14 22:27:03 +08:00
LA_DI_DA
a9afa5487a Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/webui/app.py
 2024-09-13 23:09:32 +08:00
xhqss
48ba0f043e Merge branch 'master_lme' 
# Conflicts:
#	module/webui/app.py
 2024-09-13 20:17:43 +08:00
SarContDeli
aa79cc05dd Upd: improve ldopengl performance (#4173) 2024-09-12 22:26:17 +08:00
xhqss
9c6eee6335 Merge branch 'master_lme' 2024-09-11 20:45:36 +08:00
LmeSzinc
e1bb483aaa Fix: [ALAS] Limit pool size when using run_in_executor() 2024-09-10 01:14:15 +08:00
SarContDeli
7c574ceaf5 Fix: ldopengl screenshot reverse color (#4136) 2024-08-31 10:59:44 +08:00
LA_DI_DA
f490410411 Merge branch 'refs/heads/dev' 
# Conflicts:
#	bin/Lua/ShipChanger.lua
#	module/config/argument/args.json
#	module/device/screenshot.py
 2024-08-17 22:02:06 +08:00
LA_DI_DA
89be3580ec Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/ui/page.py
 2024-08-17 21:48:52 +08:00
xhqss
14d1b739f3 Fix:Missing s in the directory of customer config,json 2024-08-17 13:35:27 +08:00
LmeSzinc
c98f2dc825 Fix: Missing s in the directory of customer_config.json 2024-08-17 03:16:15 +08:00
xhqss
eb83dcb403 Merge branch 'master_lme' 2024-08-17 02:54:22 +08:00
LmeSzinc
d1b41367cb Fix: Check app keep alive on mumu >= 4.0 2024-08-17 00:29:55 +08:00
xhqss
b7cc5db354 Merge branch 'refs/heads/master_lme' 2024-08-12 02:47:51 +08:00
LmeSzinc
886736de45 Fix: [ALAS] Launch parameters on waydroid (#4000) 2024-08-11 00:45:00 +08:00
LmeSzinc
9c7f2fcb7d Fix: [ALAS] Handle empty getprop on mumu12 >= 4.0 2024-08-10 23:56:29 +08:00
LmeSzinc
360bfa0474 Refactor: [ALAS] app_start_uiautomator2 to be the same as adb 2024-08-10 22:16:58 +08:00
LmeSzinc
342f444164 Fix: [ALAS] Catch Permission Denial on am start 2024-08-02 02:44:11 +08:00
LmeSzinc
debbbdae96 Refactor: [ALAS] Launch app with activity name 2024-08-01 23:26:56 +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
Zuosizhu
1d85336ba4 Merge remote-tracking branch 'refs/remotes/Lme/master' into dev 
# Conflicts:
#	module/device/method/adb.py
#	module/device/screenshot.py
 2024-07-26 08:04:44 +08:00
LmeSzinc
ff3971b023 Fix: ctypes.WINFUNCTYPE is called on non-Windows 2024-07-25 12:14:49 +08:00
LmeSzinc
200a5116ce Fix: Keep IScreenShotClass_Cap referenced 2024-07-25 02:16:38 +08:00
LmeSzinc
acbd5536bb Fix: FileNotFoundError wasn't handled 2024-07-25 02:16:38 +08:00
LmeSzinc
b285beed2b Add: [ALAS] Add screenshot method ldopengl 2024-07-25 00:12:50 +08:00
LmeSzinc
13fed12ff6 Fix: [ALAS] Handle dynamic mumu serial in serial_to_id 2024-07-24 23:18:01 +08:00
LmeSzinc
44b623c06c Fix: [ALAS] Trying to handle AdbError: unknown host service 
(cherry picked from commit 59ad8bd6fcd4b63ab9a557b1bd11aa92fb071e13)
 2024-07-24 00:34:50 +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
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
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
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