LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 07:49:26 +08:00
Code Activity
8,659 Commits 12 Branches 0 Tags
feature/plugin
Commit Graph

204 Commits

Author SHA1 Message Date
LA_DI_DA
9b7852478a Fix: maa submodule 2024-08-04 17:26:57 +08:00
LA_DI_DA
2279296b69 Fix: use port 22267 for webui rather than 22367 2024-06-29 00:32:39 +08:00
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/os/fleet.py
 2024-06-22 20:31:35 +08:00
LmeSzinc
4c98442422 Fix: [ALAS] Handle psutil.NoSuchProcess 2024-06-11 19:13:55 +08:00
LmeSzinc
ab27a00125 Fix: Ignore device that getprop is unavailable 2024-06-07 09:16:24 +08:00
xhqss
c0c4913353 Merge branch '20230309' into smallkai 
# Conflicts:
#	module/config/i18n/zh-CN.json
 2024-05-23 08:25:21 +08:00
Zuosizhu
ddcfbb0a97 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	deploy/adb.py
#	deploy/pip.py
#	module/daily/equipment.py
 2024-05-23 02:31:29 +08:00
LmeSzinc
bf3a08b446 Fix: Use adb, git, python in system if the one in deploy.yaml doesn't exists 2024-05-19 23:20:33 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
 2024-04-27 15:56:34 +08:00
Zuosizhu
8fd3c7eedd Merge branch 'master_lme_to_merge' 
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
 2024-04-27 13:00:39 +08:00
LmeSzinc
df3d61d2d6 Fix: Missing config_redirect() call in classic installer 2024-04-26 14:14:18 +08:00
Zuosizhu
055720dd52 Merge branch 'master_lme' 
# Conflicts:
#	deploy/config.py
 2024-04-26 03:18:16 +08:00
LmeSzinc
a4f8bde695 Merge branch 'master' into dev 2024-04-23 01:13:02 +08:00
LmeSzinc
c9950983d5 Dep: Downgrade to pycryptodome==3.9.9 since old pip cannot download the wheels >=3.10 2024-04-23 01:12:15 +08:00
LmeSzinc
ccf51f6829 Chore: Re-arrange requirements list 2024-04-23 00:58:29 +08:00
LmeSzinc
1b71236e3a Fix: Wrap ALAS's config_redirect() 2024-04-23 00:30:08 +08:00
LmeSzinc
8cfea6c43e Fix: [ALAS] Use current python executable if the deploy.yaml one does not exist 2024-04-23 00:16:22 +08:00
LmeSzinc
cfe187ea57 Fix: [ALAS] Deploy config wasn't redirected after Updater.delay() 2024-04-23 00:13:54 +08:00
Zuosizhu
e42dd70d83 Revert "fix: lock onepush version to 1.3.0 (#3643)" 
This reverts commit e110ec40ed.
 2024-04-20 17:07:27 +08:00
Zuosizhu
0b2f9ed81c Merge branch 'dev' 
# Conflicts:
#	campaign/campaign_main/campaign_15_1.py
#	campaign/campaign_main/campaign_15_2.py
#	campaign/campaign_main/campaign_15_3.py
#	campaign/campaign_main/campaign_15_4.py
 2024-04-19 02:17:51 +08:00
AkagiYui
e110ec40ed fix: lock onepush version to 1.3.0 (#3643) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-04-19 01:19:51 +08:00
mulaikurisu
cb1fe1812f Upd:change WebuiPort from 22367 to 22267 2024-04-12 01:51:55 +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
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