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

Merge branch 'master' into dev

This commit is contained in:
LmeSzinc
2022-11-25 02:29:03 +08:00
50 changed files with 1443 additions and 52 deletions

View File

@@ -1517,6 +1517,8 @@
"value": "campaign_main",
"option": [
"campaign_main",
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -1555,7 +1557,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -1570,10 +1571,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -1937,6 +1938,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -1975,7 +1978,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -1991,10 +1993,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -2357,6 +2359,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -2395,7 +2399,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -2411,10 +2414,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -2788,6 +2791,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -2826,7 +2831,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -2842,10 +2846,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -3225,6 +3229,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -3263,7 +3269,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -3279,10 +3284,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -3662,6 +3667,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -3700,7 +3707,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -3716,10 +3722,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -4099,6 +4105,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -4137,7 +4145,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -4153,10 +4160,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -4526,6 +4533,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -4564,7 +4573,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -4580,10 +4588,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",