Fix maybe

This took me 3 weeks to figure out, I hate everything

.vscode/settings.json

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

Assets/Resources/Berries/Berry.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 058d6c29b98c7ab4dae45eace6564ac6
+    spriteID: 582cf12e79f32c528897751673246dfe
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Berries/BerryUpArrow.png.meta

@@ -109,19 +109,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

Assets/Resources/Berries/CoinBerry.png.meta

@@ -1,10 +1,10 @@
 fileFormatVersion: 2
-guid: e98c5b76ef4f7e64c9c95f5f6679475b
+guid: 95fcc20fbfe7c43a2a484251feb32a00
 TextureImporter:
   internalIDToNameTable:
   - first:
-      213: -9009641426861971402
+      213: -8654162663755415972
-    second: Restart_0
+    second: CoinBerry_0
   externalObjects: {}
   serializedVersion: 13
   mipmaps:
@@ -96,11 +96,24 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
-      name: Restart_0
+      name: CoinBerry_0
       rect:
         serializedVersion: 2
         x: 0
@@ -108,15 +121,15 @@ TextureImporter:
         width: 128
         height: 128
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       customData: 
       outline: []
       physicsShape: []
       tessellationDetail: -1
       bones: []
-      spriteID: 638af3e7bd257f280800000000000000
+      spriteID: c5ef866b8ec36e780800000000000000
-      internalID: -9009641426861971402
+      internalID: -8654162663755415972
       vertices: []
       indices: 
       edges: []
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5889f8ff3094d3c87a48caa1595d473e
     internalID: 0
     vertices: []
     indices: 
@@ -135,7 +148,7 @@ TextureImporter:
     spriteCustomMetadata:
       entries: []
     nameFileIdTable:
-      Restart_0: -9009641426861971402
+      CoinBerry_0: -8654162663755415972
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 

Assets/Resources/Berries/GoldenBerry.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: c32e2cfec2fded64893728e6f5bf0e13
+    spriteID: e2cfd756699a4c97ebe0c90ef8317350
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Berries/PoisonBerry.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 1b092a9264636594cab830586a26f9ff
+    spriteID: a617069b7a799f84280b718ccbda17df
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Berries/SlowBerry.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 1886ff130a209c64f86cf70c119372e7
+    spriteID: 3d01500db5ec895f19951eb703e03dff
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Berries/SpeedyBerry.png.meta

@@ -37,7 +37,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 1
+    filterMode: 0
     aniso: 1
     mipBias: 0
     wrapU: 1
@@ -75,7 +75,7 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -109,19 +109,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -129,12 +116,12 @@ TextureImporter:
       name: SpeedyBerry_0
       rect:
         serializedVersion: 2
-        x: 7
+        x: 0
-        y: 3
+        y: 0
-        width: 114
+        width: 128
-        height: 122
+        height: 128
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       customData: 
       outline: []
@@ -151,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 94927edae5d7197d39e12a6086e62802
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Berries/UltraBerry.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 3cf527c48b8f14246a225a6b11b2e9e3
+    spriteID: c8d7f00a1dafe33cc922032b4887a485
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Fonts/FontAwesomeBrands.otf.meta

@@ -9,7 +9,7 @@ TrueTypeFontImporter:
   characterPadding: 1
   includeFontData: 1
   fontNames:
-  - Font Awesome 6 Brands
+  - Font Awesome 7 Brands
   fallbackFontReferences: []
   customCharacters: 
   fontRenderingMode: 0

Assets/Resources/Fonts/FontAwesomeBrands.txt

@@ -1 +1 @@
-f167,f099,f1a1,f392
+f167,f392

Assets/Resources/Fonts/FontAwesomeRegular.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2392e4822ecf2c5e19a145850cebbd9a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Fonts/FontAwesomeRegular.otf.meta

@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 5960872f8c2f3d8d5943276148cd6eb0
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Font Awesome 7 Free
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Fonts/FontAwesomeRegular.txt

@@ -0,0 +1 @@
+f111,f024,f0c5

Assets/Resources/Fonts/FontAwesomeRegular.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d2478a5ac0a503084b9417ec06acc54c
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Fonts/FontAwesomeSolid.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b50c03e48f9f20d69553c78bfe39a89
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Fonts/FontAwesomeSolid.otf.meta

@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 70c3626d6481a080ca8a0f3ee7018cd8
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Font Awesome 7 Free
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Fonts/FontAwesomeSolid.txt

@@ -0,0 +1 @@
+f309,f111,f141,f04c,f0e2,f077,f061,f060,f0c8,f00c,f00d,f303,f2ed

Assets/Resources/Fonts/FontAwesomeSolid.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4c3c9ea67fe29723c955aa457d4fc299
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Fonts/Lexend.asset.meta

@@ -2,7 +2,7 @@ fileFormatVersion: 2
 guid: 4fd546dd0900395408d2de20f5025882
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 11400000
+  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Resources/Icon.png.meta

@@ -37,7 +37,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 1
+    filterMode: 2
     aniso: 1
     mipBias: 0
     wrapU: 1
@@ -75,7 +75,7 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -103,10 +116,10 @@ TextureImporter:
       name: Icon_0
       rect:
         serializedVersion: 2
-        x: 55
+        x: 0
         y: 0
-        width: 938
+        width: 2048
-        height: 801
+        height: 2048
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}

Assets/Resources/Icons/Icons/bird_-1.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 1a3c5f677ec78444b8d1235d7ab8a3f7
+    spriteID: 288a5f3e995f52e01a33ba7f6f84c879
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Icons/bird_-2.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 5972948e32a810e449f9b8468ddbdfb2
+    spriteID: d454f9ce1d2e85843941e29c21dce980
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Icons/bird_-3.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 41ef996ca8dff9147b6cc4ef891155d1
+    spriteID: 5c69ba122765b3007b15643254c230a0
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Icons/bird_-4.png.meta

@@ -1,10 +1,10 @@
 fileFormatVersion: 2
-guid: 7d3c7bb9d61501a439cd07c977a039e8
+guid: f755766365ccb9522b11a8c3ad5ca4ad
 TextureImporter:
   internalIDToNameTable:
   - first:
-      213: -4346244404228752641
+      213: -2782012579205326331
-    second: Arrow_0
+    second: bird_-4_0
   externalObjects: {}
   serializedVersion: 13
   mipmaps:
@@ -96,11 +96,24 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
-      name: Arrow_0
+      name: bird_-4_0
       rect:
         serializedVersion: 2
         x: 0
@@ -108,15 +121,15 @@ TextureImporter:
         width: 128
         height: 128
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       customData: 
       outline: []
       physicsShape: []
       tessellationDetail: -1
       bones: []
-      spriteID: ffa7ae2edb90fa3c0800000000000000
+      spriteID: 50a5cc78c4e4469d0800000000000000
-      internalID: -4346244404228752641
+      internalID: -2782012579205326331
       vertices: []
       indices: 
       edges: []
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 8fe06886b08afa4a0803a236bdb16bc0
     internalID: 0
     vertices: []
     indices: 
@@ -135,7 +148,7 @@ TextureImporter:
     spriteCustomMetadata:
       entries: []
     nameFileIdTable:
-      Arrow_0: -4346244404228752641
+      bird_-4_0: -2782012579205326331
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 

Assets/Resources/Icons/Icons/bird_1.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 1f27ff5612e47f64c9801259458129f8
+    spriteID: cce7d9c73147b925e8d83bb3c143e60e
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Icons/bird_2.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 592621bb0c071254c957a1dcb2ce7fcb
+    spriteID: 54f9d53e2bbe3e22d85b1524b5567b89
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Icons/bird_3.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 2dc58ad3027f0f64db4d84eca4705b1c
+    spriteID: 2ed72778f248cc987a31005af0d8dc27
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Icons/bird_4.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: ca1363aca3c8eca42955293db8a2a518
+    spriteID: e694bcd5c674e66958fc88a539f33579
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Icons/bird_5.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 464dfad19359f774eaf326e9a1e94d82
+    spriteID: 3aeff4616d270d54f83bad4fdd74b5ed
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Icons/bird_6.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: ed8b3233aced9cc44bfb963fffeb7920
+    spriteID: 6b167c2e396a31e3099d7bf9b97e4d52
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Icons/bird_7.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 16d20612291e04d4cbb941bff3fa9999
+    spriteID: 69ba17ba98b136972bcaba384d5f5ab6
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Icons/bird_8.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 76b52cce0af4a3b4fa5c752287557754
+    spriteID: 244f93fa0561eed76bd4390798188808
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_1.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: aed314ff1328ef94d813383d941e062c
+    spriteID: 40c19dd521113be118a5646f2d38958d
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_10.png.meta

@@ -109,19 +109,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -151,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: ebad59df60033f14bb58314f4fe69b07
+    spriteID: e713d96eb541bfecdbe39c7883265643
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_11.png.meta

@@ -109,19 +109,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -151,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 9c3397a5cecb5024494b568dbb7052d1
+    spriteID: f5cf9b4d400bc39d9a6f82ceabc9bbd5
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_12.png.meta

@@ -109,19 +109,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -151,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 4dd19266b6924ff40a60c61f1e1199cd
+    spriteID: 205c8c7bdfdd148e5a5dbed4f813cd5b
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_13.png.meta

@@ -109,19 +109,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -151,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: b0575dcff12ae524787b06a71cc8d460
+    spriteID: f921c4b7a4d2f7a4f8894bb3d0f5f594
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_14.png.meta

@@ -109,19 +109,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -151,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: c886b578da5ca0148ad2d8994a3b098f
+    spriteID: 2f3c96a3567fd8e24a2344b373611d94
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_2.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: d6126c44b32f13d479b54535da20dd70
+    spriteID: 30f9de3bbc055a00b8bcd3e7e12a6fa0
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_3.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: e01ae72fd3b903a459fa80f0047da4c3
+    spriteID: cd687a20daacc9d04bb6fb5a836936cc
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_4.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 21c7592435580544e88a23db95f50c8c
+    spriteID: 7506afc7d630e358082715da9bdffb23
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_5.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: a5372c8635766a940a492d079e8632c3
+    spriteID: fc256cdcb91529078a6830884a485499
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_6.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: ad3d1a108ca8ef846b3e3318230f66f9
+    spriteID: c9de11ab91816b48ea5be0e23863b32c
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_7.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: a89f99845aba0fc46af7b7d9e48df6dd
+    spriteID: 28b5179fb99ae809f8b122060fa3d3bb
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_8.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: ac584cd446188b0438e202e7e23b61ec
+    spriteID: 963cb012dce9644debed7ace8ea61865
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Icons/Overlays/overlay_9.png.meta

@@ -96,6 +96,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 6cffe0628cbc1944ea3f117abddca990
+    spriteID: a3c5592658ccdf958a52c9d02457b1ba
     internalID: 0
     vertices: []
     indices: 

Assets/Resources/Other.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dc198920b982b344ca7225d9cf15e881
+guid: 5aa626694356916518efd27680cc1467
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Resources/Other/Coin.png.meta

@@ -1,10 +1,10 @@
 fileFormatVersion: 2
-guid: 9c88e2144c204354c85bc428f0ce5389
+guid: 727b3f3f8ac5e5e649879866189d0de1
 TextureImporter:
   internalIDToNameTable:
   - first:
-      213: 5000927251509650613
+      213: -3338749442709606003
-    second: Back_0
+    second: Coin_0
   externalObjects: {}
   serializedVersion: 13
   mipmaps:
@@ -96,11 +96,24 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
-      name: Back_0
+      name: Coin_0
       rect:
         serializedVersion: 2
         x: 0
@@ -108,15 +121,15 @@ TextureImporter:
         width: 128
         height: 128
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       customData: 
       outline: []
       physicsShape: []
       tessellationDetail: -1
       bones: []
-      spriteID: 5b4adc5d6dcd66540800000000000000
+      spriteID: d81b24142116aa1d0800000000000000
-      internalID: 5000927251509650613
+      internalID: -3338749442709606003
       vertices: []
       indices: 
       edges: []
@@ -125,7 +138,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: bab5767e2c0c5c1a58cb976df87e251e
     internalID: 0
     vertices: []
     indices: 
@@ -135,7 +148,7 @@ TextureImporter:
     spriteCustomMetadata:
       entries: []
     nameFileIdTable:
-      Back_0: 5000927251509650613
+      Coin_0: -3338749442709606003
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 

Assets/Resources/Sounds/CoinCollect.mp3.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 7665bf9f58fc7e116833612b88bd5638
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 2
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sounds/Death.mp3.meta

@@ -5,7 +5,7 @@ AudioImporter:
   serializedVersion: 8
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1

Assets/Resources/Sounds/Downgrade.mp3.meta

@@ -5,7 +5,7 @@ AudioImporter:
   serializedVersion: 8
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1

Assets/Resources/Sounds/Eat.mp3.meta

@@ -5,7 +5,7 @@ AudioImporter:
   serializedVersion: 8
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1

Assets/Resources/Sounds/IconPurchase.mp3.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: dedee00ae858abf8cbb153c89a821212
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 2
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sounds/Jump.mp3.meta

@@ -5,7 +5,7 @@ AudioImporter:
   serializedVersion: 8
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1

Assets/Resources/Sounds/MenuMusic.mp3.meta

@@ -5,7 +5,7 @@ AudioImporter:
   serializedVersion: 8
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1

Assets/Resources/Sounds/Powerup.mp3.meta

@@ -5,7 +5,7 @@ AudioImporter:
   serializedVersion: 8
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1

Assets/Resources/Sounds/SpeedyPowerup.mp3.meta

@@ -5,7 +5,7 @@ AudioImporter:
   serializedVersion: 8
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1

Assets/Scenes/AccountMenu.unity

@@ -4147,6 +4147,50 @@ MonoBehaviour:
   m_Spacing: {x: 0, y: 45}
   m_Constraint: 0
   m_ConstraintCount: 2
+--- !u!1 &667608825
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 667608827}
+  - component: {fileID: 667608826}
+  m_Layer: 0
+  m_Name: BazookaManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &667608826
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 667608825}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a0df255fc60e6e3c88ebb94d2d88db4d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &667608827
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 667608825}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &682940900
 GameObject:
   m_ObjectHideFlags: 0
@@ -12033,7 +12077,7 @@ Transform:
   m_GameObject: {fileID: 1724546899}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.52066, y: -3.66337, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -16055,5 +16099,6 @@ SceneRoots:
   m_Roots:
   - {fileID: 720281946}
   - {fileID: 1724546901}
+  - {fileID: 667608827}
   - {fileID: 1094007101}
   - {fileID: 682940903}

Assets/Scenes/IconMarketplaceMenu.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 88bad8620907810c097277153f83e44c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/LeaderboardMenu.unity

@@ -1055,11 +1055,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 222049256}
-  - {fileID: 1222881555}
   - {fileID: 13520179}
+  - {fileID: 1222881555}
   - {fileID: 992753024}
-  - {fileID: 203659856}
   - {fileID: 287845921}
+  - {fileID: 203659856}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1538,6 +1538,50 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 682674804}
   m_CullTransparentMesh: 1
+--- !u!1 &863352644
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 863352646}
+  - component: {fileID: 863352645}
+  m_Layer: 0
+  m_Name: BazookaManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &863352645
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 863352644}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a0df255fc60e6e3c88ebb94d2d88db4d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &863352646
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 863352644}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &892424263
 GameObject:
   m_ObjectHideFlags: 0
@@ -2872,7 +2916,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 'Score: '
+  m_text: 'Berries: '
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 4fd546dd0900395408d2de20f5025882, type: 2}
   m_sharedMaterial: {fileID: -1476194838487357290, guid: 4fd546dd0900395408d2de20f5025882, type: 2}
@@ -3388,7 +3432,7 @@ Transform:
   m_GameObject: {fileID: 1711730330}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.52066, y: -3.66337, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -4123,6 +4167,9 @@ MonoBehaviour:
     - m_Text: Speedy Berry
       m_Image: {fileID: -2055337169336843231, guid: 59235d26eca651e63a56cb40b86e7afb, type: 3}
       m_Color: {r: 1, g: 1, b: 1, a: 1}
+    - m_Text: Coin Berry
+      m_Image: {fileID: -8654162663755415972, guid: 95fcc20fbfe7c43a2a484251feb32a00, type: 3}
+      m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -4862,5 +4909,6 @@ SceneRoots:
   - {fileID: 1455063616}
   - {fileID: 1711730332}
   - {fileID: 1991415992}
+  - {fileID: 863352646}
   - {fileID: 382688262}
   - {fileID: 1820585371}

Assets/Scenes/LoadingMenu.unity

@@ -752,7 +752,7 @@ Transform:
   m_GameObject: {fileID: 842325108}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.52066, y: -3.66337, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1151,11 +1151,56 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1201615240}
   m_CullTransparentMesh: 1
+--- !u!1 &1547097372
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1547097374}
+  - component: {fileID: 1547097373}
+  m_Layer: 0
+  m_Name: BazookaManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1547097373
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1547097372}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a0df255fc60e6e3c88ebb94d2d88db4d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1547097374
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1547097372}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
   - {fileID: 705564545}
   - {fileID: 842325110}
+  - {fileID: 1547097374}
   - {fileID: 734849810}
   - {fileID: 759356942}

Assets/Scenes/StatsMenu.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7fc772dfc5233442ebeceac3db878727
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/AccountMenu/AccountChangePassword.cs

@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using Newtonsoft.Json.Linq;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Networking;
@@ -29,63 +29,68 @@ public class AccountChangePassword : MonoBehaviour
 
     async void ChangePassword()
     {
+        changePasswordBackButton.interactable = false;
         if (changePasswordNewPasswordInput.text != changePasswordRetypeNewPasswordInput.text)
         {
-            AccountHandler.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red);
+            changePasswordBackButton.interactable = true;
+            Tools.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red);
             return;
         }
         EncryptedWWWForm dataForm = new();
-        dataForm.AddField("inputPassword", changePasswordCurrentPasswordInput.text);
+        dataForm.AddField("oldpassword", changePasswordCurrentPasswordInput.text);
-        dataForm.AddField("inputNewPassword", changePasswordNewPasswordInput.text);
+        dataForm.AddField("newpassword", changePasswordNewPasswordInput.text);
-        dataForm.AddField("session", PlayerPrefs.GetString("gameSession"));
+        dataForm.AddField("token", BazookaManager.Instance.GetAccountSession());
-        dataForm.AddField("userName", PlayerPrefs.GetString("userName"));
+        dataForm.AddField("username", BazookaManager.Instance.GetAccountName());
-        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountPassword.php", dataForm.GetWWWForm());
+        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountPassword.php", dataForm.form);
         request.SetRequestHeader("Requester", "BerryDashClient");
         request.SetRequestHeader("ClientVersion", Application.version);
         request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
         await request.SendWebRequest();
         if (request.result != UnityWebRequest.Result.Success)
         {
-            AccountHandler.UpdateStatusText(changePasswordStatusText, "Failed to make HTTP request", Color.red);
+            changePasswordBackButton.interactable = true;
+            Tools.UpdateStatusText(changePasswordStatusText, "Failed to make HTTP request", Color.red);
             return;
         }
         string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
-        switch (response)
+        if (response == "-999")
         {
-            case "-999":
+            changePasswordBackButton.interactable = true;
-                AccountHandler.UpdateStatusText(changePasswordStatusText, "Server error while fetching data", Color.red);
+            Tools.UpdateStatusText(changePasswordStatusText, "Server error while fetching data", Color.red);
-                break;
+            return;
-            case "-998":
-                AccountHandler.UpdateStatusText(changePasswordStatusText, "Client version too outdated to access servers", Color.red);
-                break;
-            case "-997":
-                AccountHandler.UpdateStatusText(changePasswordStatusText, "Encryption/decryption issues", Color.red);
-                break;
-            case "-1":
-                AccountHandler.UpdateStatusText(changePasswordStatusText, "New Password is too short or too long", Color.red);
-                break;
-            case "-2":
-                AccountHandler.UpdateStatusText(changePasswordStatusText, "Password must have 8 characters, one number and one letter", Color.red);
-                break;
-            case "-3":
-                AccountHandler.UpdateStatusText(changePasswordStatusText, "Incorrect current password", Color.red);
-                break;
-            case "-4":
-                AccountHandler.UpdateStatusText(changePasswordStatusText, "Failed to find info about your user (refresh login?)", Color.red);
-                break;
-            case "-5":
-                AccountHandler.UpdateStatusText(changePasswordStatusText, "New password cannot be the same as your old password", Color.red);
-                break;
         }
-        if (Regex.IsMatch(response, "^[a-zA-Z0-9]{512}$"))
+        else if (response == "-998")
         {
-            PlayerPrefs.SetString("gameSession", response);
+            changePasswordBackButton.interactable = true;
-            AccountHandler.instance.SwitchPanel(0);
+            Tools.UpdateStatusText(changePasswordStatusText, "Client version too outdated to access servers", Color.red);
-            AccountHandler.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Password changed successfully", Color.green);
+            return;
+        }
+        else if (response == "-997")
+        {
+            changePasswordBackButton.interactable = true;
+            Tools.UpdateStatusText(changePasswordStatusText, "Encryption/decryption issues", Color.red);
+            return;
+        }
+        else if (response == "-996")
+        {
+            changePasswordBackButton.interactable = true;
+            Tools.UpdateStatusText(changePasswordStatusText, "Can't send requests on self-built instance", Color.red);
+            return;
         }
         else
         {
-            AccountHandler.UpdateStatusText(changePasswordStatusText, "Unknown server response " + response, Color.red);
+            var jsonResponse = JObject.Parse(response);
+            if ((bool)jsonResponse["success"])
+            {
+                BazookaManager.Instance.SetAccountSession((string)jsonResponse["token"]);
+                AccountHandler.instance.SwitchPanel(0);
+                Tools.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Password changed successfully", Color.green);
+            }
+            else
+            {
+                Tools.UpdateStatusText(changePasswordStatusText, (string)jsonResponse["message"], Color.red);
+            }
         }
+        changePasswordBackButton.interactable = true;
     }
-}
+}

Assets/Scripts/AccountMenu/AccountChangeUsername.cs

@@ -1,3 +1,4 @@
+using Newtonsoft.Json.Linq;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Networking;
@@ -26,51 +27,62 @@ public class AccountChangeUsername : MonoBehaviour
 
     async void ChangeUsername()
     {
+        changeUsernameBackButton.interactable = false;
         EncryptedWWWForm dataForm = new();
-        dataForm.AddField("inputUserName", changeUsernameCurrentUsernameInput.text);
+        dataForm.AddField("oldusername", changeUsernameCurrentUsernameInput.text);
-        dataForm.AddField("inputNewUserName", changeUsernameNewUsernameInput.text);
+        dataForm.AddField("newusername", changeUsernameNewUsernameInput.text);
-        dataForm.AddField("session", PlayerPrefs.GetString("gameSession"));
+        dataForm.AddField("token", BazookaManager.Instance.GetAccountSession());
-        dataForm.AddField("userName", PlayerPrefs.GetString("userName"));
+        dataForm.AddField("username", BazookaManager.Instance.GetAccountName());
-        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountUsername.php", dataForm.GetWWWForm());
+        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountUsername.php", dataForm.form);
         request.SetRequestHeader("Requester", "BerryDashClient");
         request.SetRequestHeader("ClientVersion", Application.version);
         request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
         await request.SendWebRequest();
         if (request.result != UnityWebRequest.Result.Success)
         {
-            AccountHandler.UpdateStatusText(changeUsernameStatusText, "Failed to make HTTP request", Color.red);
+            changeUsernameBackButton.interactable = true;
+            Tools.UpdateStatusText(changeUsernameStatusText, "Failed to make HTTP request", Color.red);
             return;
         }
         string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
-        switch (response)
+        if (response == "-999")
         {
-            case "-999":
+            changeUsernameBackButton.interactable = true;
-                AccountHandler.UpdateStatusText(changeUsernameStatusText, "Server error while fetching data", Color.red);
+            Tools.UpdateStatusText(changeUsernameStatusText, "Server error while fetching data", Color.red);
-                break;
+            return;
-            case "-998":
-                AccountHandler.UpdateStatusText(changeUsernameStatusText, "Client version too outdated to access servers", Color.red);
-                break;
-            case "-997":
-                AccountHandler.UpdateStatusText(changeUsernameStatusText, "Encryption/decryption issues", Color.red);
-                break;
-            case "1":
-                PlayerPrefs.SetString("userName", changeUsernameNewUsernameInput.text);
-                AccountHandler.instance.SwitchPanel(0);
-                AccountHandler.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Username changed successfully", Color.green);
-                break;
-            case "-1":
-                AccountHandler.UpdateStatusText(changeUsernameStatusText, "New Username must be 3-16 characters, letters and numbers only", Color.red);
-                break;
-            case "-2":
-                AccountHandler.UpdateStatusText(changeUsernameStatusText, "New username already exists", Color.red);
-                break;
-            case "-3":
-                AccountHandler.instance.SwitchPanel(0);
-                AccountHandler.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Failed to find info about your user (refresh login?)", Color.red);
-                break;
-            default:
-                AccountHandler.UpdateStatusText(changeUsernameStatusText, "Unknown server response", Color.red);
-                break;
         }
+        else if (response == "-998")
+        {
+            changeUsernameBackButton.interactable = true;
+            Tools.UpdateStatusText(changeUsernameStatusText, "Client version too outdated to access servers", Color.red);
+            return;
+        }
+        else if (response == "-997")
+        {
+            changeUsernameBackButton.interactable = true;
+            Tools.UpdateStatusText(changeUsernameStatusText, "Encryption/decryption issues", Color.red);
+            return;
+        }
+        else if (response == "-996")
+        {
+            changeUsernameBackButton.interactable = true;
+            Tools.UpdateStatusText(changeUsernameStatusText, "Can't send requests on self-built instance", Color.red);
+            return;
+        }
+        else
+        {
+            var jsonResponse = JObject.Parse(response);
+            if ((bool)jsonResponse["success"])
+            {
+                BazookaManager.Instance.SetAccountName(changeUsernameNewUsernameInput.text);
+                AccountHandler.instance.SwitchPanel(0);
+                Tools.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Username changed successfully", Color.green);
+            }
+            else
+            {
+                Tools.UpdateStatusText(changeUsernameStatusText, (string)jsonResponse["message"], Color.red);
+            }
+        }
+        changeUsernameBackButton.interactable = true;
     }
-}
+}

Assets/Scripts/AccountMenu/AccountHandler.cs

@@ -1,4 +1,3 @@
-using TMPro;
 using UnityEngine;
 
 public class AccountHandler : MonoBehaviour
@@ -19,7 +18,7 @@ public class AccountHandler : MonoBehaviour
 
     void Start()
     {
-        if (PlayerPrefs.HasKey("gameSession") && PlayerPrefs.HasKey("userName") && PlayerPrefs.HasKey("userId"))
+        if (BazookaManager.Instance.GetAccountID() != null && BazookaManager.Instance.GetAccountName() != null && BazookaManager.Instance.GetAccountSession() != null)
         {
             SwitchPanel(0);
         }
@@ -98,10 +97,4 @@ public class AccountHandler : MonoBehaviour
                 break;
         }
     }
-
-    public static void UpdateStatusText(TMP_Text statusText, string message, Color color)
-    {
-        statusText.text = message;
-        statusText.color = color;
-    }
 }

Assets/Scripts/AccountMenu/AccountLoggedIn.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Text;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Networking;
@@ -23,8 +27,9 @@ public class AccountLoggedIn : MonoBehaviour
         loggedInSaveButton.onClick.AddListener(() => SaveAccount());
         loggedInLoadButton.onClick.AddListener(() => LoadAccount());
         loggedInRefreshLoginButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(6));
-        loggedInLogoutButton.onClick.AddListener(() => {
+        loggedInLogoutButton.onClick.AddListener(() =>
-            accountLoggedOut.clearValues = true;
+        {
+            BazookaManager.Instance.ResetSave();
             AccountHandler.instance.SwitchPanel(1);
         });
         loggedInBackButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu"));
@@ -34,123 +39,150 @@ public class AccountLoggedIn : MonoBehaviour
     {
         loggedInSaveButton.interactable = true;
         loggedInLoadButton.interactable = true;
-        loggedInText.text = "Logged in as: " + PlayerPrefs.GetString("userName");
+        Tools.UpdateStatusText(loggedInText, "Logged in as: " + BazookaManager.Instance.GetAccountName(), Color.white);
     }
 
     async void SaveAccount()
     {
         loggedInLoadButton.interactable = false;
         loggedInSaveButton.interactable = false;
+        loggedInBackButton.interactable = false;
         EncryptedWWWForm dataForm = new();
-        dataForm.AddField("userName", PlayerPrefs.GetString("userName", ""));
+        dataForm.AddField("username", BazookaManager.Instance.GetAccountName());
-        dataForm.AddField("gameSession", PlayerPrefs.GetString("gameSession", ""));
+        dataForm.AddField("token", BazookaManager.Instance.GetAccountSession());
-        dataForm.AddField("highScore", PlayerPrefs.GetString("HighScoreV2", "0"));
+        dataForm.AddField("saveData", Convert.ToBase64String(Encoding.UTF8.GetBytes(BazookaManager.Instance.saveFile.ToString(Formatting.None))));
-        dataForm.AddField("icon", PlayerPrefs.GetInt("icon", 1).ToString());
+        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "saveAccount.php", dataForm.form);
-        dataForm.AddField("overlay", PlayerPrefs.GetInt("overlay", 0).ToString());
-        dataForm.AddField("totalNormalBerries", PlayerPrefs.GetString("TotalNormalBerries", "0"));
-        dataForm.AddField("totalPoisonBerries", PlayerPrefs.GetString("TotalPoisonBerries", "0"));
-        dataForm.AddField("totalSlowBerries", PlayerPrefs.GetString("TotalSlowBerries", "0"));
-        dataForm.AddField("totalUltraBerries", PlayerPrefs.GetString("TotalUltraBerries", "0"));
-        dataForm.AddField("totalSpeedyBerries", PlayerPrefs.GetString("TotalSpeedyBerries", "0"));
-        dataForm.AddField("totalAttempts", PlayerPrefs.GetString("TotalAttempts", "0"));
-        dataForm.AddField("birdR", PlayerPrefs.GetString("BirdColor", "255;255;255").Split(';')[0]);
-        dataForm.AddField("birdG", PlayerPrefs.GetString("BirdColor", "255;255;255").Split(';')[1]);
-        dataForm.AddField("birdB", PlayerPrefs.GetString("BirdColor", "255;255;255").Split(';')[2]);
-        dataForm.AddField("overlayR", PlayerPrefs.GetString("OverlayColor", "255;255;255").Split(';')[0]);
-        dataForm.AddField("overlayG", PlayerPrefs.GetString("OverlayColor", "255;255;255").Split(';')[1]);
-        dataForm.AddField("overlayB", PlayerPrefs.GetString("OverlayColor", "255;255;255").Split(';')[2]);
-        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "saveAccount.php", dataForm.GetWWWForm());
         request.SetRequestHeader("Requester", "BerryDashClient");
         request.SetRequestHeader("ClientVersion", Application.version);
         request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
         await request.SendWebRequest();
         if (request.result != UnityWebRequest.Result.Success)
         {
-            AccountHandler.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
+            loggedInLoadButton.interactable = true;
+            loggedInSaveButton.interactable = true;
+            loggedInBackButton.interactable = true;
+            Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
             return;
         }
         string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
-        switch (response)
+        if (response == "-999")
         {
-            case "-999":
+            loggedInLoadButton.interactable = true;
-                AccountHandler.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red);
+            loggedInSaveButton.interactable = true;
-                break;
+            loggedInBackButton.interactable = true;
-            case "-998":
+            Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red);
-                AccountHandler.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red);
+            return;
-                break;
+        }
-            case "-997":
+        else if (response == "-998")
-                AccountHandler.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red);
+        {
-                break;
+            loggedInLoadButton.interactable = true;
-            case "1":
+            loggedInSaveButton.interactable = true;
-                AccountHandler.UpdateStatusText(loggedInText, "Synced account", Color.green);
+            loggedInBackButton.interactable = true;
-                break;
+            Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red);
-            case "-1":
+            return;
-                AccountHandler.UpdateStatusText(loggedInText, "Failed to find info about your user (refresh login?)", Color.red);
+        }
-                break;
+        else if (response == "-997")
-            default:
+        {
-                AccountHandler.UpdateStatusText(loggedInText, "Unknown server response", Color.red);
+            loggedInLoadButton.interactable = true;
-                break;
+            loggedInSaveButton.interactable = true;
+            loggedInBackButton.interactable = true;
+            Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red);
+            return;
+        }
+        else if (response == "-996")
+        {
+            loggedInLoadButton.interactable = true;
+            loggedInSaveButton.interactable = true;
+            loggedInBackButton.interactable = true;
+            Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red);
+            return;
+        }
+        else
+        {
+            var jsonResponse = JObject.Parse(response);
+            if ((bool)jsonResponse["success"])
+            {
+                Tools.UpdateStatusText(loggedInText, "Synced account", Color.green);
+            }
+            else
+            {
+                Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
+            }
         }
         loggedInLoadButton.interactable = true;
         loggedInSaveButton.interactable = true;
+        loggedInBackButton.interactable = true;
     }
 
     async void LoadAccount()
     {
         loggedInLoadButton.interactable = false;
         loggedInSaveButton.interactable = false;
+        loggedInBackButton.interactable = false;
         EncryptedWWWForm dataForm = new();
-        dataForm.AddField("userName", PlayerPrefs.GetString("userName", ""));
+        dataForm.AddField("token", BazookaManager.Instance.GetAccountSession());
-        dataForm.AddField("gameSession", PlayerPrefs.GetString("gameSession", ""));
+        dataForm.AddField("username", BazookaManager.Instance.GetAccountName());
-        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loadAccount.php", dataForm.GetWWWForm());
+        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loadAccount.php", dataForm.form);
         request.SetRequestHeader("Requester", "BerryDashClient");
         request.SetRequestHeader("ClientVersion", Application.version);
         request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
         await request.SendWebRequest();
         if (request.result != UnityWebRequest.Result.Success)
         {
-            AccountHandler.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
+            loggedInLoadButton.interactable = true;
+            loggedInSaveButton.interactable = true;
+            loggedInBackButton.interactable = true;
+            Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
             return;
         }
         string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
-        switch (response)
+        if (response == "-999")
         {
-            case "-999":
+            loggedInLoadButton.interactable = true;
-                AccountHandler.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red);
+            loggedInSaveButton.interactable = true;
-                break;
+            loggedInBackButton.interactable = true;
-            case "-998":
+            Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red);
-                AccountHandler.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red);
+            return;
-                break;
+        }
-            case "-997":
+        else if (response == "-998")
-                AccountHandler.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red);
+        {
-                break;
+            loggedInLoadButton.interactable = true;
-            case "-1":
+            loggedInSaveButton.interactable = true;
-                AccountHandler.UpdateStatusText(loggedInText, "Failed to find info about your user (refresh login?)", Color.red);
+            loggedInBackButton.interactable = true;
-                break;
+            Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red);
-            default:
+            return;
-                var split = response.Split(":");
+        }
-                if (split[0] == "1")
+        else if (response == "-997")
-                {
+        {
-                    PlayerPrefs.SetString("HighScoreV2", split[1]);
+            loggedInLoadButton.interactable = true;
-                    PlayerPrefs.SetInt("icon", int.Parse(split[2]));
+            loggedInSaveButton.interactable = true;
-                    PlayerPrefs.SetInt("overlay", int.Parse(split[3]));
+            loggedInBackButton.interactable = true;
-                    PlayerPrefs.SetString("TotalNormalBerries", split[4]);
+            Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red);
-                    PlayerPrefs.SetString("TotalPoisonBerries", split[5]);
+            return;
-                    PlayerPrefs.SetString("TotalSlowBerries", split[6]);
+        }
-                    PlayerPrefs.SetString("TotalUltraBerries", split[7]);
+        else if (response == "-996")
-                    PlayerPrefs.SetString("TotalSpeedyBerries", split[8]);
+        {
-                    PlayerPrefs.SetString("TotalAttempts", split[9]);
+            loggedInLoadButton.interactable = true;
-                    PlayerPrefs.SetString("BirdColor", $"{split[10]};{split[11]};{split[12]}");
+            loggedInSaveButton.interactable = true;
-                    PlayerPrefs.SetString("OverlayColor", $"{split[13]};{split[14]};{split[15]}");
+            loggedInBackButton.interactable = true;
-                    AccountHandler.UpdateStatusText(loggedInText, "Loaded account data", Color.green);
+            Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red);
-                }
+            return;
-                else
+        }
-                {
+        else
-                    AccountHandler.UpdateStatusText(loggedInText, "Unknown server response", Color.red);
+        {
-                }
+            var jsonResponse = JObject.Parse(response);
-                break;
+            if ((bool)jsonResponse["success"])
+            {
+                BazookaManager.Instance.saveFile = JObject.FromObject(jsonResponse["data"]);
+                Tools.UpdateStatusText(loggedInText, "Loaded account data", Color.green);
+            }
+            else
+            {
+                Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
+            }
         }
         loggedInLoadButton.interactable = true;
         loggedInSaveButton.interactable = true;
+        loggedInBackButton.interactable = true;
     }
-}
+}

Assets/Scripts/AccountMenu/AccountLoggedOut.cs

@@ -7,7 +7,6 @@ public class AccountLoggedOut : MonoBehaviour
     public Button loggedOutLoginButton;
     public Button loggedOutRegisterButton;
     public Button loggedOutBackButton;
-    public bool clearValues = false;
 
     void Awake()
     {
@@ -15,26 +14,4 @@ public class AccountLoggedOut : MonoBehaviour
         loggedOutRegisterButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(3));
         loggedOutBackButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu"));
     }
-
+}
-    void OnEnable()
-    {
-        if (clearValues)
-        {
-            PlayerPrefs.DeleteKey("gameSession");
-            PlayerPrefs.DeleteKey("userName");
-            PlayerPrefs.DeleteKey("userId");
-            PlayerPrefs.SetString("HighScoreV2", "0");
-            PlayerPrefs.SetInt("icon", 1);
-            PlayerPrefs.SetInt("overlay", 0);
-            PlayerPrefs.DeleteKey("TotalNormalBerries");
-            PlayerPrefs.DeleteKey("TotalPoisonBerries");
-            PlayerPrefs.DeleteKey("TotalSlowBerries");
-            PlayerPrefs.DeleteKey("TotalUltraBerries");
-            PlayerPrefs.DeleteKey("TotalSpeedyBerries");
-            PlayerPrefs.DeleteKey("TotalAttempts");
-            PlayerPrefs.DeleteKey("BirdColor");
-            PlayerPrefs.DeleteKey("OverlayColor");
-            clearValues = false;
-        }
-    }
-}

Assets/Scripts/AccountMenu/AccountLogin.cs

@@ -1,4 +1,6 @@
 using System.Numerics;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Networking;
@@ -27,70 +29,68 @@ public class AccountLogin : MonoBehaviour
 
     async void SubmitLogin()
     {
+        loginBackButton.interactable = false;
+        if (loginUsernameInput.text == string.Empty || loginPasswordInput.text == string.Empty)
+        {
+            Tools.UpdateStatusText(loginPanelStatusText, "All input fields must be filled", Color.red);
+            return;
+        }
         EncryptedWWWForm dataForm = new();
         dataForm.AddField("username", loginUsernameInput.text);
         dataForm.AddField("password", loginPasswordInput.text);
-        dataForm.AddField("currentHighScore", PlayerPrefs.GetString("HighScoreV2", "0"));
+        dataForm.AddField("currentHighScore", BazookaManager.Instance.GetGameStoreHighScore().ToString());
-        dataForm.AddField("loginType", "0");
+        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm.form);
-        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm.GetWWWForm());
         request.SetRequestHeader("Requester", "BerryDashClient");
         request.SetRequestHeader("ClientVersion", Application.version);
         request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
         await request.SendWebRequest();
         if (request.result != UnityWebRequest.Result.Success)
         {
-            AccountHandler.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red);
+            loginBackButton.interactable = true;
+            Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red);
             return;
         }
         string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
         if (response == "-999")
         {
-            AccountHandler.UpdateStatusText(loginPanelStatusText, "Server error while fetching data", Color.red);
+            loginBackButton.interactable = true;
+            Tools.UpdateStatusText(loginPanelStatusText, "Server error while fetching data", Color.red);
             return;
         }
         else if (response == "-998")
         {
-            AccountHandler.UpdateStatusText(loginPanelStatusText, "Client version too outdated to access servers", Color.red);
+            loginBackButton.interactable = true;
+            Tools.UpdateStatusText(loginPanelStatusText, "Client version too outdated to access servers", Color.red);
             return;
         }
         else if (response == "-997")
         {
-            AccountHandler.UpdateStatusText(loginPanelStatusText, "Encryption/decryption issues", Color.red);
+            loginBackButton.interactable = true;
+            Tools.UpdateStatusText(loginPanelStatusText, "Encryption/decryption issues", Color.red);
             return;
         }
-        else if (response == "-1")
+        else if (response == "-996")
         {
-            AccountHandler.UpdateStatusText(loginPanelStatusText, "Incorrect username or password", Color.red);
+            loginBackButton.interactable = true;
-        }
+            Tools.UpdateStatusText(loginPanelStatusText, "Can't send requests on self-built instance", Color.red);
-        else if (response.Split(":")[0] == "1")
+            return;
-        {
-            string[] array = response.Split(':');
-            string session = array[1];
-            string userName = array[2];
-            int userId = int.Parse(array[3]);
-            BigInteger highScore = BigInteger.Parse(array[4]);
-            int iconId = int.Parse(array[5]);
-            int overlayId = int.Parse(array[6]);
-            PlayerPrefs.SetString("gameSession", session);
-            PlayerPrefs.SetString("userName", userName);
-            PlayerPrefs.SetInt("userId", userId);
-            PlayerPrefs.SetString("HighScoreV2", highScore.ToString());
-            PlayerPrefs.SetInt("icon", iconId);
-            PlayerPrefs.SetInt("overlay", overlayId);
-            PlayerPrefs.SetString("TotalNormalBerries", array[7]);
-            PlayerPrefs.SetString("TotalPoisonBerries", array[8]);
-            PlayerPrefs.SetString("TotalSlowBerries", array[9]);
-            PlayerPrefs.SetString("TotalUltraBerries", array[10]);
-            PlayerPrefs.SetString("TotalSpeedyBerries", array[11]);
-            PlayerPrefs.SetString("TotalAttempts", array[12]);
-            PlayerPrefs.SetString("BirdColor", $"{array[13]};{array[14]};{array[15]}");
-            PlayerPrefs.SetString("OverlayColor", $"{array[16]};{array[17]};{array[18]}");
-            AccountHandler.instance.SwitchPanel(0);
-            AccountHandler.UpdateStatusText(loginPanelStatusText, "", Color.red);
         }
         else
         {
-            AccountHandler.UpdateStatusText(loginPanelStatusText, "Unknown server response", Color.red);
+            var jsonResponse = JObject.Parse(response);
+            if ((bool)jsonResponse["success"])
+            {
+                BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]);
+                BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]);
+                BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["userid"]));
+                AccountHandler.instance.SwitchPanel(0);
+                Tools.UpdateStatusText(loginPanelStatusText, "", Color.red);
+            }
+            else
+            {
+                Tools.UpdateStatusText(loginPanelStatusText, (string)jsonResponse["message"], Color.red);
+            }
         }
+        loginBackButton.interactable = true;
     }
-}
+}

Assets/Scripts/AccountMenu/AccountRefreshLogin.cs

@@ -1,3 +1,5 @@
+using System.Numerics;
+using Newtonsoft.Json.Linq;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Networking;
@@ -25,55 +27,62 @@ public class AccountRefreshLogin : MonoBehaviour
 
     async void RefreshLogin()
     {
+        refreshLoginBackButton.interactable = false;
         EncryptedWWWForm dataForm = new();
         dataForm.AddField("username", refreshLoginUsernameInput.text);
         dataForm.AddField("password", refreshLoginPasswordInput.text);
-        dataForm.AddField("loginType", "1");
+        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm.form);
-        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm.GetWWWForm());
         request.SetRequestHeader("Requester", "BerryDashClient");
         request.SetRequestHeader("ClientVersion", Application.version);
         request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
         await request.SendWebRequest();
         if (request.result != UnityWebRequest.Result.Success)
         {
-            AccountHandler.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red);
+            refreshLoginBackButton.interactable = true;
+            Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red);
             return;
         }
         string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
         if (response == "-999")
         {
-            AccountHandler.UpdateStatusText(refreshLoginStatusText, "Server error while fetching data", Color.red);
+            refreshLoginBackButton.interactable = true;
+            Tools.UpdateStatusText(refreshLoginStatusText, "Server error while fetching data", Color.red);
             return;
         }
         else if (response == "-998")
         {
-            AccountHandler.UpdateStatusText(refreshLoginStatusText, "Client version too outdated to access servers", Color.red);
+            refreshLoginBackButton.interactable = true;
+            Tools.UpdateStatusText(refreshLoginStatusText, "Client version too outdated to access servers", Color.red);
             return;
         }
         else if (response == "-997")
         {
-            AccountHandler.UpdateStatusText(refreshLoginStatusText, "Encryption/decryption issues", Color.red);
+            refreshLoginBackButton.interactable = true;
+            Tools.UpdateStatusText(refreshLoginStatusText, "Encryption/decryption issues", Color.red);
             return;
         }
-        else if (response == "-1")
+        else if (response == "-996")
         {
-            AccountHandler.UpdateStatusText(refreshLoginStatusText, "Incorrect username or password", Color.red);
+            refreshLoginBackButton.interactable = true;
-        }
+            Tools.UpdateStatusText(refreshLoginStatusText, "Can't send requests on self-built instance", Color.red);
-        else if (response.Split(":")[0] == "1")
+            return;
-        {
-            string[] array = response.Split(':');
-            string session = array[1];
-            string userName = array[2];
-            int userId = int.Parse(array[3]);
-            PlayerPrefs.SetString("gameSession", session);
-            PlayerPrefs.SetString("userName", userName);
-            PlayerPrefs.SetInt("userId", userId);
-            AccountHandler.instance.SwitchPanel(0);
-            AccountHandler.UpdateStatusText(refreshLoginStatusText, "", Color.red);
         }
         else
         {
-            AccountHandler.UpdateStatusText(refreshLoginStatusText, "Unknown server response", Color.red);
+            var jsonResponse = JObject.Parse(response);
+            if ((bool)jsonResponse["success"])
+            {
+                BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]);
+                BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]);
+                BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["userid"]));
+                AccountHandler.instance.SwitchPanel(0);
+                Tools.UpdateStatusText(refreshLoginStatusText, "", Color.red);
+            }
+            else
+            {
+                Tools.UpdateStatusText(refreshLoginStatusText, (string)jsonResponse["message"], Color.red);
+            }
         }
+        refreshLoginBackButton.interactable = true;
     }
-}
+}

Assets/Scripts/AccountMenu/AccountRegister.cs

@@ -1,5 +1,4 @@
-using System;
+using Newtonsoft.Json.Linq;
-using System.Text.RegularExpressions;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Networking;
@@ -34,65 +33,83 @@ public class AccountRegister : MonoBehaviour
 
     async void SubmitRegister()
     {
-        if (!registerEmailInput.text.Trim().Equals(registerRetypeEmailInput.text.Trim(), StringComparison.OrdinalIgnoreCase))
+        registerBackButton.interactable = false;
+        if (
+            registerUsernameInput.text == string.Empty ||
+            registerEmailInput.text == string.Empty ||
+            registerRetypeEmailInput.text == string.Empty ||
+            registerPasswordInput.text == string.Empty ||
+            registerRetypePasswordInput.text == string.Empty
+        )
         {
-            AccountHandler.UpdateStatusText(registerPanelStatusText, "Email doesn't match", Color.red);
+            registerBackButton.interactable = true;
+            Tools.UpdateStatusText(registerPanelStatusText, "All input fields must be filled", Color.red);
             return;
         }
-        if (!registerPasswordInput.text.Trim().Equals(registerRetypePasswordInput.text.Trim(), StringComparison.OrdinalIgnoreCase))
+        if (registerEmailInput.text != registerRetypeEmailInput.text)
         {
-            AccountHandler.UpdateStatusText(registerPanelStatusText, "Password doesn't match", Color.red);
+            registerBackButton.interactable = true;
+            Tools.UpdateStatusText(registerPanelStatusText, "Emails don't match", Color.red);
             return;
         }
-        if (!Regex.IsMatch(registerUsernameInput.text, "^[a-zA-Z0-9]{3,16}$"))
+        if (registerPasswordInput.text != registerRetypePasswordInput.text)
         {
-            AccountHandler.UpdateStatusText(registerPanelStatusText, "Username must be 3-16 characters, letters and numbers only", Color.red);
+            registerBackButton.interactable = true;
+            Tools.UpdateStatusText(registerPanelStatusText, "Passwords don't match", Color.red);
             return;
         }
         EncryptedWWWForm dataForm = new();
         dataForm.AddField("username", registerUsernameInput.text);
         dataForm.AddField("email", registerEmailInput.text);
         dataForm.AddField("password", registerPasswordInput.text);
-        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "registerAccount.php", dataForm.GetWWWForm());
+        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "registerAccount.php", dataForm.form);
         request.SetRequestHeader("Requester", "BerryDashClient");
         request.SetRequestHeader("ClientVersion", Application.version);
         request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
         await request.SendWebRequest();
         if (request.result != UnityWebRequest.Result.Success)
         {
-            AccountHandler.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red);
+            registerBackButton.interactable = true;
+            Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red);
             return;
         }
         string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
-        switch (response)
+        if (response == "-999")
         {
-            case "-999":
+            registerBackButton.interactable = true;
-                AccountHandler.UpdateStatusText(registerPanelStatusText, "Server error while fetching data", Color.red);
+            Tools.UpdateStatusText(registerPanelStatusText, "Server error while fetching data", Color.red);
-                break;
+            return;
-            case "-998":
-                AccountHandler.UpdateStatusText(registerPanelStatusText, "Client version too outdated to access servers", Color.red);
-                break;
-            case "-997":
-                AccountHandler.UpdateStatusText(registerPanelStatusText, "Encryption/decryption issues", Color.red);
-                break;
-            case "1":
-                AccountHandler.instance.SwitchPanel(2);
-                break;
-            case "-1":
-                AccountHandler.UpdateStatusText(registerPanelStatusText, "Username must be 3-16 characters, letters and numbers only", Color.red);
-                break;
-            case "-2":
-                AccountHandler.UpdateStatusText(registerPanelStatusText, "Email not valid", Color.red);
-                break;
-            case "-3":
-                AccountHandler.UpdateStatusText(registerPanelStatusText, "Password must have 8 characters, one number and one letter", Color.red);
-                break;
-            case "-4":
-                AccountHandler.UpdateStatusText(registerPanelStatusText, "Username or email already exists", Color.red);
-                break;
-            default:
-                AccountHandler.UpdateStatusText(registerPanelStatusText, "Unknown server response", Color.red);
-                break;
         }
+        else if (response == "-998")
+        {
+            registerBackButton.interactable = true;
+            Tools.UpdateStatusText(registerPanelStatusText, "Client version too outdated to access servers", Color.red);
+            return;
+        }
+        else if (response == "-997")
+        {
+            registerBackButton.interactable = true;
+            Tools.UpdateStatusText(registerPanelStatusText, "Encryption/decryption issues", Color.red);
+            return;
+        }
+        else if (response == "-996")
+        {
+            registerBackButton.interactable = true;
+            Tools.UpdateStatusText(registerPanelStatusText, "Can't send requests on self-built instance", Color.red);
+            return;
+        }
+        else
+        {
+            var jsonResponse = JObject.Parse(response);
+            if ((bool)jsonResponse["success"])
+            {
+                AccountHandler.instance.SwitchPanel(2);
+            }
+            else
+            {
+                Tools.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red);
+            }
+        }
+        registerBackButton.interactable = true;
     }
-}
+}

Assets/Scripts/BazookaManager.cs

@@ -0,0 +1,818 @@
+using System.IO;
+using System.Numerics;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+
+public class BazookaManager : MonoBehaviour
+{
+    public static BazookaManager Instance;
+    private bool firstLoadDone = false;
+    public JObject saveFile = new()
+    {
+        ["version"] = "0"
+    };
+
+    void Awake()
+    {
+        if (Instance == null)
+        {
+            Instance = this;
+            DontDestroyOnLoad(gameObject);
+            if (!firstLoadDone)
+            {
+                firstLoadDone = true;
+                Load();
+            }
+        }
+        else
+        {
+            Destroy(gameObject);
+        }
+    }
+
+    void OnApplicationQuit()
+    {
+        Save();
+    }
+
+    void OnApplicationPause(bool pause)
+    {
+        if (pause)
+        {
+            Save();
+        }
+    }
+
+    public void Load()
+    {
+        string path = Path.Join(Application.persistentDataPath, SensitiveInfo.BAZOOKA_MANAGER_FILE_KEY + ".dat");
+        if (!File.Exists(path))
+        {
+            File.Create(path).Dispose();
+        }
+        else
+        {
+            try
+            {
+                var tempSaveFile = JObject.Parse(SensitiveInfo.DecryptRaw(File.ReadAllBytes(path), SensitiveInfo.BAZOOKA_MANAGER_KEY));
+                if (tempSaveFile != null) saveFile = tempSaveFile;
+            }
+            catch
+            {
+                Debug.LogWarning("Failed to load save file");
+            }
+        }
+        if (!PlayerPrefs.HasKey("LegacyConversion"))
+        {
+            PlayerPrefs.SetInt("LegacyConversion", 1);
+            if (PlayerPrefs.HasKey("HighScoreV2"))
+            {
+                try
+                {
+                    SetGameStoreHighScore(BigInteger.Parse(PlayerPrefs.GetString("HighScoreV2", "0")));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate HighScoreV2 to new save format");
+                }
+                PlayerPrefs.DeleteKey("HighScoreV2");
+            }
+            if (PlayerPrefs.HasKey("TotalNormalBerries"))
+            {
+                try
+                {
+                    SetGameStoreTotalNormalBerries(BigInteger.Parse(PlayerPrefs.GetString("TotalNormalBerries", "0")));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate TotalNormalBerries to new save format");
+                }
+                PlayerPrefs.DeleteKey("TotalNormalBerries");
+            }
+            if (PlayerPrefs.HasKey("TotalPoisonBerries"))
+            {
+                try
+                {
+                    SetGameStoreTotalPoisonBerries(BigInteger.Parse(PlayerPrefs.GetString("TotalPoisonBerries", "0")));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate TotalPoisonBerries to new save format");
+                }
+                PlayerPrefs.DeleteKey("TotalPoisonBerries");
+            }
+            if (PlayerPrefs.HasKey("TotalSlowBerries"))
+            {
+                try
+                {
+                    SetGameStoreTotalSlowBerries(BigInteger.Parse(PlayerPrefs.GetString("TotalSlowBerries", "0")));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate TotalSlowBerries to new save format");
+                }
+                PlayerPrefs.DeleteKey("TotalSlowBerries");
+            }
+            if (PlayerPrefs.HasKey("TotalUltraBerries"))
+            {
+                try
+                {
+                    SetGameStoreTotalUltraBerries(BigInteger.Parse(PlayerPrefs.GetString("TotalUltraBerries", "0")));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate TotalUltraBerries to new save format");
+                }
+                PlayerPrefs.DeleteKey("TotalUltraBerries");
+            }
+            if (PlayerPrefs.HasKey("TotalSpeedyBerries"))
+            {
+                try
+                {
+                    SetGameStoreTotalSpeedyBerries(BigInteger.Parse(PlayerPrefs.GetString("TotalSpeedyBerries", "0")));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate TotalSpeedyBerries to new save format");
+                }
+                PlayerPrefs.DeleteKey("TotalSpeedyBerries");
+            }
+            if (PlayerPrefs.HasKey("TotalAttempts"))
+            {
+                try
+                {
+                    SetGameStoreTotalAttepts(BigInteger.Parse(PlayerPrefs.GetString("TotalAttempts", "0")));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate TotalAttempts to new save format");
+                }
+                PlayerPrefs.DeleteKey("TotalAttempts");
+            }
+            if (PlayerPrefs.HasKey("pastOverlay"))
+            {
+                PlayerPrefs.DeleteKey("pastOverlay");
+            }
+            if (PlayerPrefs.HasKey("gameSession") && PlayerPrefs.GetString("gameSession") != null && PlayerPrefs.GetString("gameSession").Length == 512)
+            {
+                try
+                {
+                    SetAccountSession(PlayerPrefs.GetString("gameSession"));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate gameSession to new save format");
+                }
+                PlayerPrefs.DeleteKey("gameSession");
+            }
+            if (PlayerPrefs.HasKey("userName"))
+            {
+                try
+                {
+                    SetAccountSession(PlayerPrefs.GetString("userName"));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate userName to new save format");
+                }
+                PlayerPrefs.DeleteKey("userName");
+            }
+            if (PlayerPrefs.HasKey("userId"))
+            {
+                try
+                {
+                    SetAccountID(PlayerPrefs.GetInt("userId", 0));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate userId to new save format");
+                }
+                PlayerPrefs.DeleteKey("userId");
+            }
+            if (PlayerPrefs.HasKey("userId"))
+            {
+                try
+                {
+                    SetAccountID(PlayerPrefs.GetInt("userId", 0));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate userId to new save format");
+                }
+                PlayerPrefs.DeleteKey("userId");
+            }
+            if (PlayerPrefs.HasKey("musicVolume"))
+            {
+                try
+                {
+                    SetSettingMusicVolume(PlayerPrefs.GetFloat("musicVolume", 1f));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate musicVolume to new save format");
+                }
+                PlayerPrefs.DeleteKey("musicVolume");
+            }
+            if (PlayerPrefs.HasKey("sfxVolume"))
+            {
+                try
+                {
+                    SetSettingSFXVolume(PlayerPrefs.GetFloat("sfxVolume", 1f));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate sfxVolume to new save format");
+                }
+                PlayerPrefs.DeleteKey("sfxVolume");
+            }
+            if (PlayerPrefs.HasKey("BirdColor"))
+            {
+                try
+                {
+                    var birdColor = PlayerPrefs.GetString("BirdColor", "255;255;255").Split(";");
+                    SetColorSettingIcon(new JArray(birdColor[0], birdColor[1], birdColor[2]));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate BirdColor to new save format");
+                }
+                PlayerPrefs.DeleteKey("BirdColor");
+            }
+            if (PlayerPrefs.HasKey("OverlayColor"))
+            {
+                try
+                {
+                    var overlayColor = PlayerPrefs.GetString("OverlayColor", "255;255;255").Split(";");
+                    SetColorSettingOverlay(new JArray(overlayColor[0], overlayColor[1], overlayColor[2]));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate OverlayColor to new save format");
+                }
+                PlayerPrefs.DeleteKey("OverlayColor");
+            }
+            if (PlayerPrefs.HasKey("OverlayColor"))
+            {
+                try
+                {
+                    var overlayColor = PlayerPrefs.GetString("OverlayColor", "255;255;255").Split(";");
+                    SetColorSettingOverlay(new JArray(overlayColor[0], overlayColor[1], overlayColor[2]));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate OverlayColor to new save format");
+                }
+                PlayerPrefs.DeleteKey("OverlayColor");
+            }
+            if (PlayerPrefs.HasKey("BackgroundColor"))
+            {
+                try
+                {
+                    var bgColor = PlayerPrefs.GetString("BackgroundColor", "58;58;58").Split(";");
+                    SetColorSettingOverlay(new JArray(bgColor[0], bgColor[1], bgColor[2]));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate BackgroundColor to new save format");
+                }
+                PlayerPrefs.DeleteKey("BackgroundColor");
+            }
+            if (PlayerPrefs.HasKey("BackgroundColor"))
+            {
+                try
+                {
+                    var bgColor = PlayerPrefs.GetString("BackgroundColor", "58;58;58").Split(";");
+                    SetColorSettingOverlay(new JArray(bgColor[0], bgColor[1], bgColor[2]));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate BackgroundColor to new save format");
+                }
+                PlayerPrefs.DeleteKey("BackgroundColor");
+            }
+            if (PlayerPrefs.HasKey("icon"))
+            {
+                try
+                {
+                    SetBirdIcon(PlayerPrefs.GetInt("icon", 1));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate icon to new save format");
+                }
+                PlayerPrefs.DeleteKey("icon");
+            }
+            if (PlayerPrefs.HasKey("overlay"))
+            {
+                try
+                {
+                    SetBirdOverlay(PlayerPrefs.GetInt("overlay", 1));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate overlay to new save format");
+                }
+                PlayerPrefs.DeleteKey("overlay");
+            }
+            if (PlayerPrefs.HasKey("overlay"))
+            {
+                try
+                {
+                    SetBirdOverlay(PlayerPrefs.GetInt("overlay", 1));
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate overlay to new save format");
+                }
+                PlayerPrefs.DeleteKey("overlay");
+            }
+            if (PlayerPrefs.HasKey("Setting1"))
+            {
+                try
+                {
+                    SetSettingFullScreen(PlayerPrefs.GetInt("Setting1", 1) == 1);
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate Setting1 to new save format");
+                }
+                PlayerPrefs.DeleteKey("Setting1");
+            }
+            if (PlayerPrefs.HasKey("Setting2"))
+            {
+                try
+                {
+                    SetSettingShowFPS(PlayerPrefs.GetInt("Setting2", 1) == 1);
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate Setting2 to new save format");
+                }
+                PlayerPrefs.DeleteKey("Setting2");
+            }
+            if (PlayerPrefs.HasKey("Setting3"))
+            {
+                try
+                {
+                    SetSettingVsync(PlayerPrefs.GetInt("Setting3", 1) == 1);
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate Setting3 to new save format");
+                }
+                PlayerPrefs.DeleteKey("Setting3");
+            }
+            if (PlayerPrefs.HasKey("Setting4"))
+            {
+                try
+                {
+                    SetSettingHideSocials(PlayerPrefs.GetInt("Setting4", 1) == 1);
+                }
+                catch
+                {
+                    Debug.LogError("Failed to migrate Setting4 to new save format");
+                }
+                PlayerPrefs.DeleteKey("Setting4");
+            }
+        }
+    }
+
+    public void Save()
+    {
+#if UNITY_EDITOR
+        return;
+#else
+        string path = Path.Join(Application.persistentDataPath, SensitiveInfo.BAZOOKA_MANAGER_FILE_KEY + ".dat");
+        var encoded = SensitiveInfo.EncryptRaw(saveFile.ToString(Newtonsoft.Json.Formatting.None), SensitiveInfo.BAZOOKA_MANAGER_KEY);
+        if (encoded == null) return;
+        using var fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None);
+        fileStream.Write(encoded, 0, encoded.Length);
+        fileStream.Flush(true);
+#endif
+    }
+
+    public void ResetSave()
+    {
+        saveFile = new JObject
+        {
+            ["version"] = "0"
+        };
+        Save();
+    }
+
+    //Bird stuff
+
+    public void SetBirdIcon(int value)
+    {
+        if (saveFile["bird"] == null) saveFile["bird"] = new JObject();
+        saveFile["bird"]["icon"] = value;
+    }
+
+    public void UnsetBirdIcon()
+    {
+        if (saveFile["bird"] == null) return;
+        if (saveFile["bird"]["icon"] == null) return;
+        (saveFile["bird"] as JObject)?.Remove("icon");
+    }
+
+    public int GetBirdIcon()
+    {
+        if (saveFile["bird"] == null) return 1;
+        if (saveFile["bird"]["icon"] == null) return 1;
+        return int.Parse(saveFile["bird"]["icon"].ToString());
+    }
+
+    public void SetBirdOverlay(int value)
+    {
+        if (saveFile["bird"] == null) saveFile["bird"] = new JObject();
+        saveFile["bird"]["overlay"] = value;
+    }
+
+
+    public void UnsetBirdOverlay()
+    {
+        if (saveFile["bird"] == null) return;
+        if (saveFile["bird"]["overlay"] == null) return;
+        (saveFile["bird"] as JObject)?.Remove("overlay");
+    }
+    public int GetBirdOverlay()
+    {
+        if (saveFile["bird"] == null) return 0;
+        if (saveFile["bird"]["overlay"] == null) return 0;
+        return int.Parse(saveFile["bird"]["overlay"].ToString());
+    }
+    
+    public void SetCustomBirdIconData(MarketplaceIconStorageType value)
+    {
+        if (saveFile["bird"] == null) saveFile["bird"] = new JObject();
+        saveFile["bird"]["customIcon"] = JObject.FromObject(value);
+    }
+
+    public void UnsetCustomBirdIconData()
+    {
+        if (saveFile["bird"] == null) return;
+        if (saveFile["bird"]["customIcon"] == null) return;
+        (saveFile["bird"] as JObject)?.Remove("customIcon");
+    }
+
+    public MarketplaceIconStorageType GetCustomBirdIconData()
+    {
+        if (saveFile["bird"] == null) return new();
+        if (saveFile["bird"]["customIcon"] == null) return new();
+        return saveFile["bird"]["customIcon"].ToObject<MarketplaceIconStorageType>();
+    }
+
+    //Settings stuff
+
+    public void SetSettingFullScreen(bool value)
+    {
+        if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
+        saveFile["settings"]["fullScreen"] = value;
+    }
+
+    public bool GetSettingFullScreen()
+    {
+        if (saveFile["settings"] == null) return true;
+        if (saveFile["settings"]["fullScreen"] == null) return true;
+        return bool.Parse(saveFile["settings"]["fullScreen"].ToString());
+    }
+
+    public void SetSettingShowFPS(bool value)
+    {
+        if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
+        saveFile["settings"]["showFps"] = value;
+    }
+
+    public bool GetSettingShowFPS()
+    {
+        if (saveFile["settings"] == null) return false;
+        if (saveFile["settings"]["showFps"] == null) return false;
+        return bool.Parse(saveFile["settings"]["showFps"].ToString());
+    }
+
+    public void SetSettingVsync(bool value)
+    {
+        if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
+        saveFile["settings"]["vsync"] = value;
+    }
+
+    public bool GetSettingVsync()
+    {
+        if (saveFile["settings"] == null) return true;
+        if (saveFile["settings"]["vsync"] == null) return true;
+        return bool.Parse(saveFile["settings"]["vsync"].ToString());
+    }
+
+    public void SetSettingHideSocials(bool value)
+    {
+        if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
+        saveFile["settings"]["hideSocials"] = value;
+    }
+
+    public bool? GetSettingHideSocials()
+    {
+        if (saveFile["settings"] == null) return null;
+        if (saveFile["settings"]["hideSocials"] == null) return null;
+        return bool.Parse(saveFile["settings"]["hideSocials"].ToString());
+    }
+
+    public void SetSettingMusicVolume(float value)
+    {
+        if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
+        saveFile["settings"]["musicVolume"] = value;
+    }
+
+    public float GetSettingMusicVolume()
+    {
+        if (saveFile["settings"] == null) return 1f;
+        if (saveFile["settings"]["musicVolume"] == null) return 1f;
+        return float.Parse(saveFile["settings"]["musicVolume"].ToString());
+    }
+
+    public void SetSettingSFXVolume(float value)
+    {
+        if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
+        saveFile["settings"]["sfxVolume"] = value;
+    }
+
+    public float GetSettingSFXVolume()
+    {
+        if (saveFile["settings"] == null) return 1f;
+        if (saveFile["settings"]["sfxVolume"] == null) return 1f;
+        return float.Parse(saveFile["settings"]["sfxVolume"].ToString());
+    }
+
+    public void SetColorSettingBackground(JArray value)
+    {
+        if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
+        if (saveFile["settings"]["colors"] == null) saveFile["settings"]["colors"] = new JObject();
+        saveFile["settings"]["colors"]["background"] = value;
+    }
+
+    public JArray GetColorSettingBackground()
+    {
+        if (saveFile["settings"] == null) return new JArray(58, 58, 58);
+        if (saveFile["settings"]["colors"] == null) return new JArray(58, 58, 58);
+        if (saveFile["settings"]["colors"]["background"] == null) return new JArray(58, 58, 58);
+        return JArray.Parse(saveFile["settings"]["colors"]["background"].ToString());
+    }
+
+    public void SetColorSettingIcon(JArray value)
+    {
+        if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
+        if (saveFile["settings"]["colors"] == null) saveFile["settings"]["colors"] = new JObject();
+        saveFile["settings"]["colors"]["icon"] = value;
+    }
+
+    public JArray GetColorSettingIcon()
+    {
+        if (saveFile["settings"] == null) return new JArray(255, 255, 255);
+        if (saveFile["settings"]["colors"] == null) return new JArray(255, 255, 255);
+        if (saveFile["settings"]["colors"]["icon"] == null) return new JArray(255, 255, 255);
+        return JArray.Parse(saveFile["settings"]["colors"]["icon"].ToString());
+    }
+
+    public void UnsetColorSettingIcon()
+    {
+        if (saveFile["settings"] == null) return;
+        if (saveFile["settings"]["colors"] == null) return;
+        if (saveFile["settings"]["colors"]["icon"] == null) return;
+        (saveFile["settings"]["colors"] as JObject)?.Remove("icon");
+    }
+
+    public void SetColorSettingOverlay(JArray value)
+    {
+        if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
+        if (saveFile["settings"]["colors"] == null) saveFile["settings"]["colors"] = new JObject();
+        saveFile["settings"]["colors"]["overlay"] = value;
+    }
+
+    public JArray GetColorSettingOverlay()
+    {
+        if (saveFile["settings"] == null) return new JArray(255, 255, 255);
+        if (saveFile["settings"]["colors"] == null) return new JArray(255, 255, 255);
+        if (saveFile["settings"]["colors"]["overlay"] == null) return new JArray(255, 255, 255);
+        return JArray.Parse(saveFile["settings"]["colors"]["overlay"].ToString());
+    }
+
+    public void UnsetColorSettingOverlay()
+    {
+        if (saveFile["settings"] == null) return;
+        if (saveFile["settings"]["colors"] == null) return;
+        if (saveFile["settings"]["colors"]["overlay"] == null) return;
+        (saveFile["settings"]["colors"] as JObject)?.Remove("overlay");
+    }
+
+    //Account stuff
+
+    public void SetAccountSession(string value)
+    {
+        if (saveFile["account"] == null) saveFile["account"] = new JObject();
+        saveFile["account"]["session"] = value;
+    }
+
+    public string GetAccountSession()
+    {
+        if (saveFile["account"] == null) return null;
+        if (saveFile["account"]["session"] == null) return null;
+        return saveFile["account"]["session"].ToString();
+    }
+
+    public void UnsetAccountSession()
+    {
+        if (saveFile["account"] == null) return;
+        (saveFile["account"] as JObject)?.Remove("session");
+    }
+
+    public void SetAccountName(string value)
+    {
+        if (saveFile["account"] == null) saveFile["account"] = new JObject();
+        saveFile["account"]["name"] = value;
+    }
+
+    public string GetAccountName()
+    {
+        if (saveFile["account"] == null) return null;
+        if (saveFile["account"]["name"] == null) return null;
+        return saveFile["account"]["name"].ToString();
+    }
+
+    public void UnsetAccountName()
+    {
+        if (saveFile["account"] == null) return;
+        (saveFile["account"] as JObject)?.Remove("name");
+    }
+
+    public void SetAccountID(BigInteger value)
+    {
+        if (saveFile["account"] == null) saveFile["account"] = new JObject();
+        saveFile["account"]["id"] = value.ToString();
+    }
+
+    public BigInteger? GetAccountID()
+    {
+        if (saveFile["account"] == null) return null;
+        if (saveFile["account"]["id"] == null) return null;
+        return BigInteger.Parse(saveFile["account"]["id"].ToString());
+    }
+
+    public void UnsetAccountID()
+    {
+        if (saveFile["account"] == null) return;
+        (saveFile["account"] as JObject)?.Remove("id");
+    }
+
+    //Game store stuff
+
+    public void SetGameStoreHighScore(BigInteger value)
+    {
+        if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject();
+        saveFile["gameStore"]["highScore"] = value.ToString();
+    }
+
+    public BigInteger GetGameStoreHighScore()
+    {
+        if (saveFile["gameStore"] == null) return 0;
+        if (saveFile["gameStore"]["highScore"] == null) return 0;
+        return BigInteger.Parse(saveFile["gameStore"]["highScore"].ToString());
+    }
+
+    public void UnsetGameStoreHighScore()
+    {
+        if (saveFile["gameStore"] == null) return;
+        (saveFile["gameStore"] as JObject)?.Remove("highScore");
+    }
+
+    public void SetGameStoreTotalAttepts(BigInteger value)
+    {
+        if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject();
+        saveFile["gameStore"]["totalAttempts"] = value.ToString();
+    }
+
+    public BigInteger GetGameStoreTotalAttepts()
+    {
+        if (saveFile["gameStore"] == null) return 0;
+        if (saveFile["gameStore"]["totalAttempts"] == null) return 0;
+        return BigInteger.Parse(saveFile["gameStore"]["totalAttempts"].ToString());
+    }
+
+    public void UnsetGameStoreTotalAttepts()
+    {
+        if (saveFile["gameStore"] == null) return;
+        (saveFile["gameStore"] as JObject)?.Remove("totalAttempts");
+    }
+
+    public void SetGameStoreTotalNormalBerries(BigInteger value)
+    {
+        if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject();
+        saveFile["gameStore"]["totalNormalBerries"] = value.ToString();
+    }
+
+    public BigInteger GetGameStoreTotalNormalBerries()
+    {
+        if (saveFile["gameStore"] == null) return 0;
+        if (saveFile["gameStore"]["totalNormalBerries"] == null) return 0;
+        return BigInteger.Parse(saveFile["gameStore"]["totalNormalBerries"].ToString());
+    }
+
+    public void UnsetGameStoreTotalNormalBerries()
+    {
+        if (saveFile["gameStore"] == null) return;
+        (saveFile["gameStore"] as JObject)?.Remove("totalNormalBerries");
+    }
+
+    public void SetGameStoreTotalPoisonBerries(BigInteger value)
+    {
+        if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject();
+        saveFile["gameStore"]["totalPoisonBerries"] = value.ToString();
+    }
+
+    public BigInteger GetGameStoreTotalPoisonBerries()
+    {
+        if (saveFile["gameStore"] == null) return 0;
+        if (saveFile["gameStore"]["totalPoisonBerries"] == null) return 0;
+        return BigInteger.Parse(saveFile["gameStore"]["totalPoisonBerries"].ToString());
+    }
+
+    public void UnsetGameStoreTotalPoisonBerries()
+    {
+        if (saveFile["gameStore"] == null) return;
+        (saveFile["gameStore"] as JObject)?.Remove("totalPoisonBerries");
+    }
+
+    public void SetGameStoreTotalSlowBerries(BigInteger value)
+    {
+        if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject();
+        saveFile["gameStore"]["totalSlowBerries"] = value.ToString();
+    }
+
+    public BigInteger GetGameStoreTotalSlowBerries()
+    {
+        if (saveFile["gameStore"] == null) return 0;
+        if (saveFile["gameStore"]["totalSlowBerries"] == null) return 0;
+        return BigInteger.Parse(saveFile["gameStore"]["totalSlowBerries"].ToString());
+    }
+
+    public void UnsetGameStoreTotalSlowBerries()
+    {
+        if (saveFile["gameStore"] == null) return;
+        (saveFile["gameStore"] as JObject)?.Remove("totalSlowBerries");
+    }
+
+    public void SetGameStoreTotalUltraBerries(BigInteger value)
+    {
+        if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject();
+        saveFile["gameStore"]["totalUltraBerries"] = value.ToString();
+    }
+
+    public BigInteger GetGameStoreTotalUltraBerries()
+    {
+        if (saveFile["gameStore"] == null) return 0;
+        if (saveFile["gameStore"]["totalUltraBerries"] == null) return 0;
+        return BigInteger.Parse(saveFile["gameStore"]["totalUltraBerries"].ToString());
+    }
+
+    public void UnsetGameStoreTotalUltraBerries()
+    {
+        if (saveFile["gameStore"] == null) return;
+        (saveFile["gameStore"] as JObject)?.Remove("totalUltraBerries");
+    }
+
+    public void SetGameStoreTotalSpeedyBerries(BigInteger value)
+    {
+        if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject();
+        saveFile["gameStore"]["totalSpeedyBerries"] = value.ToString();
+    }
+
+    public BigInteger GetGameStoreTotalSpeedyBerries()
+    {
+        if (saveFile["gameStore"] == null) return 0;
+        if (saveFile["gameStore"]["totalSpeedyBerries"] == null) return 0;
+        return BigInteger.Parse(saveFile["gameStore"]["totalSpeedyBerries"].ToString());
+    }
+
+    public void UnsetGameStoreTotalSpeedyBerries()
+    {
+        if (saveFile["gameStore"] == null) return;
+        (saveFile["gameStore"] as JObject)?.Remove("totalSpeedyBerries");
+    }
+
+    public void SetGameStoreTotalCoinBerries(BigInteger value)
+    {
+        if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject();
+        saveFile["gameStore"]["totalCoinBerries"] = value.ToString();
+    }
+
+    public BigInteger GetGameStoreTotalCoinBerries()
+    {
+        if (saveFile["gameStore"] == null) return 0;
+        if (saveFile["gameStore"]["totalCoinBerries"] == null) return 0;
+        return BigInteger.Parse(saveFile["gameStore"]["totalCoinBerries"].ToString());
+    }
+
+    public void UnsetGameStoreTotalCoinBerries()
+    {
+        if (saveFile["gameStore"] == null) return;
+        (saveFile["gameStore"] as JObject)?.Remove("totalCoinBerries");
+    }
+}

Assets/Scripts/BazookaManager.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a0df255fc60e6e3c88ebb94d2d88db4d

Assets/Scripts/BouncyButton.cs

@@ -0,0 +1,87 @@
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.InputSystem;
+
+public class BouncyButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
+{
+    bool isHovered = false;
+    bool isHeld = false;
+    bool didBounce = false;
+    Vector3 originalScale;
+    Vector3 finalScale;
+
+    void Start()
+    {
+        originalScale = transform.localScale;
+        finalScale = originalScale * 1.1f;
+    }
+
+    public void OnPointerEnter(PointerEventData eventData) => isHovered = true;
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        isHovered = false;
+        ResetScale();
+    }
+    void OnDisable()
+    {
+        isHovered = false;
+        ResetScale();
+    }
+
+    void Update()
+    {
+        if (Application.isMobilePlatform)
+        {
+            isHeld = Touchscreen.current != null && Touchscreen.current.press.isPressed;
+        }
+        else
+        {
+            isHeld = Mouse.current != null && Mouse.current.leftButton.isPressed;
+        }
+
+        if (isHovered && isHeld && !didBounce)
+        {
+            StartCoroutine(BounceOnce());
+            didBounce = true;
+        }
+
+        if ((!isHovered || !isHeld) && didBounce)
+        {
+            ResetScale();
+        }
+    }
+
+    void ResetScale()
+    {
+        StopAllCoroutines();
+        transform.localScale = originalScale;
+        didBounce = false;
+    }
+
+    System.Collections.IEnumerator BounceOnce()
+    {
+        float t = 0.125f;
+        Vector3 s1 = originalScale * 1.12f;
+        Vector3 s2 = originalScale * 1.06f;
+        Vector3 s3 = finalScale;
+
+        yield return LerpScale(originalScale, s1, t);
+        yield return LerpScale(s1, s2, t * 0.5f);
+        yield return LerpScale(s2, s3, t * 0.5f);
+
+        transform.localScale = s3;
+    }
+
+    System.Collections.IEnumerator LerpScale(Vector3 from, Vector3 to, float duration)
+    {
+        float elapsed = 0f;
+        while (elapsed < duration)
+        {
+            elapsed += Time.deltaTime;
+            float p = elapsed / duration;
+            transform.localScale = Vector3.Lerp(from, to, p);
+            yield return null;
+        }
+        transform.localScale = to;
+    }
+}

Assets/Scripts/BouncyButton.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 200e77fbcd2ab3206aa2fb9665984330

Assets/Scripts/BouncyPanel.cs

@@ -0,0 +1,15 @@
+using UnityEngine;
+
+public class BouncyPanel : MonoBehaviour
+{
+    public float frequency = 8f;
+    public float minSize = 1f;
+    public float maxSize = 1.1f;
+
+    void Update()
+    {
+        float newsize = (Mathf.Sin(Time.time * frequency) + 1f) / 2f;
+        var size = Mathf.Lerp(minSize, maxSize, newsize);
+        gameObject.transform.localScale = new(size, size, size);
+    }
+}

Assets/Scripts/BouncyPanel.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9c3738bf0236e043c9bdf9972b8a7375

Assets/Scripts/BouncyText.cs

@@ -0,0 +1,21 @@
+using UnityEngine;
+using TMPro;
+
+public class BouncyText : MonoBehaviour
+{
+    public float frequency = 2f;
+    public float minSize = 10f;
+    public float maxSize = 12f;
+    private TextMeshProUGUI text;
+
+    void Start()
+    {
+        text = GetComponent<TextMeshProUGUI>();
+    }
+
+    void Update()
+    {
+        float newsize = (Mathf.Sin(Time.time * frequency) + 1f) / 2f;
+        text.fontSize = Mathf.Lerp(minSize, maxSize, newsize);
+    }
+}