diff --git a/Protobuf/Protobuf.csproj b/Protobuf/Protobuf.csproj index ea14b02..088c25b 100644 --- a/Protobuf/Protobuf.csproj +++ b/Protobuf/Protobuf.csproj @@ -6,6 +6,6 @@ - + diff --git a/Qwilight/Compute/AutoCompute.cs b/Qwilight/Compute/AutoCompute.cs index 040ea48..13f7b87 100644 --- a/Qwilight/Compute/AutoCompute.cs +++ b/Qwilight/Compute/AutoCompute.cs @@ -7,8 +7,6 @@ { public class AutoCompute : DefaultCompute { - public override bool IsPointVisible => true; - public override bool CanPause => false; public override bool IsPassable => false; diff --git a/Qwilight/Compute/CommentCompute.cs b/Qwilight/Compute/CommentCompute.cs index 0df67b1..94b9998 100644 --- a/Qwilight/Compute/CommentCompute.cs +++ b/Qwilight/Compute/CommentCompute.cs @@ -7,8 +7,6 @@ { public sealed class CommentCompute : DefaultCompute { - public override bool IsPointVisible => true; - public override bool IsPassable => false; public override bool IsEscapable => false; diff --git a/Qwilight/Compute/DefaultCompute.cs b/Qwilight/Compute/DefaultCompute.cs index 3494026..bf1c66e 100644 --- a/Qwilight/Compute/DefaultCompute.cs +++ b/Qwilight/Compute/DefaultCompute.cs @@ -412,8 +412,6 @@ public Event.Types.DrawingComponent NetDrawingComponentValue { get; set; } - public virtual bool IsPointVisible => false; - public virtual bool CanPause => WwwLevelDataValue?.AllowPause != false; public virtual bool CanUndo => WwwLevelDataValue?.AllowPause != false; @@ -594,6 +592,7 @@ { Configure.Instance.NotifyTutorial(Configure.TutorialID.SetUndoModifySalt); } + ViewModels.Instance.MainValue.SetPragmatic(); } } } diff --git a/Qwilight/Compute/IOCompute.cs b/Qwilight/Compute/IOCompute.cs index d6face8..e10969a 100644 --- a/Qwilight/Compute/IOCompute.cs +++ b/Qwilight/Compute/IOCompute.cs @@ -7,8 +7,6 @@ { public sealed class IOCompute : DefaultCompute { - public override bool IsPointVisible => true; - public override bool IsPowered => false; public override bool CanPause => false; diff --git a/Qwilight/System/AudioSystem/AudioSystem.cs b/Qwilight/System/AudioSystem/AudioSystem.cs index 37ad866..e1d8229 100644 --- a/Qwilight/System/AudioSystem/AudioSystem.cs +++ b/Qwilight/System/AudioSystem/AudioSystem.cs @@ -385,7 +385,7 @@ _targetSystem.setSoftwareChannels(Channel); _targetSystem.getSoftwareFormat(out var rate, out _, out _); _rate = (int)(rate / 1000.0); - _targetSystem.setDSPBufferSize(Configure.Instance.AudioDataLength, 4); + _targetSystem.setDSPBufferSize(Configure.Instance.AudioDataLength, 2); _targetSystem.init(Channel, INITFLAGS.NORMAL, nint.Zero); for (var audioVariety = SEAudio; audioVariety >= MainAudio; --audioVariety) diff --git a/Qwilight/ViewModel/MainViewModel.cs b/Qwilight/ViewModel/MainViewModel.cs index fb4ee92..79f76ce 100644 --- a/Qwilight/ViewModel/MainViewModel.cs +++ b/Qwilight/ViewModel/MainViewModel.cs @@ -246,9 +246,9 @@ public bool IsPragmatic { get; set; } - void SetPragmatic() + public void SetPragmatic() { - IsPragmatic = !IsWPFViewVisible && IsComputingMode && !Computer.IsPausing; + IsPragmatic = !IsWPFViewVisible && IsComputingMode && !Computer.IsPausingWindowOpened; if (IsPragmatic) { var lazyGC = Configure.Instance.LazyGCV2 * 1000L * 1000L; @@ -447,7 +447,6 @@ public void NotifyIsPausing() { OnPropertyChanged(nameof(IsPausing)); - SetPragmatic(); } public Fading FadingValue { get; } = new(); @@ -1107,7 +1106,7 @@ if (StrongReferenceMessenger.Default.Send(new ViewAllowWindow { Text = LanguageSystem.Instance.WipeNoteFileNotify, - Data = MESSAGEBOX_STYLE.MB_YESNO | MESSAGEBOX_STYLE.MB_ICONQUESTION | MESSAGEBOX_STYLE.MB_DEFBUTTON1 + Data = MESSAGEBOX_STYLE.MB_YESNO | MESSAGEBOX_STYLE.MB_ICONQUESTION | MESSAGEBOX_STYLE.MB_DEFBUTTON2 }) == MESSAGEBOX_RESULT.IDYES) { var targetNoteFile = EntryItemValue.NoteFile; @@ -1122,7 +1121,7 @@ if (StrongReferenceMessenger.Default.Send(new ViewAllowWindow { Text = LanguageSystem.Instance.WipeEntryItemNotify, - Data = MESSAGEBOX_STYLE.MB_YESNO | MESSAGEBOX_STYLE.MB_ICONQUESTION | MESSAGEBOX_STYLE.MB_DEFBUTTON1 + Data = MESSAGEBOX_STYLE.MB_YESNO | MESSAGEBOX_STYLE.MB_ICONQUESTION | MESSAGEBOX_STYLE.MB_DEFBUTTON2 }) == MESSAGEBOX_RESULT.IDYES) { Utility.WipeEntry(EntryItemValue.EntryPath); @@ -1137,7 +1136,7 @@ if (StrongReferenceMessenger.Default.Send(new ViewAllowWindow { Text = LanguageSystem.Instance.WipeEventNoteNotify, - Data = MESSAGEBOX_STYLE.MB_YESNO | MESSAGEBOX_STYLE.MB_ICONQUESTION | MESSAGEBOX_STYLE.MB_DEFBUTTON1 + Data = MESSAGEBOX_STYLE.MB_YESNO | MESSAGEBOX_STYLE.MB_ICONQUESTION | MESSAGEBOX_STYLE.MB_DEFBUTTON2 }) == MESSAGEBOX_RESULT.IDYES) { DB.Instance.WipeEventNote(eventNoteID); @@ -1155,7 +1154,7 @@ if (StrongReferenceMessenger.Default.Send(new ViewAllowWindow { Text = defaultEntryItem.WipeNotify, - Data = MESSAGEBOX_STYLE.MB_YESNO | MESSAGEBOX_STYLE.MB_ICONQUESTION | MESSAGEBOX_STYLE.MB_DEFBUTTON1 + Data = MESSAGEBOX_STYLE.MB_YESNO | MESSAGEBOX_STYLE.MB_ICONQUESTION | MESSAGEBOX_STYLE.MB_DEFBUTTON2 }) == MESSAGEBOX_RESULT.IDYES) { Configure.Instance.DefaultEntryItems.Remove(defaultEntryItem);