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

Merge branch 'master_lme'

Browse Source 
# Conflicts:
#	module/equipment/equipment.py
This commit is contained in:
xhqss
2024-12-20 23:51:48 +08:00
parent 775432486f 63bd1fc317
commit e7f93d8efe
92 changed files with 1751 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1934,17 +1934,18 @@
"event_20240829_cn",
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn"
"event_20241121_cn",
"event_20241219_cn"
],
"display": "hide",
"option_bold": [
"event_20240229_cn",
"event_20241121_cn"
"event_20231221_cn",
"event_20241219_cn"
],
"cn": "event_20241121_cn",
"en": "event_20241121_cn",
"jp": "event_20241121_cn",
"tw": "event_20240229_cn"
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"tw": "event_20231221_cn"
},
"Mode": {
"type": "select",
@@ -5043,16 +5044,17 @@
"event_20240829_cn",
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn"
"event_20241121_cn",
"event_20241219_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20241121_cn"
"event_20231221_cn",
"event_20241219_cn"
],
"cn": "event_20241121_cn",
"en": "event_20241121_cn",
"jp": "event_20241121_cn",
"tw": "event_20240229_cn"
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"tw": "event_20231221_cn"
},
"Mode": {
"type": "select",
@@ -5955,16 +5957,17 @@
"event_20240829_cn",
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn"
"event_20241121_cn",
"event_20241219_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20241121_cn"
"event_20231221_cn",
"event_20241219_cn"
],
"cn": "event_20241121_cn",
"en": "event_20241121_cn",
"jp": "event_20241121_cn",
"tw": "event_20240229_cn"
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"tw": "event_20231221_cn"
},
"Mode": {
"type": "select",
@@ -7373,16 +7376,17 @@
"event_20240829_cn",
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn"
"event_20241121_cn",
"event_20241219_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20241121_cn"
"event_20231221_cn",
"event_20241219_cn"
],
"cn": "event_20241121_cn",
"en": "event_20241121_cn",
"jp": "event_20241121_cn",
"tw": "event_20240229_cn"
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"tw": "event_20231221_cn"
},
"Mode": {
"type": "select",
@@ -7846,16 +7850,17 @@
"event_20240829_cn",
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn"
"event_20241121_cn",
"event_20241219_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20241121_cn"
"event_20231221_cn",
"event_20241219_cn"
],
"cn": "event_20241121_cn",
"en": "event_20241121_cn",
"jp": "event_20241121_cn",
"tw": "event_20240229_cn"
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"tw": "event_20231221_cn"
},
"Mode": {
"type": "select",
@@ -8319,16 +8324,17 @@
"event_20240829_cn",
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn"
"event_20241121_cn",
"event_20241219_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20241121_cn"
"event_20231221_cn",
"event_20241219_cn"
],
"cn": "event_20241121_cn",
"en": "event_20241121_cn",
"jp": "event_20241121_cn",
"tw": "event_20240229_cn"
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"tw": "event_20231221_cn"
},
"Mode": {
"type": "select",
@@ -8792,16 +8798,17 @@
"event_20240829_cn",
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn"
"event_20241121_cn",
"event_20241219_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20241121_cn"
"event_20231221_cn",
"event_20241219_cn"
],
"cn": "event_20241121_cn",
"en": "event_20241121_cn",
"jp": "event_20241121_cn",
"tw": "event_20240229_cn"
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"tw": "event_20231221_cn"
},
"Mode": {
"type": "select",
@@ -9255,16 +9262,17 @@
"event_20240829_cn",
"event_20240912_cn",
"event_20241024_cn",
"event_20241121_cn"
"event_20241121_cn",
"event_20241219_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20241121_cn"
"event_20231221_cn",
"event_20241219_cn"
],
"cn": "event_20241121_cn",
"en": "event_20241121_cn",
"jp": "event_20241121_cn",
"tw": "event_20240229_cn"
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"tw": "event_20231221_cn"
},
"Mode": {
"type": "select",