mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-18 09:11:31 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
SevCrane
@@ -74,10 +74,13 @@
|
||||
"name": "Event-2",
|
||||
"help": ""
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"Event3": {
|
||||
"name": "Task.Event3.name",
|
||||
"help": "Task.Event3.help"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Raid": {
|
||||
"name": "Raid",
|
||||
"help": ""
|
||||
@@ -1155,6 +1158,7 @@
|
||||
"ship": "Change Ship",
|
||||
"ship_equip": "Change Ship + Gears"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"ALLowLowVanguardLevel": {
|
||||
"name": "ALLow Low Vanguard Level",
|
||||
"help": "Destroyers over level 10 will now be used, 49 for Event CD"
|
||||
@@ -1170,6 +1174,8 @@
|
||||
"name": "GemsFarming.StopIFAutoNotEnsured.name",
|
||||
"help": "GemsFarming.StopIFAutoNotEnsured.help"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"CommonDD": {
|
||||
"name": "Flagship Common DD Preference",
|
||||
"help": "",
|
||||
@@ -2120,6 +2126,7 @@
|
||||
"name": "Exercise Settings",
|
||||
"help": "Runs exercise and automatically retreats when sum HP volume is low"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"DelayUntilHoursBeforeNextUpdate": {
|
||||
"name": "Exercise.DelayUntilHoursBeforeNextUpdate.name",
|
||||
"help": "Exercise.DelayUntilHoursBeforeNextUpdate.help",
|
||||
@@ -2130,6 +2137,8 @@
|
||||
"5": "5",
|
||||
"12": "12"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"OpponentChooseMode": {
|
||||
"name": "Opponent Choose Mode",
|
||||
"help": "",
|
||||
@@ -2286,6 +2295,7 @@
|
||||
"3": "3",
|
||||
"4": "4"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"FleetMode": {
|
||||
"name": "Fleet Mode",
|
||||
"help": "",
|
||||
@@ -2294,6 +2304,8 @@
|
||||
"stand_still_in_the_middle": "stand_still_in_the_middle",
|
||||
"hide_in_bottom_left": "hide_in_bottom_left"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Submarine": {
|
||||
"name": "Call Submarine",
|
||||
"help": "If enabled, interval increases from 30 to 60 minutes instead"
|
||||
@@ -2503,6 +2515,7 @@
|
||||
"help": "Log back into the game when the game has been ended."
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"GGHandler": {
|
||||
"_info": {
|
||||
"name": "GG Handler",
|
||||
@@ -2800,6 +2813,8 @@
|
||||
"help": "GuildCoin.Record.help"
|
||||
}
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Storage": {
|
||||
"_info": {
|
||||
"name": "Task status",
|
||||
@@ -2824,8 +2839,11 @@
|
||||
"Stop": "Stop",
|
||||
"ScrollON": "Auto Scroll ON",
|
||||
"ScrollOFF": "Auto Scroll OFF",
|
||||
<<<<<<< HEAD
|
||||
"DashboardON": "Fold",
|
||||
"DashboardOFF": "Unfold",
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"ClearLog": "Clear Log",
|
||||
"Setting": "Setting",
|
||||
"CheckUpdate": "Check update",
|
||||
@@ -2858,6 +2876,7 @@
|
||||
},
|
||||
"Overview": {
|
||||
"Scheduler": "Scheduler",
|
||||
<<<<<<< HEAD
|
||||
"Dashboard": "Gui.Overview.Dashboard",
|
||||
"SecondsAgo": "Seconds ago",
|
||||
"MinutesAgo": "Minutes ago",
|
||||
@@ -2878,6 +2897,8 @@
|
||||
"Medal": "Medal",
|
||||
"Core": "Core Data",
|
||||
"GuildCoin": "Guild Coin",
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Log": "Log",
|
||||
"Running": "Running",
|
||||
"Pending": "Pending",
|
||||
|
||||
@@ -74,10 +74,13 @@
|
||||
"name": "イベント海域-2",
|
||||
"help": ""
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"Event3": {
|
||||
"name": "Task.Event3.name",
|
||||
"help": "Task.Event3.help"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Raid": {
|
||||
"name": "Raid",
|
||||
"help": ""
|
||||
@@ -1139,6 +1142,7 @@
|
||||
"ship": "ship",
|
||||
"ship_equip": "ship_equip"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"ALLowLowVanguardLevel": {
|
||||
"name": "GemsFarming.ALLowLowVanguardLevel.name",
|
||||
"help": "GemsFarming.ALLowLowVanguardLevel.help"
|
||||
@@ -1154,6 +1158,8 @@
|
||||
"name": "GemsFarming.StopIFAutoNotEnsured.name",
|
||||
"help": "GemsFarming.StopIFAutoNotEnsured.help"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"CommonCV": {
|
||||
"name": "GemsFarming.CommonCV.name",
|
||||
"help": "GemsFarming.CommonCV.help",
|
||||
@@ -2120,6 +2126,7 @@
|
||||
"name": "Exercise._info.name",
|
||||
"help": "Exercise._info.help"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"DelayUntilHoursBeforeNextUpdate": {
|
||||
"name": "Exercise.DelayUntilHoursBeforeNextUpdate.name",
|
||||
"help": "Exercise.DelayUntilHoursBeforeNextUpdate.help",
|
||||
@@ -2130,6 +2137,8 @@
|
||||
"5": "5",
|
||||
"12": "12"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"OpponentChooseMode": {
|
||||
"name": "Exercise.OpponentChooseMode.name",
|
||||
"help": "Exercise.OpponentChooseMode.help",
|
||||
@@ -2286,6 +2295,7 @@
|
||||
"3": "3",
|
||||
"4": "4"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"FleetMode": {
|
||||
"name": "OpsiFleet.FleetMode.name",
|
||||
"help": "OpsiFleet.FleetMode.help",
|
||||
@@ -2294,6 +2304,8 @@
|
||||
"stand_still_in_the_middle": "stand_still_in_the_middle",
|
||||
"hide_in_bottom_left": "hide_in_bottom_left"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Submarine": {
|
||||
"name": "OpsiFleet.Submarine.name",
|
||||
"help": "OpsiFleet.Submarine.help"
|
||||
@@ -2503,6 +2515,7 @@
|
||||
"help": "GameManager.AutoRestart.help"
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"GGHandler": {
|
||||
"_info": {
|
||||
"name": "GGHandler._info.name",
|
||||
@@ -2800,6 +2813,8 @@
|
||||
"help": "GuildCoin.Record.help"
|
||||
}
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Storage": {
|
||||
"_info": {
|
||||
"name": "Storage._info.name",
|
||||
@@ -2824,8 +2839,11 @@
|
||||
"Stop": "中止",
|
||||
"ScrollON": "自動スクロール ON",
|
||||
"ScrollOFF": "自動スクロール OFF",
|
||||
<<<<<<< HEAD
|
||||
"DashboardON": "Gui.Button.DashboardON",
|
||||
"DashboardOFF": "Gui.Button.DashboardOFF",
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"ClearLog": "ログクリーニング",
|
||||
"Setting": "設定",
|
||||
"CheckUpdate": "アップデータチェック",
|
||||
@@ -2858,6 +2876,7 @@
|
||||
},
|
||||
"Overview": {
|
||||
"Scheduler": "スケジューラー",
|
||||
<<<<<<< HEAD
|
||||
"Dashboard": "Gui.Overview.Dashboard",
|
||||
"SecondsAgo": "Seconds ago",
|
||||
"MinutesAgo": "Minutes ago",
|
||||
@@ -2878,6 +2897,8 @@
|
||||
"Medal": "Medal",
|
||||
"Core": "Core Data",
|
||||
"GuildCoin": "Guild Coin",
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Log": "ログ",
|
||||
"Running": "実行中",
|
||||
"Pending": "隊列中",
|
||||
|
||||
@@ -74,10 +74,13 @@
|
||||
"name": "活动图-2",
|
||||
"help": ""
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"Event3": {
|
||||
"name": "活动图-3",
|
||||
"help": ""
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Raid": {
|
||||
"name": "共斗活动",
|
||||
"help": ""
|
||||
@@ -1150,11 +1153,16 @@
|
||||
},
|
||||
"ChangeVanguard": {
|
||||
"name": "更换前排",
|
||||
<<<<<<< HEAD
|
||||
"help": "当前排红脸时更换前排，选择不更换则会强制红脸出击\n换前排通过找一艘心情不低于16、等级100的白鹰白皮驱逐完成，所以尽量保证有足够多的驱逐。国服以外则为等级70的白鹰白船驱逐。\n\n换装备只会更换正在装备中的栏位，即使是白装也会更换。如果指定了旗舰，则会更换全部5个装备，未指定旗舰只会更换设备。",
|
||||
=======
|
||||
"help": "当前排红脸时更换前排，选择不更换则会强制红脸出击\n换前排通过找一艘心情不低于10、等级100的白鹰白皮驱逐完成，所以尽量保证有足够多的驱逐。国服以外则为等级70的白鹰白船驱逐。\n\n换装备只会更换正在装备中的栏位，即使是白装也会更换。前排会更换全部5个装备。",
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"disabled": "不更换",
|
||||
"ship": "更换舰船",
|
||||
"ship_equip": "更换舰船 + 装备"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"ALLowLowVanguardLevel": {
|
||||
"name": "可更换低等级前排",
|
||||
"help": "倍率打开时，前排等级限制改为10以上即可。若为困难模式（如CD图）改为49级。"
|
||||
@@ -1170,6 +1178,8 @@
|
||||
"name": "无法设置职能时停止任务",
|
||||
"help": "无法设置舰队职能时，以以下方式停止任务以免跨队队伍出击，石油被大量消耗：\n若设置了错误推送则推送任务停止的消息并停止该任务。\n若没有设置错误推送，则直接停止Alas。"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"CommonDD": {
|
||||
"name": "指定前排",
|
||||
"help": "",
|
||||
@@ -2120,6 +2130,7 @@
|
||||
"name": "演习",
|
||||
"help": "打演习，血量过低时自动撤退"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"DelayUntilHoursBeforeNextUpdate": {
|
||||
"name": "推迟演习至下次更新次数前 X 小时",
|
||||
"help": "",
|
||||
@@ -2130,6 +2141,8 @@
|
||||
"5": "5",
|
||||
"12": "不推迟"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"OpponentChooseMode": {
|
||||
"name": "对手选择模式",
|
||||
"help": "",
|
||||
@@ -2286,6 +2299,7 @@
|
||||
"3": "3",
|
||||
"4": "4"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"FleetMode": {
|
||||
"name": "自律模式",
|
||||
"help": "",
|
||||
@@ -2294,6 +2308,8 @@
|
||||
"stand_still_in_the_middle": "中路站桩",
|
||||
"hide_in_bottom_left": "躲左下角"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Submarine": {
|
||||
"name": "呼叫潜艇",
|
||||
"help": "开启后，运行间隔将增加至60分钟"
|
||||
@@ -2503,6 +2519,7 @@
|
||||
"help": "游戏被强制结束后自动登录游戏"
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"GGHandler": {
|
||||
"_info": {
|
||||
"name": "GG管理器",
|
||||
@@ -2800,6 +2817,8 @@
|
||||
"help": "GuildCoin.Record.help"
|
||||
}
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Storage": {
|
||||
"_info": {
|
||||
"name": "任务状态",
|
||||
@@ -2824,8 +2843,11 @@
|
||||
"Stop": "停止",
|
||||
"ScrollON": "自动滚动 开",
|
||||
"ScrollOFF": "自动滚动 关",
|
||||
<<<<<<< HEAD
|
||||
"DashboardON": "折叠",
|
||||
"DashboardOFF": "展开",
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"ClearLog": "清空日志",
|
||||
"Setting": "设置",
|
||||
"CheckUpdate": "检查更新",
|
||||
@@ -2858,6 +2880,7 @@
|
||||
},
|
||||
"Overview": {
|
||||
"Scheduler": "调度器",
|
||||
<<<<<<< HEAD
|
||||
"Dashboard": "仪表盘",
|
||||
"SecondsAgo": "秒前",
|
||||
"MinutesAgo": "分钟前",
|
||||
@@ -2878,6 +2901,8 @@
|
||||
"Medal": "勋章",
|
||||
"Core": "核心数据",
|
||||
"GuildCoin": "舰队币",
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Log": "日志",
|
||||
"Running": "运行中",
|
||||
"Pending": "队列中",
|
||||
|
||||
@@ -74,10 +74,13 @@
|
||||
"name": "活動圖-2",
|
||||
"help": ""
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"Event3": {
|
||||
"name": "活動圖-3",
|
||||
"help": ""
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Raid": {
|
||||
"name": "共鬥活動",
|
||||
"help": ""
|
||||
@@ -1150,11 +1153,16 @@
|
||||
},
|
||||
"ChangeVanguard": {
|
||||
"name": "更換前排",
|
||||
<<<<<<< HEAD
|
||||
"help": "當前排紅臉時更換前排，選擇不更換則會強制紅臉出擊\n換前排通過找一艘心情不低於16、等級70的白鷹白船驅逐完成，所以盡量保證有足夠多的驅逐。國服則為等級100的白鷹白船驅逐。\n\n換裝備只會更換正在裝備中的欄位，即使是白裝也會更換。如果指定了旗艦，則會更換全部5個裝備，未指定旗艦隻會更換設備。",
|
||||
=======
|
||||
"help": "當前排紅臉時更換前排，選擇不更換則會強制紅臉出擊\n換前排通過找一艘心情不低於10、等級70的白鷹白船驅逐完成，所以盡量保證有足夠多的驅逐。國服則為等級100的白鷹白船驅逐。\n\n換裝備只會更換正在裝備中的欄位，即使是白裝也會更換。前排會更換全部5個裝備。",
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"disabled": "不更换",
|
||||
"ship": "更換艦船",
|
||||
"ship_equip": "更換艦船 + 裝備"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"ALLowLowVanguardLevel": {
|
||||
"name": "可更換低等級前排",
|
||||
"help": "倍率打開時，前排等級限制改為10以上即可"
|
||||
@@ -1170,6 +1178,8 @@
|
||||
"name": "GemsFarming.StopIFAutoNotEnsured.name",
|
||||
"help": "GemsFarming.StopIFAutoNotEnsured.help"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"CommonDD": {
|
||||
"name": "指定前排",
|
||||
"help": "",
|
||||
@@ -2120,6 +2130,7 @@
|
||||
"name": "演習",
|
||||
"help": "打演習，血量過低時自動撤退"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"DelayUntilHoursBeforeNextUpdate": {
|
||||
"name": "Exercise.DelayUntilHoursBeforeNextUpdate.name",
|
||||
"help": "Exercise.DelayUntilHoursBeforeNextUpdate.help",
|
||||
@@ -2130,6 +2141,8 @@
|
||||
"5": "5",
|
||||
"12": "12"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"OpponentChooseMode": {
|
||||
"name": "對手選擇模式",
|
||||
"help": "",
|
||||
@@ -2286,6 +2299,7 @@
|
||||
"3": "3",
|
||||
"4": "4"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"FleetMode": {
|
||||
"name": "自律模式",
|
||||
"help": "",
|
||||
@@ -2294,6 +2308,8 @@
|
||||
"stand_still_in_the_middle": "中路站樁",
|
||||
"hide_in_bottom_left": "躲左下角"
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Submarine": {
|
||||
"name": "呼叫潛艇",
|
||||
"help": "開啟後，運行間隔將增加至60分鐘"
|
||||
@@ -2503,6 +2519,7 @@
|
||||
"help": "遊戲被強制結束後自動登錄遊戲"
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"GGHandler": {
|
||||
"_info": {
|
||||
"name": "GG管理器",
|
||||
@@ -2800,6 +2817,8 @@
|
||||
"help": "GuildCoin.Record.help"
|
||||
}
|
||||
},
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Storage": {
|
||||
"_info": {
|
||||
"name": "任務狀態",
|
||||
@@ -2824,8 +2843,11 @@
|
||||
"Stop": "停止",
|
||||
"ScrollON": "自動滾動 開",
|
||||
"ScrollOFF": "自動滾動 關",
|
||||
<<<<<<< HEAD
|
||||
"DashboardON": "開",
|
||||
"DashboardOFF": "關",
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"ClearLog": "清空日誌",
|
||||
"Setting": "設定",
|
||||
"CheckUpdate": "檢查更新",
|
||||
@@ -2858,6 +2880,7 @@
|
||||
},
|
||||
"Overview": {
|
||||
"Scheduler": "調度器",
|
||||
<<<<<<< HEAD
|
||||
"Dashboard": "Gui.Overview.Dashboard",
|
||||
"SecondsAgo": "秒前",
|
||||
"MinutesAgo": "分鐘前",
|
||||
@@ -2878,6 +2901,8 @@
|
||||
"Medal": "勳章",
|
||||
"Core": "覈心數據",
|
||||
"GuildCoin": "艦隊幣",
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Log": "日誌",
|
||||
"Running": "執行中",
|
||||
"Pending": "佇列中",
|
||||
|
||||
Reference in New Issue
Block a user