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

Merge branch 'refs/heads/LmeSzinc/master' into dev

Browse Source 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
This commit is contained in:
LA_DI_DA
2024-10-25 12:00:50 +08:00
parent e8525ffaf0 25b5349fd3
commit a2e6986dcd
217 changed files with 538 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1936,13 +1936,13 @@
],
"display": "hide",
"option_bold": [
"event_20220324_cn",
"event_20240912_cn"
"event_20220728_cn",
"event_20230914_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"cn": "event_20220728_cn",
"en": "event_20220728_cn",
"jp": "event_20220728_cn",
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -5042,13 +5042,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20240912_cn"
"event_20220728_cn",
"event_20230914_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"cn": "event_20220728_cn",
"en": "event_20220728_cn",
"jp": "event_20220728_cn",
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -5496,13 +5496,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20240912_cn"
"event_20220728_cn",
"event_20230914_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"cn": "event_20220728_cn",
"en": "event_20220728_cn",
"jp": "event_20220728_cn",
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -5950,13 +5950,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20240912_cn"
"event_20220728_cn",
"event_20230914_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"cn": "event_20220728_cn",
"en": "event_20220728_cn",
"jp": "event_20220728_cn",
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -6580,13 +6580,12 @@
"coalition_20240627"
],
"option_bold": [
"coalition_20230323",
"coalition_20240627"
],
"cn": "coalition_20240627",
"en": "coalition_20240627",
"jp": "coalition_20240627",
"tw": "coalition_20230323"
"tw": "coalition_20240627"
},
"Mode": {
"type": "select",
@@ -6885,25 +6884,30 @@
"war_archives_20200820_cn",
"war_archives_20200903_cn",
"war_archives_20200917_cn",
"war_archives_20201012_cn",
"war_archives_20201029_cn",
"war_archives_20201229_cn",
"war_archives_20210225_cn",
"war_archives_20210325_cn",
"war_archives_20210422_cn",
"war_archives_20210527_cn",
"war_archives_20210624_cn",
"war_archives_20210819_cn",
"war_archives_20210916_cn",
"war_archives_20211014_cn",
"war_archives_20211028_cn",
"war_archives_20211111_cn",
"war_archives_20211229_cn",
"war_archives_20220210_cn",
"war_archives_20220414_cn"
],
"option_bold": [
"war_archives_20210225_cn"
"war_archives_20211229_cn"
],
"cn": "war_archives_20210225_cn",
"en": "war_archives_20210225_cn",
"jp": "war_archives_20210225_cn",
"tw": "war_archives_20210225_cn"
"cn": "war_archives_20211229_cn",
"en": "war_archives_20211229_cn",
"jp": "war_archives_20211229_cn",
"tw": "war_archives_20211229_cn"
},
"Mode": {
"type": "select",
@@ -7362,13 +7366,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20240912_cn"
"event_20220728_cn",
"event_20230914_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"cn": "event_20220728_cn",
"en": "event_20220728_cn",
"jp": "event_20220728_cn",
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -7833,13 +7837,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20240912_cn"
"event_20220728_cn",
"event_20230914_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"cn": "event_20220728_cn",
"en": "event_20220728_cn",
"jp": "event_20220728_cn",
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -8304,13 +8308,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20240912_cn"
"event_20220728_cn",
"event_20230914_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"cn": "event_20220728_cn",
"en": "event_20220728_cn",
"jp": "event_20220728_cn",
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -8775,13 +8779,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20240912_cn"
"event_20220728_cn",
"event_20230914_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"cn": "event_20220728_cn",
"en": "event_20220728_cn",
"jp": "event_20220728_cn",
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -9236,13 +9240,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20240912_cn"
"event_20220728_cn",
"event_20230914_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"cn": "event_20220728_cn",
"en": "event_20220728_cn",
"jp": "event_20220728_cn",
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -9864,13 +9868,12 @@
"coalition_20240627"
],
"option_bold": [
"coalition_20230323",
"coalition_20240627"
],
"cn": "coalition_20240627",
"en": "coalition_20240627",
"jp": "coalition_20240627",
"tw": "coalition_20230323"
"tw": "coalition_20240627"
},
"Mode": {
"type": "select",
@@ -10479,6 +10482,10 @@
"EnhanceIndex": {
"type": "input",
"value": 1
},
"MaxFeedLevel": {
"type": "input",
"value": 5
}
},
"Storage": {