sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 03:58:22 +08:00
Code Activity

Fix: merge conflict

Browse Source
This commit is contained in:
SarContDeli
2022-11-11 14:31:05 +08:00
parent 1f38e92e02
commit 65c0699b37
4 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1541,7 +1541,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -1573,7 +1572,7 @@
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20201229_cn"
"tw": "event_20211111_cn"
},
"Mode": {
"type": "select",
@@ -1994,7 +1993,7 @@
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20201229_cn"
"tw": "event_20211111_cn"
},
"Mode": {
"type": "select",
@@ -2813,7 +2812,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -2846,7 +2844,7 @@
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20201229_cn"
"tw": "event_20211111_cn"
},
"Mode": {
"type": "select",
@@ -3251,7 +3249,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -3281,10 +3278,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20211111_cn",
"cn": "event_20220915_cn",
"en": "event_20220915_cn",
"jp": "event_20220915_cn"
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
},
"Mode": {
"type": "select",
@@ -3689,7 +3686,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -3722,7 +3718,7 @@
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20201229_cn"
"tw": "event_20211111_cn"
},
"Mode": {
"type": "select",
@@ -4127,7 +4123,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -4160,7 +4155,7 @@
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20201229_cn"
"tw": "event_20211111_cn"
},
"Mode": {
"type": "select",
@@ -4555,7 +4550,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",