1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 05:08:19 +08:00

Merge branch 'master' into dev

# Conflicts:
#	module/config/argument/args.json
This commit is contained in:
LmeSzinc
2024-04-14 01:18:45 +08:00
5 changed files with 40 additions and 39 deletions

View File

@@ -1702,12 +1702,12 @@
],
"display": "hide",
"option_bold": [
"event_20220324_cn",
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220324_cn",
"en": "event_20220324_cn",
"jp": "event_20220324_cn",
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20211111_cn"
},
"Mode": {
@@ -2035,12 +2035,12 @@
"event_20240229_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220324_cn",
"en": "event_20220324_cn",
"jp": "event_20220324_cn",
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20211111_cn"
},
"Mode": {
@@ -2483,12 +2483,12 @@
"event_20240229_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220324_cn",
"en": "event_20220324_cn",
"jp": "event_20220324_cn",
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20211111_cn"
},
"Mode": {
@@ -2894,8 +2894,8 @@
"raid_20240328"
],
"option_bold": [
"raid_20230629",
"raid_20240328"
"raid_20240328",
"raid_20230629"
],
"cn": "raid_20240328",
"en": "raid_20240328",
@@ -3877,12 +3877,12 @@
"event_20240229_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220324_cn",
"en": "event_20220324_cn",
"jp": "event_20220324_cn",
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20211111_cn"
},
"Mode": {
@@ -4342,12 +4342,12 @@
"event_20240229_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220324_cn",
"en": "event_20220324_cn",
"jp": "event_20220324_cn",
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20211111_cn"
},
"Mode": {
@@ -4807,12 +4807,12 @@
"event_20240229_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220324_cn",
"en": "event_20220324_cn",
"jp": "event_20220324_cn",
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20211111_cn"
},
"Mode": {
@@ -5272,12 +5272,12 @@
"event_20240229_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220324_cn",
"en": "event_20220324_cn",
"jp": "event_20220324_cn",
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20211111_cn"
},
"Mode": {
@@ -5727,12 +5727,12 @@
"event_20240229_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220324_cn",
"en": "event_20220324_cn",
"jp": "event_20220324_cn",
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20211111_cn"
},
"Mode": {
@@ -6135,8 +6135,8 @@
"raid_20240328"
],
"option_bold": [
"raid_20230629",
"raid_20240328"
"raid_20240328",
"raid_20230629"
],
"cn": "raid_20240328",
"en": "raid_20240328",