diff --git a/Qwilight/ModeComponent.cs b/Qwilight/ModeComponent.cs
index 17caa04..b36d47b 100644
--- a/Qwilight/ModeComponent.cs
+++ b/Qwilight/ModeComponent.cs
@@ -89,6 +89,7 @@
FaintNoteMode _faintNoteMode;
JudgmentMode _judgmentMode = JudgmentMode.Default;
HitPointsMode _hitPointsMode = HitPointsMode.Highest;
+ HitPointsMode _handlingHitPointsMode = HitPointsMode.Highest;
NoteMobilityMode _noteMobilityMode;
LongNoteMode _longNoteMode;
InputFavorMode _inputFavorMode;
@@ -113,27 +114,27 @@
public ModeComponent()
{
- ComponentValue = new Component(BPM);
+ ComponentValue = new(BPM);
}
public ModeComponent(Computing valueComputing, JSON.TwilightQuitNet.QuitNetItem quitNetItem)
{
- ComponentValue = new Component(quitNetItem.bpm);
+ ComponentValue = new(quitNetItem.bpm);
ComputingValue = valueComputing;
- AutoModeValue = (AutoMode)quitNetItem.autoMode;
- NoteSaltModeValue = (NoteSaltMode)quitNetItem.noteSaltMode;
+ AutoModeValue = quitNetItem.autoMode;
+ NoteSaltModeValue = quitNetItem.noteSaltMode;
AudioMultiplier = quitNetItem.audioMultiplier;
- FaintNoteModeValue = (FaintNoteMode)quitNetItem.faintNoteMode;
- JudgmentModeValue = (JudgmentMode)quitNetItem.judgmentMode;
- HitPointsModeValue = (HitPointsMode)quitNetItem.hitPointsMode;
- NoteMobilityModeValue = (NoteMobilityMode)quitNetItem.noteMobilityMode;
- LongNoteModeValue = (LongNoteMode)quitNetItem.longNoteMode;
- InputFavorModeValue = (InputFavorMode)quitNetItem.inputFavorMode;
- NoteModifyModeValue = (NoteModifyMode)quitNetItem.noteModifyMode;
- BPMModeValue = (BPMMode)quitNetItem.bpmMode;
- WaveModeValue = (WaveMode)quitNetItem.waveMode;
- SetNoteModeValue = (SetNoteMode)quitNetItem.setNoteMode;
- LowestJudgmentConditionModeValue = (LowestJudgmentConditionMode)quitNetItem.lowestJudgmentConditionMode;
+ FaintNoteModeValue = quitNetItem.faintNoteMode;
+ JudgmentModeValue = quitNetItem.judgmentMode;
+ HitPointsModeValue = quitNetItem.hitPointsMode;
+ NoteMobilityModeValue = quitNetItem.noteMobilityMode;
+ LongNoteModeValue = quitNetItem.longNoteMode;
+ InputFavorModeValue = quitNetItem.inputFavorMode;
+ NoteModifyModeValue = quitNetItem.noteModifyMode;
+ BPMModeValue = quitNetItem.bpmMode;
+ WaveModeValue = quitNetItem.waveMode;
+ SetNoteModeValue = quitNetItem.setNoteMode;
+ LowestJudgmentConditionModeValue = quitNetItem.lowestJudgmentConditionMode;
SentMultiplier = quitNetItem.multiplier;
MultiplierValue = BPM * AudioMultiplier * SentMultiplier;
HighestJudgment0 = quitNetItem.highestJudgment0;
@@ -390,7 +391,6 @@
if (SetProperty(ref _hitPointsMode, value, nameof(HitPointsModeValue)))
{
OnPropertyChanged(nameof(HitPointsModeContents));
- OnPropertyChanged(nameof(CanBeTwilightCommentContents));
}
HandlingHitPointsModeValue = value;
}
@@ -399,7 +399,18 @@
public string HitPointsModeContents => LanguageSystem.Instance.HitPointsModeTexts[(int)HitPointsModeValue];
[JsonIgnore]
- public HitPointsMode HandlingHitPointsModeValue { get; set; }
+ public HitPointsMode HandlingHitPointsModeValue
+ {
+ get => _handlingHitPointsMode;
+
+ set
+ {
+ if (SetProperty(ref _handlingHitPointsMode, value))
+ {
+ OnPropertyChanged(nameof(CanBeTwilightCommentContents));
+ }
+ }
+ }
public Color HandlingHitPointsColor => BaseUI.Instance.HitPointsColor[(int)HandlingHitPointsModeValue];
diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj
index 325eef5..d0ba61f 100644
--- a/Qwilight/Qwilight.csproj
+++ b/Qwilight/Qwilight.csproj
@@ -61,9 +61,7 @@
-
-
diff --git a/Qwilight/System/AudioSystem/AudioSystem.cs b/Qwilight/System/AudioSystem/AudioSystem.cs
index 4fc7ffa..dc87f85 100644
--- a/Qwilight/System/AudioSystem/AudioSystem.cs
+++ b/Qwilight/System/AudioSystem/AudioSystem.cs
@@ -164,7 +164,7 @@
public ConcurrentDictionary DefaultAudioItemMap { get; } = new();
- public string GetDefaultAudioFileName(int randomMillis)
+ public string GetDefaultAudioFileName(long randomMillis)
{
var defaultAudioFilePathItems = Configure.Instance.DefaultAudioFilePathItems;
var defaultAudioFilePathItemsLength = defaultAudioFilePathItems.Length;
diff --git a/Qwilight/System/BaseUI/BaseUI.cs b/Qwilight/System/BaseUI/BaseUI.cs
index 47b9ed6..2824c22 100644
--- a/Qwilight/System/BaseUI/BaseUI.cs
+++ b/Qwilight/System/BaseUI/BaseUI.cs
@@ -69,7 +69,7 @@
readonly ConcurrentDictionary _defaultAudioItemMap = new();
readonly ConcurrentDictionary _audioChannelMap = new();
- public string GetDefaultAudioFileName(int randomMillis)
+ public string GetDefaultAudioFileName(long randomMillis)
{
var defaultAudioFileNames = _defaultAudioItemMap.Keys.ToArray();
var defaultAudioFileNamesLength = defaultAudioFileNames.Length;
diff --git a/Qwilight/ViewModel/MainViewModel.cs b/Qwilight/ViewModel/MainViewModel.cs
index 2ee8833..28191df 100644
--- a/Qwilight/ViewModel/MainViewModel.cs
+++ b/Qwilight/ViewModel/MainViewModel.cs
@@ -76,7 +76,7 @@
{
EnableRaisingEvents = true
};
- int _randomMillis = Environment.TickCount;
+ long _randomMillis = Environment.TickCount64;
DispatcherTimer _fadeInHandler;
bool _isAvailable = true;
string _twilightCommentText0 = string.Empty;
@@ -90,7 +90,7 @@
int _entryItemPosition;
EntryItem _entryItemValue;
CancellationTokenSource _setCancelDefaultEntryLoading;
- int? _lastLowerMillis;
+ long? _lastLowerMillis;
bool _wasLowerMillis = true;
bool _isUILoading;
bool _isInputWantPointed;
@@ -568,7 +568,7 @@
{
ViewModels.Instance.HandleSilentlyClosableViewModels(silentlyClosableViewModel => silentlyClosableViewModel.OpenSilently());
NotifySystem.Instance.NotifyPending();
- _randomMillis = Environment.TickCount;
+ _randomMillis = Environment.TickCount64;
}
else
{
@@ -2919,10 +2919,10 @@
if (_wasLowerMillis && !IsCommentMode)
{
_wasLowerMillis = false;
- var millis = Environment.TickCount;
+ var millis = Environment.TickCount64;
if (_lastLowerMillis.HasValue)
{
- if (millis - _lastLowerMillis.Value > 500)
+ if (millis - _lastLowerMillis.Value > 500L)
{
_lastLowerMillis = millis;
}