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

256 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
ec2c1959f5 Fix: [ALAS] Reduce unnecessary file writes at startup 2025-02-25 00:43:27 +08:00
xhqss
f33cfab853 Merge branch 'master_lme' 
# Conflicts:
#	module/webui/app.py
 2024-11-21 23:45:00 +08:00
SarContDeli
bd680eb3a8 Add: fake module PIL for webui (#4374) 
* Add: fake module PIL for webui

* Fix: Load runtime before module PIL

* Upd: Error message of MAA loading failure

* Upd: Adjust timing of import fake module
 2024-11-19 12:37:59 +08:00
LA_DI_DA
1bdaa5aa47 fix: merge mistake, lack of function in app.py 2024-09-13 23:07:29 +08:00
xhqss
48ba0f043e Merge branch 'master_lme' 
# Conflicts:
#	module/webui/app.py
 2024-09-13 20:17:43 +08:00
LmeSzinc
a66760b743 Opt: Patch aiofiles to reduce thread pool size 2024-09-11 22:47:58 +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
f810db8bea Fix: Skip first screenshot in tools 
since you cannot run benchmark before benckmarked
 2024-06-21 01:42:45 +08:00
LmeSzinc
5f56a2bdb7 Chore: [ALAS] Move func methods to the Alas class 2024-05-30 13:34:24 +08:00
LA_DI_DA
6c702d49ef fix(InstanceRestart): record instance which has restarted too many times 2024-05-20 22:39:25 +08:00
LA_DI_DA
02587d5f16 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2024-04-27 15:45:38 +08:00
Zuosizhu
055720dd52 Merge branch 'master_lme' 
# Conflicts:
#	deploy/config.py
 2024-04-26 03:18:16 +08:00
LmeSzinc
cfe187ea57 Fix: [ALAS] Deploy config wasn't redirected after Updater.delay() 2024-04-23 00:13:54 +08:00
LA_DI_DA
541737d81d Add: restart instance 2024-04-10 11:31:23 +08:00
LA_DI_DA
c30ed73736 Add: confirm for clear all task 2024-02-19 17:38:06 +08:00
LA_DI_DA
142cc1696d Add: one click clear all task 2024-02-15 19:23:34 +08:00
Zuosizhu
bb50753c29 Merge branch 'master_lme' 
# Conflicts:
#	module/device/device.py
 2023-12-16 00:39:48 +08:00
LmeSzinc
a37438bd02 Fix: [ALAS] Checkbox cannot be dynamically updated 2023-12-07 22:35:36 +08:00
Zuosizhu
8981d103c9 Merge branch 'LmeSzinc:master' into 20230309 2023-11-06 10:08:40 +08:00
LmeSzinc
eda63d72f8 Refactor: Config update callback 2023-11-03 03:34:23 +08:00
LmeSzinc
1d1d20fef9 Fix: Validate datetime instead of using regex (#3252) 2023-11-01 02:40:02 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00
LmeSzinc
f7cf9e3bd2 Add: [ALAS] stored and state widgets 2023-10-28 22:03:45 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-26 00:04:07 +08:00
LmeSzinc
6b88d338b5 Merge remote-tracking branch 'origin/dev' into dev 2023-10-22 19:04:05 +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
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
LmeSzinc
1ae706f40f Merge branch 'master' into feature 2023-09-08 01:27:28 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	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/webui/app.py
 2023-09-02 17:47:24 +08:00
18870
736fd52407 Opt: Refine file name processing 
- Prevent bypassing disabled button through devtool
- Remove auto export on override import
 2023-08-31 03:26:48 +08:00
18870
23d845b69a Opt: Move New config to manage page 2023-08-29 21:08:29 +08:00
18870
a4bd13b2bc Add: Config import/export 2023-08-29 19:56:47 +08:00
LmeSzinc
f80bd61562 Merge branch 'master' into feature 
# Conflicts:
#	module/config/i18n/zh-TW.json
 2023-08-28 18:12:08 +08:00
LmeSzinc
8987c9253b Add: Disable multi-instances on phone cloud environment 2023-08-28 17:30:46 +08:00
Zuosizhu
72730a4147 Merge branch 'LmeSzinc:master' into 20230309 2023-08-08 20:40:20 +08:00
LmeSzinc
f81d53cf68 Fix: Catch RequestHumanTakeover in benchmark 2023-08-05 18:03:50 +08:00
Zuosizhu
7cea084ecb Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/argument/task.yaml
#	module/config/config_updater.py
 2023-06-22 01:06:48 +08:00
LmeSzinc
093a6efba0 Merge branch 'dev' into feature 
# Conflicts:
#	module/config/argument/task.yaml
 2023-06-17 22:19:05 +08:00
LmeSzinc
0c37354ed5 Opt: List tasks instead of collapsing them in submodules 2023-06-17 22:11:19 +08:00
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
LmeSzinc
ab8c24c2ed Merge branch 'master' into feature 2023-06-12 00:43:49 +08:00
Zuosizhu
4d1fd01511 Merge branch 'master_lme' 
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
 2023-05-15 17:22:33 +08:00
LmeSzinc
b14b9af392 Merge branch 'master' into feature 2023-05-07 21:36:38 +08:00
hgjazhgj
59263237ab Add: TeamIndex 2023-05-07 09:17:14 +08:00
hgjazhgj
f6d52621fe Add: Submodule AlasFpyBridge (experimental) 2023-05-06 20:58:08 +08:00
hgjazhgj
b18be2ae2b Fix: Redundant template-maa.maa.json config file (#2551) 2023-05-05 12:29:53 +08:00