LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 16:59:28 +08:00
Code Activity
8,177 Commits 12 Branches 0 Tags
765eeed75461bfc375b3c069ed0fe660e558d4c2
Commit Graph

389 Commits

Author SHA1 Message Date
xhqss
765eeed754 Merge branch '20230309' into smallkai 2024-04-11 22:12:34 +08:00
Zuosizhu
49b4547270 Merge branch 'LmeSzinc:master' into 20230309 2024-04-11 19:07:51 +08:00
LmeSzinc
13f5c1a6b3 Fix: Deredundant emulator path in lowercase 2024-04-11 02:11:59 +08:00
Zuosizhu
898f69f097 Merge branch 'LmeSzinc:master' into 20230309 2024-04-10 23:18:34 +08:00
LmeSzinc
024b7f3143 Fix: ev_run_sync timeout now does not include std capturing 2024-04-10 21:28:44 +08:00
LmeSzinc
6726293edf Fix: Emulator name was "None" in string 2024-04-10 19:19:53 +08:00
LmeSzinc
190da3a1d0 Fix: Exe from registry may in lower case 2024-04-10 19:10:17 +08:00
Zuosizhu
7719d10bec Merge branch 'LmeSzinc:master' into nemu-ipc-update 2024-04-10 14:09:24 +08:00
LmeSzinc
0226dd5df3 Opt: Allow nemu_ipc to have a lower default screenshot interval 2024-04-10 13:55:02 +08:00
LmeSzinc
76e148f860 Fix: Auto redirect MuMu12 from 127.0.0.1:7555 to 127.0.0.1:16xxx 2024-04-10 13:47:12 +08:00
Zuosizhu
69aebdcf30 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	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/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py
 2024-04-10 12:22:40 +08:00
LmeSzinc
e34b19d625 Fix: duped std was opened twice 2024-04-09 21:28:20 +08:00
LmeSzinc
840014f039 Fix: [ALAS] DroidCast image orientation on MuMu12 2024-04-09 00:35:56 +08:00
LmeSzinc
22618fe46c Fix: Failed to init nemu_ipc on empty emulator path (#3616) 2024-04-08 22:04:33 +08:00
LmeSzinc
6bae27cacc Fix: File descriptor leak in nested CaptureNemuIpc call 2024-04-08 21:56:23 +08:00
LmeSzinc
65c826a70f Opt: Release nemu_ipc connection during wait 2024-04-08 05:23:14 +08:00
LmeSzinc
5623f10ee6 Opt: [ALAS] Brute force connect if auto didn't find any emulators 2024-04-08 05:08:47 +08:00
LmeSzinc
2a74c338a3 Opt: Limit screenshot and control combinations when using nemu_ipc 2024-04-08 04:32:33 +08:00
LmeSzinc
2ebe71b774 Add: NemuIpc method 2024-04-08 04:04:35 +08:00
LmeSzinc
2e81cb7dc1 Add: Click method nemu_ipc 2024-04-08 03:14:33 +08:00
LA_DI_DA
8a2d536260 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/ui/page.py
 2024-03-29 21:14:59 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
54f06bc91e Add: nemu_ipc screenshot and control proxy 2024-03-28 21:41:53 +08:00
LmeSzinc
ad766df910 Chore: [ALAS] Cache prop nemud.app_keep_alive 2024-03-28 19:17:16 +08:00
LmeSzinc
71318a3228 Chore: [ALAS] Expose one Platform class 2024-03-28 19:17:16 +08:00
LmeSzinc
a144908e14 Add: [ALAS] Auto emulator start 2024-03-28 19:17:14 +08:00
LmeSzinc
06cd62f3ee Opt: [ALAS] Reuse image array to improve memory performance 2024-03-21 21:35:51 +08:00
LmeSzinc
6a23f82e6c Fix: [ALAS] Enhance auto device detection, ignore 127.0.0.1:7555 from MuMu 12 2024-03-21 19:34:08 +08:00
LmeSzinc
f076ba12ed Add: [ALAS] Proxy element props 2024-03-16 16:02:07 +08:00
LA-DI-DA
0252b8bcc0 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-01-12 10:31:19 +08:00
Zuosizhu
79956f8b66 Merge branch 'master_lme' 2024-01-11 16:59:27 +08:00
LA-DI-DA
c921b04fe0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2024-01-02 23:06:15 +08:00
LmeSzinc
39f4c9cac4 Fix: [ALAS] Limit the length of screenshot deque 2024-01-01 22:17:06 +08:00
Zuosizhu
9934be19fe Merge branch 'master_lme' 
# Conflicts:
#	module/config/config.py
#	submodule/AlasFpyBridge/module/config/config.py
 2023-12-29 14:46:10 +08:00
SC23
17e41a8bff Fix: GUILD DISPATCH (#3392) 
* Fix_Gulid_DISPATCH

* Revert "Fix_Gulid_DISPATCH"

This reverts commit ba1f1f2ef5c3d56297f945e92ae2f73aaff8eb53.

* Fixed_Gulid_DISPATCH

* Fixed_GulidDISPATCH
 2023-12-29 09:47:30 +08:00
LA-DI-DA
c45954c4b0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 
# Conflicts:
#	module/device/device.py
 2023-12-23 11:07:19 +08:00
Zuosizhu
bb50753c29 Merge branch 'master_lme' 
# Conflicts:
#	module/device/device.py
 2023-12-16 00:39:48 +08:00
LmeSzinc
10486b8b60 Dev: [ALAS] Show function calls on errors 2023-12-14 21:21:40 +08:00
LmeSzinc
638ccb5c7c Fix: [ALAS] Retry check_mumu_app_keep_alive() 2023-12-09 18:09:34 +08:00
LmeSzinc
208a6e9b61 Refactor: Use collections.Counter instead of poor implementation 2023-12-07 02:22:42 +08:00
LA-DI-DA
1cbc141d10 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-10-12 19:43:57 +08:00
Zuosizhu
2cf5f53e02 Merge branch 'LmeSzinc:master' into 20230309 2023-10-07 16:55:17 +08:00
LA-DI-DA
4791bb378d Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-10-05 19:33:20 +08:00
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00
LA-DI-DA
d1f6154a31 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-10-01 15:27:45 +08:00
LmeSzinc
35c109a648 Fix: Revised serial should starts with 127 2023-10-01 01:51:22 +08:00
LmeSzinc
f6c56e1940 Fix: Log unexpected droidcast response 2023-09-30 17:04:36 +08:00
LA-DI-DA
e3db31de2e Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-09-30 16:50:09 +08:00
Zuosizhu
e59ae7d732 Fix: Droidcast_raw no longer has a separate apk. 2023-09-30 13:12:52 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme' 
# Conflicts:
#	module/device/method/droidcast.py
 2023-09-28 18:09:13 +08:00