diff --git a/resource/roguelike/Sami/autopilot/巍峨银凇.json b/resource/roguelike/Sami/autopilot/巍峨银凇.json index 4ee8bcc5c8..11118a526e 100644 --- a/resource/roguelike/Sami/autopilot/巍峨银凇.json +++ b/resource/roguelike/Sami/autopilot/巍峨银凇.json @@ -28,6 +28,22 @@ }, { "groups": [ + "投锋", + "挡人先锋" + ], + "location": [ + 10, + 6 + ], + "direction": "right", + "condition": [ + 0, + 2 + ] + }, + { + "groups": [ + "焰苇", "奶", "凯尔希", "召唤" @@ -40,11 +56,11 @@ }, { "groups": [ - "回费" + "情报官" ], "location": [ 4, - 6 + 5 ], "direction": "up", "condition": [ @@ -63,7 +79,7 @@ ], "direction": "right", "condition": [ - 1, + 2, 9 ] }, @@ -107,8 +123,8 @@ "单奶" ], "location": [ - 6, - 6 + 7, + 5 ], "direction": "right", "condition": [ @@ -210,7 +226,7 @@ ], "direction": "right", "condition": [ - 1, + 2, 60 ] }, @@ -231,6 +247,23 @@ 60 ] }, + { + "groups": [ + "地面阻挡", + "处决者", + "地刺", + "其他地面" + ], + "location": [ + 6, + 4 + ], + "direction": "up", + "condition": [ + 1, + 60 + ] + }, { "groups": [ "补给站" diff --git a/resource/roguelike/Sami/autopilot/狡兽九窟.json b/resource/roguelike/Sami/autopilot/狡兽九窟.json index d6e66ba6ec..35cf0ddff5 100644 --- a/resource/roguelike/Sami/autopilot/狡兽九窟.json +++ b/resource/roguelike/Sami/autopilot/狡兽九窟.json @@ -121,7 +121,8 @@ "狙击", "高台输出", "盾法", - "辅助" + "辅助", + "其他高台" ], "location": [ 7, @@ -129,10 +130,24 @@ ], "direction": "right" }, + { + "groups": [ + "高台输出", + "盾法", + "辅助", + "其他高台", + "奶" + ], + "location": [ + 7, + 2 + ], + "direction": "right" + }, { "groups": [ "狙击", - "高台输出" + "速狙" ], "location": [ 1, @@ -212,4 +227,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/resource/roguelike/Sami/recruitment.json b/resource/roguelike/Sami/recruitment.json index 62a4948067..8c4ac6e765 100644 --- a/resource/roguelike/Sami/recruitment.json +++ b/resource/roguelike/Sami/recruitment.json @@ -1070,7 +1070,8 @@ { "name": "纯烬艾雅法拉", "skill": 1, - "recruit_priority": 699, + "is_key": true, + "recruit_priority": 799, "promote_priority": 590, "recruit_priority_offsets": [ { @@ -1562,7 +1563,7 @@ "name": "夜莺", "skill": 3, "alternate_skill": 2, - "recruit_priority": 808, + "recruit_priority": 708, "promote_priority": 677, "recruit_priority_offsets": [ { @@ -1578,7 +1579,7 @@ { "name": "白面鸮", "skill": 2, - "recruit_priority": 810, + "recruit_priority": 710, "promote_priority": 406, "recruit_priority_offsets": [ { @@ -1920,7 +1921,6 @@ } ] }, - { "name": "情报官", "opers": [ @@ -1932,7 +1932,6 @@ "skill": 2, "recruit_priority": 677, "promote_priority": 430, - "is_key": true, "recruit_priority_offsets": [ { "groups": [ @@ -1950,7 +1949,6 @@ "skill": 2, "recruit_priority": 551, "promote_priority": 400, - "is_key": true, "recruit_priority_offsets": [ { "groups": [ diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index 05a16bf129..bd643360ad 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -102,7 +102,7 @@ 若启用自定义换班,该字段仅针对 autofill 和使用干员编组的房间有效 刷等级,尽可能稳定地打更多层数 刷源石锭,到达第二层后直接退出 - 烧开水,到达第三层后直接退出 + 烧热水,到达第三层后直接退出 开局分队 开局职业组 开局干员 (单个) diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 525e753d1b..1c5e24c68d 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -102,7 +102,7 @@ 若啟用自定義換班,該欄位僅針對 autofill 和 幹員編組 的房間有效 刷等級,盡可能穩定地打更多層數 刷源石錠,到達第二層後直接退出 - 燒開水,到達第三層後直接退出 + 燒熱水,到達第三層後直接退出 開局分隊 開局職業組 開局幹員(單個) diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index 2c97b29a50..7d2765ecd7 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -1593,7 +1593,7 @@ namespace MaaWpfGui.ViewModels.UI private string _roguelikeMode = ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeMode, "0"); /// - /// 策略,往后打 / 刷一层就退 / 烧开水 + /// 策略,往后打 / 刷一层就退 / 烧热水 /// public string RoguelikeMode {