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

Merge branch 'master' into dev

This commit is contained in:
LmeSzinc
2022-02-25 23:38:54 +08:00
100 changed files with 2670 additions and 871 deletions

View File

@@ -1708,6 +1708,8 @@
"value": "campaign_main",
"option": [
"campaign_main",
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
@@ -1734,7 +1736,6 @@
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20210225_cn",
"event_20210121_cn",
"event_20201126_cn",
"event_20200312_cn",
@@ -1751,10 +1752,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20220210_cn",
"en": "event_20220210_cn",
"jp": "event_20220210_cn",
"tw": "event_20201229_cn"
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20210225_cn"
},
"Mode": {
"type": "disable",
@@ -2059,6 +2060,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
@@ -2085,7 +2088,6 @@
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20210225_cn",
"event_20210121_cn",
"event_20201126_cn",
"event_20200312_cn",
@@ -2102,10 +2104,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20220210_cn",
"en": "event_20220210_cn",
"jp": "event_20220210_cn",
"tw": "event_20201229_cn"
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20210225_cn"
},
"Mode": {
"type": "disable",
@@ -2480,6 +2482,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
@@ -2506,7 +2510,6 @@
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20210225_cn",
"event_20210121_cn",
"event_20201126_cn",
"event_20200312_cn",
@@ -2523,10 +2526,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20220210_cn",
"en": "event_20220210_cn",
"jp": "event_20220210_cn",
"tw": "event_20201229_cn"
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20210225_cn"
},
"Mode": {
"type": "disable",
@@ -2890,6 +2893,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
@@ -2916,7 +2921,6 @@
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20210225_cn",
"event_20210121_cn",
"event_20201126_cn",
"event_20200312_cn",
@@ -2933,10 +2937,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20220210_cn",
"en": "event_20220210_cn",
"jp": "event_20220210_cn",
"tw": "event_20201229_cn"
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20210225_cn"
},
"Mode": {
"type": "disable",
@@ -3290,6 +3294,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
@@ -3316,7 +3322,6 @@
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20210225_cn",
"event_20210121_cn",
"event_20201126_cn",
"event_20200312_cn",
@@ -3333,10 +3338,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20220210_cn",
"en": "event_20220210_cn",
"jp": "event_20220210_cn",
"tw": "event_20201229_cn"
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20210225_cn"
},
"Mode": {
"type": "disable",
@@ -6303,12 +6308,11 @@
"type": "select",
"value": 5,
"option": [
1,
2,
3,
4,
5,
6
6,
10
]
},
"TargetZone": {