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

Merge branch 'master' into dev

# Conflicts:
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
This commit is contained in:
LmeSzinc
2022-10-28 03:09:41 +08:00
31 changed files with 151 additions and 110 deletions

View File

@@ -4968,15 +4968,16 @@
"type": "select",
"value": "campaign_main",
"option": [
"raid_20221027",
"raid_20220630",
"raid_20210708",
"raid_20200624",
"raid_20220127"
],
"display": "disabled",
"cn": "raid_20220630",
"en": "raid_20220630",
"jp": "raid_20220630",
"cn": "raid_20221027",
"en": "raid_20221027",
"jp": "raid_20221027",
"tw": "raid_20210708"
},
"Mode": {
@@ -5180,15 +5181,16 @@
"type": "select",
"value": "campaign_main",
"option": [
"raid_20221027",
"raid_20220630",
"raid_20210708",
"raid_20200624",
"raid_20220127"
],
"display": "disabled",
"cn": "raid_20220630",
"en": "raid_20220630",
"jp": "raid_20220630",
"cn": "raid_20221027",
"en": "raid_20221027",
"jp": "raid_20221027",
"tw": "raid_20210708"
},
"Mode": {