1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-24 18:19:04 +08:00

Fix: merge conflict

This commit is contained in:
SarContDeli
2022-11-11 14:31:05 +08:00
parent 1f38e92e02
commit 65c0699b37
4 changed files with 12 additions and 17 deletions

View File

@@ -589,6 +589,7 @@
"name": "Campaign.Event.name",
"help": "Campaign.Event.help",
"campaign_main": "campaign_main",
"event_20201229_cn": "虚畳なりし限象(復刻)",
"event_20211111_cn": "燈火のシニエ",
"raid_20221027": "戦えロイヤルメイド隊3rd",
"event_20210121_cn": "悲歎せし焔海の詩(復刻)",

View File

@@ -589,7 +589,7 @@
"name": "活動名稱",
"help": "自動選擇至最新的活動圖",
"campaign_main": "主線圖",
"event_20201229_cn": "Inverted Orthant Rerun",
"event_20201229_cn": "負象限作戰",
"event_20211111_cn": "杰諾瓦的焰火",
"raid_20221027": "Fight On Royal Maids!(Part 3)",
"event_20210121_cn": "復刻神聖的悲喜劇",