LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 07:29:26 +08:00
Code Activity
7,955 Commits 12 Branches 0 Tags
4486c8cff60c95ef3d3f85da3bc65d4a337eb8a4
Commit Graph

182 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
176c77230e Add: New installer but never used 2024-04-08 04:50:19 +08:00
LmeSzinc
a144908e14 Add: [ALAS] Auto emulator start 2024-03-28 19:17:14 +08:00
Zuosizhu
1e70cabadf Merge branch 'master_lme' 
# Conflicts:
#	deploy/alas.py
 2024-01-31 09:13:04 +08:00
LmeSzinc
d854d876d9 Fix: Handle win32com import error 2024-01-30 00:20:16 +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
霞飛
c81f619579 fix: lock jellyfish version to 0.11.2 (#3384) 
* fix: lock jellyfish version to 0.11.2

* chore: remove index url
 2023-12-29 00:14:11 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-26 00:04:07 +08:00
LmeSzinc
0bbfea6bd0 Fix: Remove lock files before git reset 2023-10-23 22:24:58 +08:00
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00
LmeSzinc
b91bf31bc3 Fix: Update check fallback to classic git pull if git-over-cdn fails (#3164) 2023-10-01 00:34:02 +08:00
Zuosizhu
7bc96058c8 Merge branch 'master_lme' 
# Conflicts:
#	deploy/Windows/config.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
 2023-09-20 18:52:47 +08:00
LmeSzinc
1b9fd01852 Add: git-over-cdn 2023-09-19 23:14:37 +08:00
LmeSzinc
4ce8bd0edb Sync: [SRC] Sync alas changes 2023-09-10 15:04:32 +08:00
LmeSzinc
bece5f291a Fix: webui.config.DeployConfig caught setattr from father class 2023-09-10 14:55:05 +08:00
LmeSzinc
4b17eefc08 Add: Deploy setting AppAsarUpdate 2023-09-09 20:03:28 +08:00
LmeSzinc
4a95415837 Fix: Chinese encoding on launcher 2023-09-09 04:02:22 +08:00
LmeSzinc
8f47eb3687 Opt: UI styles to follow PSD designs 2023-09-09 04:02:19 +08:00
LmeSzinc
46cc21fe6b Merge branch 'master' into feature 
# Conflicts:
#	module/daemon/uncensored.py
 2023-07-02 17:03:36 +08:00
霞飛
d73ec47031 feat: headless environment support (#2782) 
* chore(linux): config template for Linux

* feat: Linux configuration template updater

* feat: headless requirements updater

* chore: Sorted by dictionary order

* chore: Remove useless dependencies.

* chore: remove cache operation.
 2023-06-24 19:09:24 +08:00
霞飛
9577912b06 chore(Linux): Headless dependences for several Python environments (#2779) 
* fix: Locking bullseye version when using CN source

* chore: add headless requeirements
 2023-06-18 22:05:43 +08:00
LmeSzinc
093a6efba0 Merge branch 'dev' into feature 
# Conflicts:
#	module/config/argument/task.yaml
 2023-06-17 22:19:05 +08:00
LmeSzinc
25bba21406 Add: Installer progress, now all functional 2023-06-12 01:10:54 +08:00
LmeSzinc
1f0a6bc700 Fix: Dependency version ends with .0 2023-06-12 00:53:17 +08:00
LmeSzinc
ea1e06e4c7 Fix: Launcher killing itself 2023-06-12 00:49:28 +08:00
LmeSzinc
ab8c24c2ed Merge branch 'master' into feature 2023-06-12 00:43:49 +08:00
LmeSzinc
82a9506214 Upd: [CN] Git mirrors 2023-06-04 18:14:28 +08:00
LmeSzinc
90c6ddc8c7 Upd: [CN] Git mirrors 2023-06-04 17:15:43 +08:00
LmeSzinc
593698c526 Upd: [CN] Git mirrors 2023-06-04 02:44:24 +08:00
LmeSzinc
5076bcca2d Fix: Limit trials to kill existing Alas 2023-06-01 22:27:18 +08:00
LmeSzinc
b14b9af392 Merge branch 'master' into feature 2023-05-07 21:36:38 +08:00
LmeSzinc
d57bab9d26 Fix: Patch to remove apkutils2 imports 2023-05-07 21:26:46 +08:00
LmeSzinc
4e58757ff8 Fix: Remove master.lock or it will stuck git reset 2023-05-07 21:20:18 +08:00
LmeSzinc
1042c8b8f8 Dep: Use imageio==2.27.0 (fixed #2540) 2023-05-07 21:15:01 +08:00
LmeSzinc
ea9b198205 Merge branch 'master' into feature 2023-04-28 01:15:50 +08:00
LmeSzinc
1befc42836 Opt: Rename emulator modules and improve log appearance 2023-04-25 23:20:41 +08:00
Cyrus
2116c1e249 Fix: preventing updates in Docker (#2516) 
Fix git ERROR: detected dubious ownership in repository at '/app/AzurLaneAutoScript'
 2023-04-22 19:27:07 +08:00
guoh064
c85e69f0ce Fix: Change LOGIN_ANNOUNCE to MAINTENANCE_ANNOUNCE in ui_additional (#2509) 
* Add: Handle LOGIN_ANNOUNCE in ui_additional

* Fix: Handle MAINTENANCE_ANNOUNCE in ui_additioal
 2023-04-21 00:50:59 +08:00
LmeSzinc
cccd1b4545 Merge branch 'master' into feature 
# Conflicts:
#	deploy/AidLux/requirements_generator.py
#	deploy/Windows/logger.py
#	deploy/docker/requirements_generator.py
#	deploy/installer.py
#	deploy/patch.py
 2023-04-20 00:17:03 +08:00
LmeSzinc
2f0382c46d Opt: abspath in appdir of uiautomator2 cache 2023-04-19 22:58:22 +08:00
LmeSzinc
65cfec9821 Fix: Remove .git/HEAD.lock 2023-04-19 22:24:08 +08:00
LmeSzinc
7a16b71e08 Opt: Use local assets cache in uiautomator2 2023-04-19 22:24:08 +08:00
LmeSzinc
631fec2ad8 Dep: Upgrade to uiautomator2cache==0.3.0.1 2023-04-19 22:24:08 +08:00
LmeSzinc
343520cce7 Dep: Add uiautomator2cache 2023-04-19 22:24:04 +08:00
LmeSzinc
a216b4dd0c Dep: Upgrade to uiautomator2cache==0.3.0.1 2023-04-19 12:53:36 +08:00
LmeSzinc
2b1dd73277 Add: installer.py as the entrance of AlasApp installation 2023-04-19 12:51:04 +08:00
LmeSzinc
f286fd4b39 Opt: Keywords in app_update() to determine hot updates 2023-04-18 21:32:47 +08:00
LmeSzinc
58022435fd Add: installer test prints 2023-04-11 23:12:00 +08:00
LmeSzinc
11595208af Fix: No process cache since it's fast already 2023-04-04 01:17:09 +08:00
LmeSzinc
b98f713bb1 Opt: Faster iter_process() 2023-04-01 23:59:59 +08:00