fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复奇怪的合并冲突

Browse Source 
fix 0e5eae1060
This commit is contained in:
zzyyyl
2023-02-14 20:09:51 +08:00
parent 96f5a90859
commit 29146e8baa
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MaaWpfGui/Main/SettingsViewModel.cs
View File

@@ -2323,16 +2323,8 @@ namespace MaaWpfGui
set
{
SetAndNotify(ref _customStageCode, value);
<<<<<<< HEAD
ViewStatusStorage.Set("GUI.CustomStageCode", value.ToString());
_taskQueueViewModel.CustomStageCode = value;
=======
var mainModel = _container.Get<TaskQueueViewModel>();
mainModel.RemainingSanityStageDisplay1 = UseRemainingSanityStage && !value;
mainModel.RemainingSanityStageDisplay2 = UseRemainingSanityStage && value;
mainModel.CustomStageCode = value;
ViewStatusStorage.Set("GUI.CustomStageCode", value.ToString());
>>>>>>> stable
}
}