1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-26 09:25:02 +08:00

Fix: resolve merge conflicts

This commit is contained in:
nEEtdo0d
2022-02-13 14:41:30 -05:00
109 changed files with 4942 additions and 3154 deletions

View File

@@ -12,6 +12,10 @@
"name": "出擊",
"help": ""
},
"Event": {
"name": "活動",
"help": ""
},
"Reward": {
"name": "收穫",
"help": ""
@@ -50,14 +54,6 @@
"name": "主線圖",
"help": ""
},
"Event": {
"name": "活動圖",
"help": ""
},
"Raid": {
"name": "共鬥活動",
"help": ""
},
"C72MysteryFarming": {
"name": "7-2 三戰撿垃圾",
"help": ""
@@ -74,6 +70,38 @@
"name": "緊急委託刷鑽石",
"help": ""
},
"EventGeneral": {
"name": "活動通用",
"help": ""
},
"Event": {
"name": "活動圖",
"help": ""
},
"EventAb": {
"name": "活動每日AB圖",
"help": ""
},
"EventCd": {
"name": "活動每日CD圖",
"help": ""
},
"EventSp": {
"name": "活動每日SP圖",
"help": ""
},
"Raid": {
"name": "共鬥活動",
"help": ""
},
"RaidDaily": {
"name": "共鬥活動每日",
"help": ""
},
"MaritimeEscort": {
"name": "商船護航",
"help": ""
},
"Commission": {
"name": "委託",
"help": ""
@@ -130,6 +158,10 @@
"name": "大月卡",
"help": ""
},
"MetaReward": {
"name": "Meta獎勵",
"help": ""
},
"Daily": {
"name": "每日任務",
"help": ""
@@ -146,30 +178,10 @@
"name": "潛艇圖",
"help": ""
},
"EventAb": {
"name": "活動每日AB圖",
"help": ""
},
"EventCd": {
"name": "活動每日CD圖",
"help": ""
},
"EventSp": {
"name": "活動每日SP圖",
"help": ""
},
"RaidDaily": {
"name": "共鬥活動每日",
"help": ""
},
"WarArchives": {
"name": "作戰檔案",
"help": ""
},
"MaritimeEscort": {
"name": "商船護航",
"help": ""
},
"OpsiGeneral": {
"name": "通用設定",
"help": ""
@@ -443,6 +455,7 @@
"name": "活動名稱",
"help": "自動選擇至最新的活動圖",
"campaign_main": "主線圖",
"event_20220210_cn": "Northern Overture Rerun",
"raid_20220127": "Mystery Investigation",
"event_20201229_cn": "負象限作戰",
"event_20211229_cn": "Tower of Transcendence",
@@ -804,23 +817,6 @@
"S1_enemy_first": "優先攻擊小型敵人"
}
},
"Raid": {
"_info": {
"name": "共鬥活動設定",
"help": ""
},
"Mode": {
"name": "難度",
"help": "",
"easy": "簡單",
"normal": "普通",
"hard": "困難"
},
"UseTicket": {
"name": "使用演習券",
"help": ""
}
},
"C11AffinityFarming": {
"_info": {
"name": "1-1 伏擊刷好感",
@@ -918,6 +914,85 @@
"hermes": "競技神"
}
},
"EventGeneral": {
"_info": {
"name": "活動通用設置",
"help": ""
},
"PtLimit": {
"name": "活動 PT 限制",
"help": "當累計 PT 達到給定數值時禁用所有活動任務0 表示不限制,使用自律尋敵時不能即時觸發\n開啟後你只需要打開所有活動任務而不需要計算一共打多少次"
},
"TimeLimit": {
"name": "活動時間限制",
"help": "當本地時間超過給定數值後,禁用所有活動任務,'2020-01-01 00:00:00' 表示不限制,觸發一次後時間將被重置\n設置後能防止活動結束後忘記關閉任務的事情發生"
}
},
"EventAb": {
"_info": {
"name": "活動每日AB圖",
"help": ""
},
"StageFilter": {
"name": "活動每日過濾器",
"help": "按活動過濾器順序出擊"
},
"LastStage": {
"name": "上一個完成的地圖",
"help": "自動更新的數值將跳過過濾器中已完成的地圖過0點重置"
}
},
"EventCd": {
"_info": {
"name": "活動每日CD圖",
"help": ""
},
"StageFilter": {
"name": "活動每日過濾器",
"help": "按活動過濾器順序出擊"
},
"LastStage": {
"name": "上一個完成的地圖",
"help": "自動更新的數值將跳過過濾器中已完成的地圖過0點重置"
}
},
"Raid": {
"_info": {
"name": "共鬥活動設定",
"help": ""
},
"Mode": {
"name": "難度",
"help": "",
"easy": "簡單",
"normal": "普通",
"hard": "困難"
},
"UseTicket": {
"name": "使用演習券",
"help": ""
}
},
"RaidDaily": {
"_info": {
"name": "共鬥每日",
"help": "完成每日共鬥簡單普通困難"
},
"StageFilter": {
"name": "共鬥難度過濾器",
"help": ""
}
},
"MaritimeEscort": {
"_info": {
"name": "商船護航",
"help": "進一下就撤退能拿約70%的獎勵"
},
"Enable": {
"name": "啟用商船護航",
"help": ""
}
},
"Commission": {
"_info": {
"name": "委託",
@@ -1363,6 +1438,16 @@
"help": ""
}
},
"MetaReward": {
"_info": {
"name": "META 獎勵",
"help": ""
},
"MetaReward": {
"name": "領取 META 獎勵",
"help": ""
}
},
"Daily": {
"_info": {
"name": "每日任務",
@@ -1525,54 +1610,6 @@
"10": "10"
}
},
"EventAb": {
"_info": {
"name": "活動每日AB圖",
"help": ""
},
"StageFilter": {
"name": "活動每日過濾器",
"help": "按活動過濾器順序出擊"
},
"LastStage": {
"name": "上一個完成的地圖",
"help": "自動更新的數值將跳過過濾器中已完成的地圖過0點重置"
}
},
"EventCd": {
"_info": {
"name": "活動每日CD圖",
"help": ""
},
"StageFilter": {
"name": "活動每日過濾器",
"help": "按活動過濾器順序出擊"
},
"LastStage": {
"name": "上一個完成的地圖",
"help": "自動更新的數值將跳過過濾器中已完成的地圖過0點重置"
}
},
"RaidDaily": {
"_info": {
"name": "共鬥每日",
"help": "完成每日共鬥簡單普通困難"
},
"StageFilter": {
"name": "共鬥難度過濾器",
"help": ""
}
},
"MaritimeEscort": {
"_info": {
"name": "商船護航",
"help": "進一下就撤退能拿約70%的獎勵"
},
"Enable": {
"name": "啟用商船護航",
"help": ""
}
},
"OpsiAshAssist": {
"_info": {
"name": "餘燼信標支援",