LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 14:39:25 +08:00
Code Activity

Merge remote-tracking branch 'lme/master' into dev

Browse Source 
# 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
This commit is contained in:
ZuoSiZhu
2025-02-28 11:00:14 +08:00
parent 449f77f58c 5f5fb22268
commit 39c18d8103
125 changed files with 1680 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
module/config/argument/args.json
View File

@@ -1942,17 +1942,18 @@
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn",
"event_20241219_cn"
"event_20241219_cn",
"event_20250227_cn"
],
"display": "hide",
"option_bold": [
"event_20221222_cn",
"event_20231221_cn"
"event_20240725_cn",
"event_20250227_cn"
],
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
"cn": "event_20250227_cn",
"en": "event_20250227_cn",
"jp": "event_20250227_cn",
"tw": "event_20240725_cn"
},
"Mode": {
"type": "select",
@@ -5052,16 +5053,17 @@
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn",
"event_20241219_cn"
"event_20241219_cn",
"event_20250227_cn"
],
"option_bold": [
"event_20221222_cn",
"event_20231221_cn"
"event_20240725_cn",
"event_20250227_cn"
],
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
"cn": "event_20250227_cn",
"en": "event_20250227_cn",
"jp": "event_20250227_cn",
"tw": "event_20240725_cn"
},
"Mode": {
"type": "select",
@@ -5966,16 +5968,17 @@
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn",
"event_20241219_cn"
"event_20241219_cn",
"event_20250227_cn"
],
"option_bold": [
"event_20221222_cn",
"event_20231221_cn"
"event_20240725_cn",
"event_20250227_cn"
],
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
"cn": "event_20250227_cn",
"en": "event_20250227_cn",
"jp": "event_20250227_cn",
"tw": "event_20240725_cn"
},
"Mode": {
"type": "select",
@@ -6381,13 +6384,12 @@
"raid_20250116"
],
"option_bold": [
"raid_20240130",
"raid_20250116"
],
"cn": "raid_20250116",
"en": "raid_20250116",
"jp": "raid_20250116",
"tw": "raid_20240130"
"tw": "raid_20250116"
},
"Mode": {
"type": "select",
@@ -7388,16 +7390,17 @@
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn",
"event_20241219_cn"
"event_20241219_cn",
"event_20250227_cn"
],
"option_bold": [
"event_20221222_cn",
"event_20231221_cn"
"event_20240725_cn",
"event_20250227_cn"
],
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
"cn": "event_20250227_cn",
"en": "event_20250227_cn",
"jp": "event_20250227_cn",
"tw": "event_20240725_cn"
},
"Mode": {
"type": "select",
@@ -7862,16 +7865,17 @@
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn",
"event_20241219_cn"
"event_20241219_cn",
"event_20250227_cn"
],
"option_bold": [
"event_20221222_cn",
"event_20231221_cn"
"event_20240725_cn",
"event_20250227_cn"
],
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
"cn": "event_20250227_cn",
"en": "event_20250227_cn",
"jp": "event_20250227_cn",
"tw": "event_20240725_cn"
},
"Mode": {
"type": "select",
@@ -8336,16 +8340,17 @@
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn",
"event_20241219_cn"
"event_20241219_cn",
"event_20250227_cn"
],
"option_bold": [
"event_20221222_cn",
"event_20231221_cn"
"event_20240725_cn",
"event_20250227_cn"
],
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
"cn": "event_20250227_cn",
"en": "event_20250227_cn",
"jp": "event_20250227_cn",
"tw": "event_20240725_cn"
},
"Mode": {
"type": "select",
@@ -8810,16 +8815,17 @@
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn",
"event_20241219_cn"
"event_20241219_cn",
"event_20250227_cn"
],
"option_bold": [
"event_20221222_cn",
"event_20231221_cn"
"event_20240725_cn",
"event_20250227_cn"
],
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
"cn": "event_20250227_cn",
"en": "event_20250227_cn",
"jp": "event_20250227_cn",
"tw": "event_20240725_cn"
},
"Mode": {
"type": "select",
@@ -9274,16 +9280,17 @@
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn",
"event_20241219_cn"
"event_20241219_cn",
"event_20250227_cn"
],
"option_bold": [
"event_20221222_cn",
"event_20231221_cn"
"event_20240725_cn",
"event_20250227_cn"
],
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
"cn": "event_20250227_cn",
"en": "event_20250227_cn",
"jp": "event_20250227_cn",
"tw": "event_20240725_cn"
},
"Mode": {
"type": "select",
@@ -9686,13 +9693,12 @@
"raid_20250116"
],
"option_bold": [
"raid_20240130",
"raid_20250116"
],
"cn": "raid_20250116",
"en": "raid_20250116",
"jp": "raid_20250116",
"tw": "raid_20240130"
"tw": "raid_20250116"
},
"Mode": {
"type": "select",