mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 01:38:21 +08:00
Merge branch 'master' into dev
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -590,6 +590,8 @@
|
||||
"name": "Event Name",
|
||||
"help": "Automatically selects to the latest event",
|
||||
"campaign_main": "campaign_main",
|
||||
"event_20221124_cn": "The Alchemist and the Archipelago of Secrets",
|
||||
"event_20210325_cn": "Ashen Simulacrum Rerun",
|
||||
"event_20201229_cn": "Inverted Orthant Rerun",
|
||||
"event_20211111_cn": "The Flame-Touched Dagger",
|
||||
"raid_20221027": "Fight On Royal Maids!(Part 3)",
|
||||
@@ -633,7 +635,6 @@
|
||||
"event_20210527_tw": "微層混合",
|
||||
"event_20210429_tw": "復刻墨染的鋼鐵之花",
|
||||
"event_20210415_tw": "復刻圍剿施佩伯爵",
|
||||
"event_20210325_cn": "Ashen Simulacrum Rerun",
|
||||
"event_20210225_tw": "北境序曲",
|
||||
"event_20201126_cn": "Vacation Lane",
|
||||
"event_20200312_cn": "The Solomon Ranger Rerun",
|
||||
|
||||
@@ -590,6 +590,8 @@
|
||||
"name": "Campaign.Event.name",
|
||||
"help": "Campaign.Event.help",
|
||||
"campaign_main": "campaign_main",
|
||||
"event_20221124_cn": "錬金術士と謎の遺跡群島",
|
||||
"event_20210325_cn": "開かれし紺碧の砂箱(復刻)",
|
||||
"event_20201229_cn": "虚畳なりし限象(復刻)",
|
||||
"event_20211111_cn": "燈火のシニエ",
|
||||
"raid_20221027": "戦え!ロイヤルメイド隊3rd",
|
||||
@@ -633,7 +635,6 @@
|
||||
"event_20210527_tw": "微層混合",
|
||||
"event_20210429_tw": "復刻墨染的鋼鐵之花",
|
||||
"event_20210415_tw": "復刻圍剿施佩伯爵",
|
||||
"event_20210325_cn": "開かれし紺碧の砂箱(復刻)",
|
||||
"event_20210225_tw": "北境序曲",
|
||||
"event_20201126_cn": "バケーションレーン",
|
||||
"event_20200312_cn": "南洋に靡く硝煙(復刻)",
|
||||
|
||||
@@ -590,6 +590,8 @@
|
||||
"name": "活动名称",
|
||||
"help": "自动选择至最新的活动",
|
||||
"campaign_main": "主线图",
|
||||
"event_20221124_cn": "炼金术士与秘密遗迹群岛",
|
||||
"event_20210325_cn": "复刻箱庭疗法",
|
||||
"event_20201229_cn": "复刻负象限作战",
|
||||
"event_20211111_cn": "杰诺瓦的焰火",
|
||||
"raid_20221027": "战斗!皇家女仆队3rd",
|
||||
@@ -633,7 +635,6 @@
|
||||
"event_20210527_tw": "微層混合",
|
||||
"event_20210429_tw": "復刻墨染的鋼鐵之花",
|
||||
"event_20210415_tw": "復刻圍剿施佩伯爵",
|
||||
"event_20210325_cn": "复刻箱庭疗法",
|
||||
"event_20210225_tw": "北境序曲",
|
||||
"event_20201126_cn": "假日航线",
|
||||
"event_20200312_cn": "复刻斯图尔特的硝烟",
|
||||
|
||||
@@ -590,6 +590,8 @@
|
||||
"name": "活動名稱",
|
||||
"help": "自動選擇至最新的活動圖",
|
||||
"campaign_main": "主線圖",
|
||||
"event_20221124_cn": "The Alchemist and the Archipelago of Secrets",
|
||||
"event_20210325_cn": "復刻箱庭療法",
|
||||
"event_20201229_cn": "負象限作戰",
|
||||
"event_20211111_cn": "杰諾瓦的焰火",
|
||||
"raid_20221027": "Fight On Royal Maids!(Part 3)",
|
||||
@@ -633,7 +635,6 @@
|
||||
"event_20210527_tw": "微層混合",
|
||||
"event_20210429_tw": "復刻墨染的鋼鐵之花",
|
||||
"event_20210415_tw": "復刻圍剿施佩伯爵",
|
||||
"event_20210325_cn": "Ashen Simulacrum Rerun",
|
||||
"event_20210225_tw": "北境序曲",
|
||||
"event_20201126_cn": "Vacation Lane",
|
||||
"event_20200312_cn": "斯圖爾特的硝煙",
|
||||
|
||||
Reference in New Issue
Block a user