mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 14:27:00 +08:00
Merge branch 'master' into dev
This commit is contained in:
@@ -1572,6 +1572,8 @@
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"campaign_main",
|
||||
"event_20211229_cn",
|
||||
"event_20221222_cn",
|
||||
"event_20221124_cn",
|
||||
"event_20210325_cn",
|
||||
"event_20201229_cn",
|
||||
@@ -1599,7 +1601,6 @@
|
||||
"event_20220224_cn",
|
||||
"event_20210225_cn",
|
||||
"event_20220210_cn",
|
||||
"event_20211229_cn",
|
||||
"event_20211125_cn",
|
||||
"event_20211028_tw",
|
||||
"event_20210722_cn",
|
||||
@@ -1626,10 +1627,10 @@
|
||||
"event_20200326_cn",
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"tw": "event_20221124_cn",
|
||||
"cn": "event_20221124_cn",
|
||||
"en": "event_20221124_cn",
|
||||
"jp": "event_20221124_cn"
|
||||
"tw": "event_20211229_cn",
|
||||
"cn": "event_20221222_cn",
|
||||
"en": "event_20221222_cn",
|
||||
"jp": "event_20221222_cn"
|
||||
},
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
@@ -2010,6 +2011,8 @@
|
||||
"type": "select",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20211229_cn",
|
||||
"event_20221222_cn",
|
||||
"event_20221124_cn",
|
||||
"event_20210325_cn",
|
||||
"event_20201229_cn",
|
||||
@@ -2037,7 +2040,6 @@
|
||||
"event_20220224_cn",
|
||||
"event_20210225_cn",
|
||||
"event_20220210_cn",
|
||||
"event_20211229_cn",
|
||||
"event_20211125_cn",
|
||||
"event_20211028_tw",
|
||||
"event_20210722_cn",
|
||||
@@ -2065,10 +2067,10 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"display": "disabled",
|
||||
"tw": "event_20221124_cn",
|
||||
"cn": "event_20221124_cn",
|
||||
"en": "event_20221124_cn",
|
||||
"jp": "event_20221124_cn"
|
||||
"tw": "event_20211229_cn",
|
||||
"cn": "event_20221222_cn",
|
||||
"en": "event_20221222_cn",
|
||||
"jp": "event_20221222_cn"
|
||||
},
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
@@ -2440,6 +2442,8 @@
|
||||
"type": "select",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20211229_cn",
|
||||
"event_20221222_cn",
|
||||
"event_20221124_cn",
|
||||
"event_20210325_cn",
|
||||
"event_20201229_cn",
|
||||
@@ -2467,7 +2471,6 @@
|
||||
"event_20220224_cn",
|
||||
"event_20210225_cn",
|
||||
"event_20220210_cn",
|
||||
"event_20211229_cn",
|
||||
"event_20211125_cn",
|
||||
"event_20211028_tw",
|
||||
"event_20210722_cn",
|
||||
@@ -2495,10 +2498,10 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"display": "disabled",
|
||||
"tw": "event_20221124_cn",
|
||||
"cn": "event_20221124_cn",
|
||||
"en": "event_20221124_cn",
|
||||
"jp": "event_20221124_cn"
|
||||
"tw": "event_20211229_cn",
|
||||
"cn": "event_20221222_cn",
|
||||
"en": "event_20221222_cn",
|
||||
"jp": "event_20221222_cn"
|
||||
},
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
@@ -2881,6 +2884,8 @@
|
||||
"type": "select",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20211229_cn",
|
||||
"event_20221222_cn",
|
||||
"event_20221124_cn",
|
||||
"event_20210325_cn",
|
||||
"event_20201229_cn",
|
||||
@@ -2908,7 +2913,6 @@
|
||||
"event_20220224_cn",
|
||||
"event_20210225_cn",
|
||||
"event_20220210_cn",
|
||||
"event_20211229_cn",
|
||||
"event_20211125_cn",
|
||||
"event_20211028_tw",
|
||||
"event_20210722_cn",
|
||||
@@ -2936,10 +2940,10 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"display": "disabled",
|
||||
"tw": "event_20221124_cn",
|
||||
"cn": "event_20221124_cn",
|
||||
"en": "event_20221124_cn",
|
||||
"jp": "event_20221124_cn"
|
||||
"tw": "event_20211229_cn",
|
||||
"cn": "event_20221222_cn",
|
||||
"en": "event_20221222_cn",
|
||||
"jp": "event_20221222_cn"
|
||||
},
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
@@ -3328,6 +3332,8 @@
|
||||
"type": "select",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20211229_cn",
|
||||
"event_20221222_cn",
|
||||
"event_20221124_cn",
|
||||
"event_20210325_cn",
|
||||
"event_20201229_cn",
|
||||
@@ -3355,7 +3361,6 @@
|
||||
"event_20220224_cn",
|
||||
"event_20210225_cn",
|
||||
"event_20220210_cn",
|
||||
"event_20211229_cn",
|
||||
"event_20211125_cn",
|
||||
"event_20211028_tw",
|
||||
"event_20210722_cn",
|
||||
@@ -3383,10 +3388,10 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"display": "disabled",
|
||||
"tw": "event_20221124_cn",
|
||||
"cn": "event_20221124_cn",
|
||||
"en": "event_20221124_cn",
|
||||
"jp": "event_20221124_cn"
|
||||
"tw": "event_20211229_cn",
|
||||
"cn": "event_20221222_cn",
|
||||
"en": "event_20221222_cn",
|
||||
"jp": "event_20221222_cn"
|
||||
},
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
@@ -3775,6 +3780,8 @@
|
||||
"type": "select",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20211229_cn",
|
||||
"event_20221222_cn",
|
||||
"event_20221124_cn",
|
||||
"event_20210325_cn",
|
||||
"event_20201229_cn",
|
||||
@@ -3802,7 +3809,6 @@
|
||||
"event_20220224_cn",
|
||||
"event_20210225_cn",
|
||||
"event_20220210_cn",
|
||||
"event_20211229_cn",
|
||||
"event_20211125_cn",
|
||||
"event_20211028_tw",
|
||||
"event_20210722_cn",
|
||||
@@ -3830,10 +3836,10 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"display": "disabled",
|
||||
"tw": "event_20221124_cn",
|
||||
"cn": "event_20221124_cn",
|
||||
"en": "event_20221124_cn",
|
||||
"jp": "event_20221124_cn"
|
||||
"tw": "event_20211229_cn",
|
||||
"cn": "event_20221222_cn",
|
||||
"en": "event_20221222_cn",
|
||||
"jp": "event_20221222_cn"
|
||||
},
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
@@ -4222,6 +4228,8 @@
|
||||
"type": "select",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20211229_cn",
|
||||
"event_20221222_cn",
|
||||
"event_20221124_cn",
|
||||
"event_20210325_cn",
|
||||
"event_20201229_cn",
|
||||
@@ -4249,7 +4257,6 @@
|
||||
"event_20220224_cn",
|
||||
"event_20210225_cn",
|
||||
"event_20220210_cn",
|
||||
"event_20211229_cn",
|
||||
"event_20211125_cn",
|
||||
"event_20211028_tw",
|
||||
"event_20210722_cn",
|
||||
@@ -4277,10 +4284,10 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"display": "disabled",
|
||||
"tw": "event_20221124_cn",
|
||||
"cn": "event_20221124_cn",
|
||||
"en": "event_20221124_cn",
|
||||
"jp": "event_20221124_cn"
|
||||
"tw": "event_20211229_cn",
|
||||
"cn": "event_20221222_cn",
|
||||
"en": "event_20221222_cn",
|
||||
"jp": "event_20221222_cn"
|
||||
},
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
@@ -4659,6 +4666,8 @@
|
||||
"type": "select",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20211229_cn",
|
||||
"event_20221222_cn",
|
||||
"event_20221124_cn",
|
||||
"event_20210325_cn",
|
||||
"event_20201229_cn",
|
||||
@@ -4686,7 +4695,6 @@
|
||||
"event_20220224_cn",
|
||||
"event_20210225_cn",
|
||||
"event_20220210_cn",
|
||||
"event_20211229_cn",
|
||||
"event_20211125_cn",
|
||||
"event_20211028_tw",
|
||||
"event_20210722_cn",
|
||||
@@ -4714,10 +4722,10 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"display": "disabled",
|
||||
"tw": "event_20221124_cn",
|
||||
"cn": "event_20221124_cn",
|
||||
"en": "event_20221124_cn",
|
||||
"jp": "event_20221124_cn"
|
||||
"tw": "event_20211229_cn",
|
||||
"cn": "event_20221222_cn",
|
||||
"en": "event_20221222_cn",
|
||||
"jp": "event_20221222_cn"
|
||||
},
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
|
||||
Reference in New Issue
Block a user