mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-15 17:30:27 +08:00
feat: 添加基建计划 ToolTip 提示
This commit is contained in:
@@ -140,6 +140,9 @@ To customize rotation schedules, please use 「{key=InfrastModeCustom}」.</syst
|
||||
<system:String x:Key="CustomInfrastFileParseFailed">Base Configuration Parsing Error!</system:String>
|
||||
<system:String x:Key="CustomInfrastTitle" xml:space="preserve">Base Configuration: </system:String>
|
||||
<system:String x:Key="CustomInfrastPlan">Base Plan</system:String>
|
||||
<system:String x:Key="CustomInfrastPlanToolTip">
|
||||
If 「{key=CustomInfrastPlan}」 has execution time, it will not switch automatically before 「{key=Base}」 task starts or during task execution, and will remain in the state at {key=LinkStart}. Switching only occurs when idle or after the task is completed.
|
||||
</system:String>
|
||||
<system:String x:Key="CustomInfrastPlanIndexAutoSwitch">Auto save for next plan</system:String>
|
||||
<system:String x:Key="CustomizeInfrastSelectionEmpty">Custom Base infrastructure selection is empty. Please check your configuration or turn off the Custom Base function.</system:String>
|
||||
<system:String x:Key="General">General Mode</system:String>
|
||||
|
||||
@@ -140,6 +140,9 @@
|
||||
<system:String x:Key="CustomInfrastFileParseFailed">基地構成ファイルのパースエラー!</system:String>
|
||||
<system:String x:Key="CustomInfrastTitle" xml:space="preserve">基地構成ファイルの設定: </system:String>
|
||||
<system:String x:Key="CustomInfrastPlan">基地計画</system:String>
|
||||
<system:String x:Key="CustomInfrastPlanToolTip">
|
||||
「{key=CustomInfrastPlan}」に実行時間が設定されている場合、「{key=Base}」タスク開始前やタスク実行中には自動で切り替わらず、{key=LinkStart}時点の状態を維持します。切り替えはアイドル時またはタスク完了後のみ行われます。
|
||||
</system:String>
|
||||
<system:String x:Key="CustomInfrastPlanIndexAutoSwitch">次の計画を自動保存</system:String>
|
||||
<system:String x:Key="CustomizeInfrastSelectionEmpty">カスタム施設設定が空です。設定を確認するか、カスタマイズ機能をオフにしてください。</system:String>
|
||||
<system:String x:Key="General">一般モード</system:String>
|
||||
|
||||
@@ -140,6 +140,9 @@
|
||||
<system:String x:Key="CustomInfrastFileParseFailed">기반시설 구성 인식 실패!</system:String>
|
||||
<system:String x:Key="CustomInfrastTitle" xml:space="preserve">기반시설 구성: </system:String>
|
||||
<system:String x:Key="CustomInfrastPlan">기반시설 계획</system:String>
|
||||
<system:String x:Key="CustomInfrastPlanToolTip">
|
||||
「{key=CustomInfrastPlan}」에 실행 시간이 존재할 경우, 「{key=Base}」 작업 시작 전이나 작업 중에는 자동으로 전환되지 않으며, {key=LinkStart} 상태를 유지합니다. 전환은 오직 대기 중이거나 작업이 완료된 후에만 이루어집니다.
|
||||
</system:String>
|
||||
<system:String x:Key="CustomInfrastPlanIndexAutoSwitch">다음 계획용으로 자동 저장</system:String>
|
||||
<system:String x:Key="CustomizeInfrastSelectionEmpty">커스텀 시설 설정 선택이 비어 있습니다. 구성을 확인하거나 커스텀 기능을 끄세요.</system:String>
|
||||
<system:String x:Key="General">일반 모드</system:String>
|
||||
|
||||
@@ -140,6 +140,9 @@
|
||||
<system:String x:Key="CustomInfrastFileParseFailed">自定义基建配置文件解析错误!</system:String>
|
||||
<system:String x:Key="CustomInfrastTitle" xml:space="preserve">自定义基建配置: </system:String>
|
||||
<system:String x:Key="CustomInfrastPlan">基建计划</system:String>
|
||||
<system:String x:Key="CustomInfrastPlanToolTip">
|
||||
如 「{key=CustomInfrastPlan}」 存在执行时间,「{key=Base}」 任务开始前或任务运行时不会自动切换,将保持 {key=LinkStart} 时的状态,仅在空闲或任务完成后切换。
|
||||
</system:String>
|
||||
<system:String x:Key="CustomInfrastPlanIndexAutoSwitch">自动保存为下个计划</system:String>
|
||||
<system:String x:Key="CustomizeInfrastSelectionEmpty">自定义设施配置选择为空,请检查配置或关闭自定义功能。</system:String>
|
||||
<system:String x:Key="General">通用模式</system:String>
|
||||
|
||||
@@ -139,6 +139,9 @@
|
||||
<system:String x:Key="CustomInfrastFileParseFailed">自定義基建配置檔案解析錯誤!</system:String>
|
||||
<system:String x:Key="CustomInfrastTitle" xml:space="preserve">自定義基建配置: </system:String>
|
||||
<system:String x:Key="CustomInfrastPlan">基建計劃</system:String>
|
||||
<system:String x:Key="CustomInfrastPlanToolTip">
|
||||
若 「{key=CustomInfrastPlan}」 存在執行時間,則在 「{key=Base}」 任務開始前或任務執行時不會自動切換,將保持 {key=LinkStart} 狀態,僅於空閒或任務完成後才會切換。
|
||||
</system:String>
|
||||
<system:String x:Key="CustomInfrastPlanIndexAutoSwitch">自動保存爲下個計劃</system:String>
|
||||
<system:String x:Key="CustomizeInfrastSelectionEmpty">自訂設施配置選擇為空,請檢查配置或關閉自訂功能。</system:String>
|
||||
<system:String x:Key="General">通用模式</system:String>
|
||||
|
||||
@@ -1617,18 +1617,6 @@ namespace MaaWpfGui.ViewModels.UI
|
||||
Instances.AsstProxy.AsstSetTaskParamsEncoded(id, taskParams);
|
||||
}
|
||||
|
||||
public static void SetInfrastParams()
|
||||
{
|
||||
int id = Instances.AsstProxy.TasksStatus.FirstOrDefault(i => i.Value.Type == TaskType.Infrast).Key;
|
||||
if (id == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var taskParams = InfrastSettingsUserControlModel.Instance.Serialize().Params;
|
||||
Instances.AsstProxy.AsstSetTaskParamsEncoded(id, taskParams);
|
||||
}
|
||||
|
||||
public bool AppendInfrast()
|
||||
{
|
||||
if (InfrastTask.InfrastMode == InfrastMode.Custom && (!File.Exists(InfrastTask.CustomInfrastFile) || InfrastTask.CustomInfrastPlanInfoList.Count == 0))
|
||||
|
||||
@@ -435,7 +435,6 @@ public class InfrastSettingsUserControlModel : TaskViewModel
|
||||
}
|
||||
|
||||
SetAndNotify(ref _customInfrastPlanIndex, value);
|
||||
TaskQueueViewModel.SetInfrastParams();
|
||||
ConfigurationHelper.SetValue(ConfigurationKeys.CustomInfrastPlanIndex, value.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,17 +44,29 @@
|
||||
SelectedValuePath="Value" />
|
||||
</StackPanel>
|
||||
<StackPanel d:Visibility="Visible" Visibility="{c:Binding 'InfrastMode == ui:InfrastMode.Custom', Source={x:Static ui:InfrastSettingsUserControlModel.Instance}}">
|
||||
<hc:ComboBox
|
||||
Margin="0,4"
|
||||
VerticalContentAlignment="Center"
|
||||
hc:InfoElement.Title="{DynamicResource CustomInfrastPlan}"
|
||||
DisplayMemberPath="Display"
|
||||
<StackPanel Margin="0,4">
|
||||
<StackPanel Margin="0,0,0,5" Orientation="Horizontal">
|
||||
<controls:TextBlock
|
||||
Margin="8,0,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Text="{DynamicResource CustomInfrastPlan}" />
|
||||
<controls:TooltipBlock
|
||||
VerticalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
TooltipText="{DynamicResource CustomInfrastPlanToolTip}" />
|
||||
</StackPanel>
|
||||
<ComboBox
|
||||
Margin="0,4"
|
||||
VerticalContentAlignment="Center"
|
||||
d:IsHitTestVisible="True"
|
||||
DisplayMemberPath="Display"
|
||||
IsHitTestVisible="{c:Binding !IsCurrentTaskRunning,
|
||||
Source={x:Static setting:TaskQueueViewModel.TaskSettingVisibilities}}"
|
||||
ItemsSource="{Binding CustomInfrastPlanList}"
|
||||
SelectedValue="{Binding CustomInfrastPlanIndex}"
|
||||
SelectedValuePath="Value" />
|
||||
ItemsSource="{Binding CustomInfrastPlanList}"
|
||||
SelectedValue="{Binding CustomInfrastPlanIndex}"
|
||||
SelectedValuePath="Value" />
|
||||
</StackPanel>
|
||||
<controls:TextBlock
|
||||
Margin="0,5"
|
||||
HorizontalAlignment="Center"
|
||||
|
||||
Reference in New Issue
Block a user