Added backward compatibility for score files

rjkiv · Apr 23, 2023 · 582ea09 · 582ea09
1 parent 72805cc
commit 582ea09
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/Assets/Plugins/MoonscraperChartParser/IO/Midi/MidReader.cs b/Assets/Plugins/MoonscraperChartParser/IO/Midi/MidReader.cs
@@ -305,13 +305,13 @@ static void ProcessPendingUserMessages(IList<MessageProcessParams> messageList,
                     processParams.processFn(processParams);
                 }
 #else
-                callBackState = CallbackState.WaitingForExternalInformation;
-                NativeMessageBox.Result result = NativeMessageBox.Show(processParams.message, processParams.title, NativeMessageBox.Type.YesNo, null);
-                callBackState = CallbackState.None;
-                if (result == NativeMessageBox.Result.Yes)
-                {
-                    processParams.processFn(processParams);
-                }
+                // callBackState = CallbackState.WaitingForExternalInformation;
+                // NativeMessageBox.Result result = NativeMessageBox.Show(processParams.message, processParams.title, NativeMessageBox.Type.YesNo, null);
+                // callBackState = CallbackState.None;
+                // if (result == NativeMessageBox.Result.Yes)
+                // {
+                //     processParams.processFn(processParams);
+                // }
 #endif
             }
         }

diff --git a/Assets/Script/ScoreManager.cs b/Assets/Script/ScoreManager.cs
@@ -51,6 +51,9 @@ public static void PushScore(SongInfo song, SongScore score) {
 				oldScore.lastPlayed = score.lastPlayed;
 				oldScore.timesPlayed += score.timesPlayed;
 
+				// Create a highestScore dictionary for backwards compatibility (if null)
+				oldScore.highestScore ??= new();
+
 				// Merge high scores
 				foreach (var kvp in score.highestPercent) { // percent
 					if (oldScore.highestPercent.TryGetValue(kvp.Key, out var old)) {

diff --git a/Assets/Script/UI/PostSong.cs b/Assets/Script/UI/PostSong.cs
@@ -69,7 +69,7 @@ private void OnEnable() {
 				}
 
 				// Override or add score/percentage
-				if (oldScore == null ||
+				if (oldScore == null || oldScore.highestScore == null ||
 					!oldScore.highestScore.TryGetValue(player.chosenInstrument, out var oldHighestSc) ||
 					lastScore.score > oldHighestSc) {
 

diff --git a/Assets/Script/UI/SelectedSongView.cs b/Assets/Script/UI/SelectedSongView.cs
@@ -1,13 +1,17 @@
 using System.Collections;
 using System.IO;
-using System;
 using TMPro;
 using UnityEngine;
-using UnityEngine.Experimental.Rendering;
 using UnityEngine.Networking;
 using UnityEngine.UI;
 using YARG.Data;
 
+#if UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
+
+using System;
+
+#endif
+
 namespace YARG.UI {
 	public class SelectedSongView : MonoBehaviour {
 		[SerializeField]