LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 00:09:28 +08:00
Code Activity
9,684 Commits 12 Branches 0 Tags
f1cfd90deb98dead6cb6f66ea4e94e5facee0519
Commit Graph

725 Commits

Author SHA1 Message Date
Zuosizhu
de303b492e Merge branch 'master_lme' into brocore_dev 
# Conflicts:
#	module/config/argument/override.yaml
#	module/research/selector.py
#	module/ui/ui.py
#	module/webui/app.py
 2025-07-11 23:03:05 +08:00
LmeSzinc
532e4c2eee Merge branch 'bug_fix' into dev 2025-07-11 00:14:29 +08:00
LmeSzinc
d28ace6294 Upd: Research S8 configs and presets 2025-07-10 22:42:17 +08:00
sui-feng-cb
3001ae011a Add: war_archives_20220728_cn 2025-07-07 18:00:53 +08:00
nEEtdo0d
b85b47d67c Merge branch 'master' into dev 2025-06-28 16:11:37 -04:00
0O0o0oOoO00
171520adfb Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/ui/ui.py
 2025-06-28 23:09:47 +08:00
LmeSzinc
37ad6c9d12 Upd: stage convert 2025-06-27 00:08:42 +08:00
LmeSzinc
373cf7e919 Add: Event entrance of Neon City Investigator (coalition_20250626) 2025-06-26 23:46:41 +08:00
ZuoSiZhu
b7ad8e7368 Adj: Remove config for OthersLogin.Method 2025-06-21 16:57:55 +08:00
guoh064
046e3fb377 Add: delay task after opsi level check passed 2025-06-17 14:41:16 +09:00
0O0o0oOoO00
f64bc96bb2 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	config/deploy.template-AidLux-cn.yaml
#	config/deploy.template-AidLux.yaml
#	config/deploy.template-cn.yaml
#	config/deploy.template-docker-cn.yaml
#	config/deploy.template-docker.yaml
#	config/deploy.template-linux-cn.yaml
#	config/deploy.template-linux.yaml
#	config/deploy.template.yaml
 2025-06-17 13:19:30 +08:00
nEEtdo0d
64c5b5e30f Merge branch 'master' into dev 2025-06-15 16:59:21 -04:00
guoh064
7cef54d350 Add: check leveling in cl1 daily 2025-06-08 13:08:19 +09:00
0O0o0oOoO00
54d5d018f0 add: exercise more power and exercise god mode 2025-06-08 09:57:30 +08:00
ZuoSiZhu
733b20a6db fix: unexpected restarts caused by do_inject 2025-06-08 02:48:37 +08:00
ZuoSiZhu
dc1db0f0b4 adj: remove PushEverytime in Hook, set to auto update instead 2025-06-08 01:44:32 +08:00
happyhappyhappy-arch
f9602be1ba Add ssl support (#4840) 
* Add: add ssl authentication

* Fix: unify the format for ssl config

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2025-06-05 15:36:17 +08:00
xhqss
0339fe9dcc Merge branch 'master_lme' into dev 
# Conflicts:
#	module/event_hospital/assets.py
 2025-05-25 15:18:10 +08:00
travellerse
14ff6ab8ae Upd: [MAA] Update MaaFight.Series values and options to include DISABLE and AUTO (#4827) 2025-05-24 23:07:34 +08:00
0O0o0oOoO00
f5191c03a1 add: push luahook resource everytime 2025-05-22 17:40:05 +08:00
0O0o0oOoO00
16fa913b69 fix: merge mistake of more event 2025-05-21 13:17:53 +08:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev 
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	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/handler/login.py
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
 2025-05-21 04:17:08 +08:00
ZuoSiZhu
99ae4c66d4 Add: cheat support for daemon 2025-05-21 03:30:02 +08:00
0O0o0oOoO00
13eb3a079f fix: lack of KeepOil setting 2025-05-19 11:37:17 +08:00
0O0o0oOoO00
75267083c9 Merge branch 'feature/more' into dev 
# Conflicts:
#	alas.py
#	module/exception.py
 2025-05-18 22:03:42 +08:00
0O0o0oOoO00
d411b16ce8 add: wait time setting of phone and adb 2025-05-18 21:32:49 +08:00
0O0o0oOoO00
423ce223f9 add: restart chinac cloud phone 2025-05-18 20:43:18 +08:00
0O0o0oOoO00
03a59cca17 Merge branch 'dev' into feature/more 2025-05-11 15:29:08 +08:00
0O0o0oOoO00
604da2aaeb add: global speedup for hook 2025-05-11 15:19:14 +08:00
0O0o0oOoO00
16f60ac787 fix: mis-deleted dashboard settings 2025-05-10 14:00:06 +08:00
0O0o0oOoO00
92d3616459 add: global speedup 2025-05-10 13:45:15 +08:00
nEEtdo0d
09caf9704f Add: [EN] Private Quarters support 2025-04-27 13:12:08 -04:00
sui_feng
978167218d Merge pull request #4750 from sui-feng-cb/war_archives_update 
Add: war_archives_20220526_cn
 2025-04-25 00:00:02 +08:00
LA-DI-DA
62c33f27e0 Merge the remaining functions in MoreAlas 2025-04-24 23:30:50 +08:00
silvergundam
95cbfeafea Fix: Dashboard 2025-04-18 01:01:51 +08:00
xhqss
f35c9d289f Brute-force porting of LME updates to the event_20250417 branch 2025-04-18 00:07:46 +08:00
LmeSzinc
84da230fd9 Upd: Toggle coalition to Frostfall 2025-04-17 22:13:06 +08:00
silvergundam
73eaab8ace Merge remote-tracking branch 'lme/master' into dev 2025-04-03 11:57:44 +08:00
POLAR me
42090d5191 update(event_hospital): 添加深谷来信刷图模式 2025-03-31 00:11:52 +08:00
sui_feng
4768c9e46c Add: War Archives 20220324 (#4698) 2025-03-29 01:11:26 +08:00
ZuoSiZhu
166b49f8f0 Merge branch 'master_lme' into dev 
# Conflicts:
#	alas.py
#	module/config/config_manual.py
#	module/ui/page.py
#	module/ui/ui.py
 2025-03-28 08:34:41 +08:00
LmeSzinc
985f49279f Add: Configs for task Hospital 2025-03-28 01:05:09 +08:00
LA_DI_DA
61debe2dbb add: add python implementation for gg factor 2025-03-27 18:06:23 +08:00
guoh064
e8afd8a5a9 Merge remote-tracking branch 'guoh064/shop_event_3' into dev 2025-03-23 21:32:39 +08:00
LA_DI_DA
3d87557568 add: select arch manually 2025-03-21 19:42:04 +08:00
LA_DI_DA
b4470e355f add: restart game before crack 2025-03-20 19:27:12 +08:00
LA_DI_DA
245902f1fb add: resource update server 2025-03-19 22:57:05 +08:00
LA_DI_DA
fdee1ff0d9 add: game lib dir setting for luahook 2025-03-18 13:52:06 +08:00
LA_DI_DA
01b24293c4 add: setting for luahook 2025-03-18 13:38:09 +08:00
ZuoSiZhu
b82b79988d Merge remote-tracking branch 'lme/master' into dev 
# Conflicts:
#	module/config/argument/override.yaml
 2025-03-14 00:57:23 +08:00