1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:49:26 +08:00

Merge remote-tracking branch 'LmeSzinc/master' into refactor

# Conflicts:
#	module/config/argument/args.json
#	module/shop/shop_reward.py
This commit is contained in:
0O0o0oOoO00
2025-10-16 23:04:57 +08:00
69 changed files with 735 additions and 99 deletions

View File

@@ -1380,7 +1380,7 @@
},
"Campaign": {
"Name": "D3",
"Event": "war_archives_20220428_cn",
"Event": "war_archives_20231026_cn",
"Mode": "normal",
"UseClearMode": true,
"UseFleetLock": true,