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

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

This commit is contained in:
yypsybs
2023-08-04 11:53:54 +08:00
37 changed files with 764 additions and 112 deletions

View File

@@ -1594,7 +1594,9 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
@@ -1623,7 +1625,6 @@
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
"event_20200917_cn",
"event_20201029_cn",
"event_20200820_cn",
"event_20201012_cn",
@@ -1652,10 +1653,10 @@
"event_20200227_cn"
],
"display": "hide",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn",
"tw": "event_20220818_cn"
"cn": "event_20230803_cn",
"en": "event_20230803_cn",
"jp": "event_20230803_cn",
"tw": "event_20211125_cn"
},
"Mode": {
"type": "select",
@@ -1913,7 +1914,9 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
@@ -1942,7 +1945,6 @@
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
"event_20200917_cn",
"event_20201029_cn",
"event_20200820_cn",
"event_20201012_cn",
@@ -1971,10 +1973,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn",
"tw": "event_20220818_cn"
"cn": "event_20230803_cn",
"en": "event_20230803_cn",
"jp": "event_20230803_cn",
"tw": "event_20211125_cn"
},
"Mode": {
"type": "select",
@@ -2347,7 +2349,9 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
@@ -2376,7 +2380,6 @@
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
"event_20200917_cn",
"event_20201029_cn",
"event_20200820_cn",
"event_20201012_cn",
@@ -2405,10 +2408,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn",
"tw": "event_20220818_cn"
"cn": "event_20230803_cn",
"en": "event_20230803_cn",
"jp": "event_20230803_cn",
"tw": "event_20211125_cn"
},
"Mode": {
"type": "select",
@@ -3692,7 +3695,9 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
@@ -3721,7 +3726,6 @@
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
"event_20200917_cn",
"event_20201029_cn",
"event_20200820_cn",
"event_20201012_cn",
@@ -3750,10 +3754,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn",
"tw": "event_20220818_cn"
"cn": "event_20230803_cn",
"en": "event_20230803_cn",
"jp": "event_20230803_cn",
"tw": "event_20211125_cn"
},
"Mode": {
"type": "select",
@@ -4143,7 +4147,9 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
@@ -4172,7 +4178,6 @@
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
"event_20200917_cn",
"event_20201029_cn",
"event_20200820_cn",
"event_20201012_cn",
@@ -4201,10 +4206,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn",
"tw": "event_20220818_cn"
"cn": "event_20230803_cn",
"en": "event_20230803_cn",
"jp": "event_20230803_cn",
"tw": "event_20211125_cn"
},
"Mode": {
"type": "select",
@@ -4594,7 +4599,9 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
@@ -4623,7 +4630,6 @@
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
"event_20200917_cn",
"event_20201029_cn",
"event_20200820_cn",
"event_20201012_cn",
@@ -4652,10 +4658,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn",
"tw": "event_20220818_cn"
"cn": "event_20230803_cn",
"en": "event_20230803_cn",
"jp": "event_20230803_cn",
"tw": "event_20211125_cn"
},
"Mode": {
"type": "select",
@@ -5045,7 +5051,9 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
@@ -5074,7 +5082,6 @@
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
"event_20200917_cn",
"event_20201029_cn",
"event_20200820_cn",
"event_20201012_cn",
@@ -5103,10 +5110,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn",
"tw": "event_20220818_cn"
"cn": "event_20230803_cn",
"en": "event_20230803_cn",
"jp": "event_20230803_cn",
"tw": "event_20211125_cn"
},
"Mode": {
"type": "select",
@@ -5486,7 +5493,9 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
@@ -5515,7 +5524,6 @@
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
"event_20200917_cn",
"event_20201029_cn",
"event_20200820_cn",
"event_20201012_cn",
@@ -5544,10 +5552,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn",
"tw": "event_20220818_cn"
"cn": "event_20230803_cn",
"en": "event_20230803_cn",
"jp": "event_20230803_cn",
"tw": "event_20211125_cn"
},
"Mode": {
"type": "select",