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

Merge branch 'LmeSzinc:master' into dev-minigame-for-pr

This commit is contained in:
Tipsy Fisher
2023-07-14 10:59:13 +08:00
committed by GitHub
63 changed files with 439 additions and 106 deletions

View File

@@ -1594,6 +1594,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
"event_20200603_cn",
@@ -1618,7 +1619,6 @@
"event_20220915_cn",
"event_20210916_cn",
"event_20200903_en",
"event_20220818_cn",
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
@@ -1652,10 +1652,10 @@
"event_20200227_cn"
],
"display": "hide",
"tw": "event_20220428_cn",
"jp": "event_20220818_cn",
"tw": "event_20220818_cn",
"cn": "event_20210527_cn",
"en": "event_20210527_cn",
"jp": "event_20210527_cn"
"en": "event_20210527_cn"
},
"Mode": {
"type": "select",
@@ -1913,6 +1913,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
"event_20200603_cn",
@@ -1937,7 +1938,6 @@
"event_20220915_cn",
"event_20210916_cn",
"event_20200903_en",
"event_20220818_cn",
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
@@ -1971,10 +1971,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220428_cn",
"jp": "event_20220818_cn",
"tw": "event_20220818_cn",
"cn": "event_20210527_cn",
"en": "event_20210527_cn",
"jp": "event_20210527_cn"
"en": "event_20210527_cn"
},
"Mode": {
"type": "select",
@@ -2347,6 +2347,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
"event_20200603_cn",
@@ -2371,7 +2372,6 @@
"event_20220915_cn",
"event_20210916_cn",
"event_20200903_en",
"event_20220818_cn",
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
@@ -2405,10 +2405,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220428_cn",
"jp": "event_20220818_cn",
"tw": "event_20220818_cn",
"cn": "event_20210527_cn",
"en": "event_20210527_cn",
"jp": "event_20210527_cn"
"en": "event_20210527_cn"
},
"Mode": {
"type": "select",
@@ -3692,6 +3692,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
"event_20200603_cn",
@@ -3716,7 +3717,6 @@
"event_20220915_cn",
"event_20210916_cn",
"event_20200903_en",
"event_20220818_cn",
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
@@ -3750,10 +3750,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220428_cn",
"jp": "event_20220818_cn",
"tw": "event_20220818_cn",
"cn": "event_20210527_cn",
"en": "event_20210527_cn",
"jp": "event_20210527_cn"
"en": "event_20210527_cn"
},
"Mode": {
"type": "select",
@@ -4143,6 +4143,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
"event_20200603_cn",
@@ -4167,7 +4168,6 @@
"event_20220915_cn",
"event_20210916_cn",
"event_20200903_en",
"event_20220818_cn",
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
@@ -4201,10 +4201,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220428_cn",
"jp": "event_20220818_cn",
"tw": "event_20220818_cn",
"cn": "event_20210527_cn",
"en": "event_20210527_cn",
"jp": "event_20210527_cn"
"en": "event_20210527_cn"
},
"Mode": {
"type": "select",
@@ -4594,6 +4594,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
"event_20200603_cn",
@@ -4618,7 +4619,6 @@
"event_20220915_cn",
"event_20210916_cn",
"event_20200903_en",
"event_20220818_cn",
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
@@ -4652,10 +4652,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220428_cn",
"jp": "event_20220818_cn",
"tw": "event_20220818_cn",
"cn": "event_20210527_cn",
"en": "event_20210527_cn",
"jp": "event_20210527_cn"
"en": "event_20210527_cn"
},
"Mode": {
"type": "select",
@@ -5045,6 +5045,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
"event_20200603_cn",
@@ -5069,7 +5070,6 @@
"event_20220915_cn",
"event_20210916_cn",
"event_20200903_en",
"event_20220818_cn",
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
@@ -5103,10 +5103,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220428_cn",
"jp": "event_20220818_cn",
"tw": "event_20220818_cn",
"cn": "event_20210527_cn",
"en": "event_20210527_cn",
"jp": "event_20210527_cn"
"en": "event_20210527_cn"
},
"Mode": {
"type": "select",
@@ -5486,6 +5486,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
"event_20200603_cn",
@@ -5510,7 +5511,6 @@
"event_20220915_cn",
"event_20210916_cn",
"event_20200903_en",
"event_20220818_cn",
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
@@ -5544,10 +5544,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220428_cn",
"jp": "event_20220818_cn",
"tw": "event_20220818_cn",
"cn": "event_20210527_cn",
"en": "event_20210527_cn",
"jp": "event_20210527_cn"
"en": "event_20210527_cn"
},
"Mode": {
"type": "select",
@@ -6556,9 +6556,12 @@
},
"PresetFilter": {
"type": "select",
"value": "series_5_blueprint_152",
"value": "series_6_blueprint_203",
"option": [
"custom",
"series_6_blueprint_203",
"series_6_blueprint_only",
"series_6_203_only",
"series_5_blueprint_152",
"series_5_blueprint_only",
"series_5_152_only",