1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 22:09:26 +08:00
Commit Graph

15 Commits

Author SHA1 Message Date
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
a144908e14 Add: [ALAS] Auto emulator start 2024-03-28 19:17:14 +08:00
LmeSzinc
0728f51b29 Refactor: Move easy install to deploy/Windows 2023-03-23 00:25:16 +08:00
LmeSzinc
e59c7f7fc0 Fix: Remove emulator calls before refactored 2023-01-09 00:16:48 +08:00
SarContDeli
6a4d3b5da5 Opt: Independent option to restart emulator daily 2022-12-01 15:20:14 +08:00
SarContDeli
7029375ca3 Fix: UnicodeDecodeError when getting serial 2022-10-17 22:09:58 +08:00
LmeSzinc
f1ef87ca50 Merge branch 'master' into dev
# Conflicts:
#	module/device/emulator.py
2022-09-02 00:13:11 +08:00
SarContDeli
ab9f6dfcc7 Fix: Unexpected None from detect_emulator(Fix #1580) 2022-08-31 11:25:27 +08:00
SarContDeli
e5d2bad60b Fix: Restart the emulator after startup timeout 2022-08-24 23:54:59 +08:00
SarContDeli
ac5466e5dc Upd: Modified some options for restart emulator 2022-08-17 20:22:11 +08:00
SarContDeli
0207dd2bcb Opt: Split task_kill() from emulator_kill() 2022-08-05 16:55:51 +08:00
SarContDeli
938b95a145 Fix: The emulator will also be shut down when closing Alas 2022-08-05 09:53:33 +08:00
SarContDeli
df26bc4e7a Opt: Refactored some code of emulator.py 2022-08-05 09:53:33 +08:00
SarContDeli
f1c78de429 Add: Emulator auto detect of Bluestacks 5 2022-08-05 09:53:31 +08:00
SarContDeli
3d6d777413 Add: Emulator auto detect and restart(experimental) 2022-08-05 09:53:28 +08:00