Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
Conflicts: Vocaluxe/Base/CGame.cs
This commit is contained in:
commit
3721df81e7
3 files changed
+4
-2
No files matched your search
@@ -276,6 +276,7 @@ namespace Vocaluxe.Base
|
|||||||
{
|
{
|
||||||
int tone = notes[note].Tone;
|
int tone = notes[note].Tone;
|
||||||
int tonePlayer = CSound.RecordGetTone(p);
|
int tonePlayer = CSound.RecordGetTone(p);
|
||||||
|
if (DEBUG_HIT) tonePlayer = tone;
|
||||||
|
|
||||||
while (tonePlayer - tone > 6)
|
while (tonePlayer - tone > 6)
|
||||||
tonePlayer -= 12;
|
tonePlayer -= 12;
|
||||||
|
|||||||
@@ -392,10 +392,10 @@ namespace VocaluxeLib.Menu.SingNotes
|
|||||||
_AddFlare(re, n);
|
_AddFlare(re, n);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (note.Perfect && note.EndBeat < CBase.Game.GetRecordedBeat())
|
if (note.Perfect && !note.PerfectDrawn && note.EndBeat < CBase.Game.GetRecordedBeat())
|
||||||
{
|
{
|
||||||
_AddPerfectNote(rect, n);
|
_AddPerfectNote(rect, n);
|
||||||
note.Perfect = false;
|
note.PerfectDrawn = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ namespace VocaluxeLib.Songs
|
|||||||
public CSongNote HitNote { get; private set; }
|
public CSongNote HitNote { get; private set; }
|
||||||
// for drawing perfect note effect
|
// for drawing perfect note effect
|
||||||
public bool Perfect { get; set; }
|
public bool Perfect { get; set; }
|
||||||
|
public bool PerfectDrawn { get; set; }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Methods
|
#region Methods
|
||||||
|
|||||||
Reference in new issue
Block a user