Merge fixes

Assets/Script/PlayMode/AbstractTrack.cs

@@ -63,6 +63,7 @@ public EventInfo FillSection {
 		private double soloPtsEarned;
 
 		private bool FullCombo = true;
+
 		// Used for performance text purposes
 		private bool hotStartChecked = false;
 		private bool fullComboChecked = false;
@@ -77,6 +78,7 @@ public EventInfo FillSection {
 
 		private int _combo = 0;
 		private int _recentCombo = 0;  // For tracking note streak of size interval / 2
+
 		protected int Combo {
 			get => _combo;
 			set {
@@ -173,20 +175,6 @@ private void Start() {
 			commonTrack.kickFlash.SetActive(false);
 
 			scoreKeeper = new();
-
-			// Set up performance text for BASS GROOVE and other similar messages
-			commonTrack.performanceText.color = Color.white;
-			commonTrack.perfTextSizer = new PerformanceTextSizer(
-				commonTrack.perfTextFontSize,
-				commonTrack.perfTextAnimLen);
-
-			// Set the end time for STRONG FINISH and FULL COMBO performance text checking
-			endTime = (Chart[Chart.Count - 1].time + Constants.HIT_MARGIN + commonTrack.bufferPeriod);
-			offsetEndTime = endTime + commonTrack.perfTextAnimLen;
-
-			// Initlaize interval sizes
-			intervalSize = commonTrack.noteStreakInterval;
-			halfIntervalSize = intervalSize / 2;
 
 			// Set the end time for STRONG FINISH and FULL COMBO performance text checking
 			endTime = Chart[^1].time + Constants.HIT_MARGIN + commonTrack.bufferPeriod;
@@ -244,7 +232,7 @@ private void Update() {
 			if (hitChartIndex > lastHit) {
 				lastHit = hitChartIndex;
 			}
-			
+
 			// NOTE: UpdateInfo() originally was before UpdateStarpower().
 			// Moved it to the end to make performance text things work.
 			// I REALLY hope that doesn't break something. - grishhung
@@ -515,6 +503,7 @@ private void UpdateInfo() {
 			}
 
 			commonTrack.comboMeterRenderer.material.SetFloat("SpriteNum", index);
+
 			// HOT START notifs
 			if (commonTrack.hotStartNotifsEnabled) {
 				if (!hotStartChecked) {
@@ -540,6 +529,7 @@ private void UpdateInfo() {
 					commonTrack.TrackView.ShowPerformanceText($"{currentNoteStreakInterval * intervalSize}-NOTE STREAK");
 				}
 			}
+
 			// BASS GROOVE notifs
 			// NOTE: This will always trump "X-NOTE STREAK" (in particular, "50-NOTE STREAK")
 			if (commonTrack.bassGrooveNotifsEnabled) {
@@ -553,6 +543,7 @@ private void UpdateInfo() {
 					}
 				}
 			}
+
 			// OVERDRIVE READY notifs
 			if (commonTrack.overdriveReadyNotifsEnabled) {
 				if (recentStarpowerCharge < 0.5f && starpowerCharge >= 0.5f && !IsStarPowerActive) {