Use server for message on load/save no matter what

.vscode/settings.json

@@ -66,5 +66,6 @@
     "explorer.fileNesting.patterns": {
         "*.sln": "*.csproj"
     },
-    "dotnet.defaultSolution": "BerryDash-Src.sln"
+    "dotnet.defaultSolution": "source.slnx",
-}
+    "formatOnSave": true
+}

Assets/Resources/Sounds/CoinCollect.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Sounds/Death.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Sounds/Downgrade.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Sounds/Eat.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Sounds/IconPurchase.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Sounds/Jump.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Sounds/Levelup.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

Assets/Resources/Sounds/MenuMusic.wav.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Sounds/Powerup.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Sounds/SpeedyPowerup.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/Amazing Plan.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/Bit Shift.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/Cipher2.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/Itty Bitty 8 Bit.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/Pixel Peeker Polka faster.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/Scheming Weasel faster.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/Sneaky Adventure.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/Spazzmatica Polka.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/Steps Steps.wav.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/The Builder.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Resources/Soundtracks/Game/Who Likes to Party.mp3.meta

@@ -9,7 +9,7 @@ AudioImporter:
     sampleRateSetting: 1
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.79999995
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:

Assets/Scenes/LoadingMenu.unity

@@ -1058,6 +1058,7 @@ GameObject:
   - component: {fileID: 1024664080}
   - component: {fileID: 1024664079}
   - component: {fileID: 1024664078}
+  - component: {fileID: 1024664082}
   - component: {fileID: 1024664081}
   m_Layer: 5
   m_Name: UpdateButton
@@ -1184,6 +1185,19 @@ MonoBehaviour:
   invert: 0
   addMore: {r: 0, g: 0, b: 0, a: 0}
   reverseAdd: 0
+--- !u!114 &1024664082
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1024664076}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9a8b73eae2cbe1defa6dfa806975d95f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::ButtonToURL
+  url: https://games.lncvrt.xyz/game/berry-dash
 --- !u!1 &1053201553
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/UserSearchMenu.unity

@@ -2304,8 +2304,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -10}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -20}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1427798037
 MonoBehaviour:

Assets/Scripts/AccountMenu/AccountLoggedIn.cs

@@ -71,14 +71,7 @@ public class AccountLoggedIn : MonoBehaviour
             return;
         }
         var jsonResponse = JObject.Parse(request.downloadHandler.text);
-        if ((bool)jsonResponse["success"])
+        Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], (bool)jsonResponse["success"] ? Color.green : Color.red);
-        {
-            Tools.UpdateStatusText(loggedInText, "Synced account", Color.green);
-        }
-        else
-        {
-            Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
-        }
         loggedInChangeUsernameButton.interactable = true;
         loggedInChangePasswordButton.interactable = true;
         loggedInSaveButton.interactable = true;
@@ -133,12 +126,8 @@ public class AccountLoggedIn : MonoBehaviour
             }
             MenuMusic.Instance.GetComponent<AudioSource>().volume = BazookaManager.Instance.GetSettingMusicVolume();
             foreach (CustomColorObject customColorObject in FindObjectsByType<CustomColorObject>(FindObjectsSortMode.None)) customColorObject.SetColor();
-            Tools.UpdateStatusText(loggedInText, "Loaded account data", Color.green);
-        }
-        else
-        {
-            Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
         }
+        Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], (bool)jsonResponse["success"] ? Color.green : Color.red);
         loggedInChangeUsernameButton.interactable = true;
         loggedInChangePasswordButton.interactable = true;
         loggedInSaveButton.interactable = true;

Assets/Scripts/BazookaManager.cs

@@ -29,10 +29,7 @@ public class BazookaManager : MonoBehaviour
                 {
                     var oldSave = Path.Join(Application.persistentDataPath, OldSavefileEncryption.BAZOOKA_MANAGER_FILE_KEY + ".dat");
                     var newSave = Path.Join(Application.persistentDataPath, "savefile.json");
-                    if (
+                    if (File.Exists(oldSave) && !File.Exists(newSave))
-                        File.Exists(oldSave) ||
-                        !File.Exists(newSave)
-                    )
                     {
                         File.WriteAllBytes(newSave, Encoding.UTF8.GetBytes(OldSavefileEncryption.DecryptRaw(File.ReadAllBytes(oldSave))));
                         File.Delete(oldSave);

Assets/Scripts/CustomGamePlayer.cs

@@ -731,11 +731,6 @@ public class CustomGamePlayer : MonoBehaviour
 
     internal void DisablePause()
     {
-        if (CustomGamePlayerPauseMenu.Instance.statsMenu.activeSelf)
-        {
-            CustomGamePlayerPauseMenu.Instance.statsMenuExitButton.onClick.Invoke();
-            return;
-        }
         if (CustomGamePlayerPauseMenu.Instance.editingUI == true)
         {
             CustomGamePlayerPauseMenu.Instance.ToggleEditingUI();
@@ -840,7 +835,7 @@ public class CustomGamePlayer : MonoBehaviour
         speedyLeft = 0f;
         antiLeft = 0f;
         goldenLeft = 10f;
-        UpdateStats(0);
+        UpdateStats(4);
     }
 
     void DoNothingBerry(GameObject berry)

Assets/Scripts/CustomGamePlayerPauseMenu.cs

@@ -1,4 +1,3 @@
-using System.Text;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
@@ -21,10 +20,6 @@ public class CustomGamePlayerPauseMenu : MonoBehaviour
     [SerializeField] private Button leftButton;
     internal bool editingUI = false;
 
-    public GameObject statsMenu;
-    public Button statsMenuExitButton;
-    [SerializeField] private TMP_Text statsText;
-
     [SerializeField] private Toggle settingFullscreenToggle;
     [SerializeField] private Toggle settingVSyncToggle;
     [SerializeField] private Toggle settingRandomMusicToggle;
@@ -70,26 +65,6 @@ public class CustomGamePlayerPauseMenu : MonoBehaviour
                 PlayerPrefs.DeleteKey("DraggedUILeftButton");
             }
         });
-        statsButton.onClick.AddListener(() =>
-        {
-            statsMenu.SetActive(true);
-            var text = new StringBuilder();
-            text.AppendLine("High Score: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreHighScore()));
-            text.AppendLine("Total Normal Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalNormalBerries()));
-            text.AppendLine("Total Poison Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalPoisonBerries()));
-            text.AppendLine("Total Slow Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalSlowBerries()));
-            text.AppendLine("Total Ultra Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalUltraBerries()));
-            text.AppendLine("Total Speedy Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalSpeedyBerries()));
-            text.AppendLine("Total Random Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalRandomBerries()));
-            text.AppendLine("Total Anti Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalAntiBerries()));
-            text.AppendLine("Total Attempts: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalAttepts()));
-            statsText.text = text.ToString();
-        });
-        statsMenuExitButton.onClick.AddListener(() =>
-        {
-            statsMenu.SetActive(false);
-            statsText.text = string.Empty;
-        });
 
         musicSlider.value = BazookaManager.Instance.GetSettingMusicVolume();
         sfxSlider.value = BazookaManager.Instance.GetSettingSFXVolume();

Assets/Scripts/GamePlayer.cs

@@ -870,6 +870,6 @@ public class GamePlayer : MonoBehaviour
         speedyLeft = 0f;
         antiLeft = 0f;
         goldenLeft = 10f;
-        UpdateStats(0, 0);
+        UpdateStats(4, 0);
     }
 }

Assets/Scripts/GamePlayerPauseMenu.cs

@@ -91,6 +91,7 @@ public class GamePlayerPauseMenu : MonoBehaviour
             text.AppendLine("Total Speedy Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalSpeedyBerries()));
             text.AppendLine("Total Random Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalRandomBerries()));
             text.AppendLine("Total Anti Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalAntiBerries()));
+            text.AppendLine("Total Golden Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalGoldenBerries()));
             text.AppendLine("Total Attempts: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalAttepts()));
             statsText.text = text.ToString();
         });

Assets/Scripts/LoadingMenu.cs

@@ -25,10 +25,6 @@ public class LoadingMenu : MonoBehaviour
             QualitySettings.vSyncCount = 0;
         }
         PlayerPrefs.SetString("latestVersion", Application.version);
-        updateButton.onClick.AddListener(() =>
-        {
-            Application.OpenURL("https://berrydash.lncvrt.xyz/download");
-        });
         CheckUpdate();
     }
 

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.3.7f1
+m_EditorVersion: 6000.3.8f1
-m_EditorVersionWithRevision: 6000.3.7f1 (696ec25a53d1)
+m_EditorVersionWithRevision: 6000.3.8f1 (1c7db571dde0)

README.md

@@ -4,4 +4,4 @@ Berry dash is a simple Strategy/Casual game where you catch berries to get a hig
 
 The server source code can be found [here](https://github.com/BerryDash/server) along with guides on how to make a berry dash private server.
 
-[Click here to view a tutorial on the game](http://berrydash.lncvrt.xyz/tutorial)
+[Click here to view a tutorial on the game](http://games.lncvrt.xyz/game/berry-dash/tutorial)