Merge remote-tracking branch 'origin/main' into beni

Assets/Art Final/Shelf Sprites/polaroid frame_fireworks.png.meta

@@ -32,7 +32,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 1
+    filterMode: 0
     aniso: 1
     mipBias: 0
     wrapU: 1
@@ -46,7 +46,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 16
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -75,6 +75,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Font/SFCartoonistHand SDF 1.asset

@@ -41,7 +41,7 @@ Texture2D:
   m_ColorSpace: 0
   m_PlatformBlob: 
   image data: 1048576
-  _typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e11131310090907030608090d0f100f09090703030709090d0f0f0c07070401000000000000000000000000000000000306070707070707070707070707070707070707070707070707070707070707070707070707070707070706050300000000000000000000000000000000000003060707060400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080b0e101212131312100d0a06060300000000000000000000000000000000000000000000000000000000000005080a0b13110d08080602000000000000000000000000000000000000000000000000000000000000000000000000030608090b080705020000000000000000000000000000000000000000000000000000000000000000000001040707080707040100000000000000000000000000000000000000000000000000000000000000000000000000000307090911130f07060400000000000000000000000105090b0b11100a090704000000000000000000000000000000000307090911130f0706040000000000000000000406070d100e0808060200000000000000000407090a111310080705020000000000000000000000000000000000000000000000010406070b0f11121312110e0a070603020507081013110a09070400000000000000000000000000000000000000030709090f0d07060400000000000000000000000000000000000000000000000000000000000002060a0c0d13110c0706040000000000000000000000000002070a0c0d12120e070604000000000000000000000000000000000000000306060b101213131313131313121212111111100f0f0e0d0c0a09070705010000000000000000000000000000000000000000000000000000000000000000030608090d0f1112131212100d0a07060400000000000000000000000000000000000000000000000000000000000000000000000000000000010406070b0d10111213131312100f0c09070603000000000000000000000000000000000000000000000000000003080b0d0e1312100a0a080400000000000000000000000000000000000000000000000000000306060e13110a090704000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000406070d100e080705020000000000000000000000000000000000000000000000000000000000020507080b0e101112131312100e0b070704010000000000000000000000000000000000000000000000000000000406070f12120a0a08040000000000000000000000000000000000000000010406070d1110090806030000000000000000000000000000000000000002090e1214151b1e201f1d1615130f1215151a1c1d1c1615130f0f1315161a1b1c191413110d0801000000000000000000000000060c1012131414141414141414141414141414141414141414141414141414141414141414141414141414141413120f0b060000000000000000000000000000060b1012131313100c0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003080e111414181b1d1e1f201f1e1d1a1613120f0b060000000000000000000000000000000000000000000000000000060c111517181f1e1a1514120e09030000000000000000000000000000000000000000000000000000000000000000030a0f121515181514120e090300000000000000000000000000000000000000000000000000000000000002080d111314151413110d080100000000000000000000000000000000000000000000000000000000000000000000040a0f1315161e1f1b1313100c070000000000000000060c111517181e1d171614100b05000000000000000000000000040a0f1315161e1f1c1413100c070100000000070c1012131a1d1b1514120e0903Line truncated
+  _typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e11131310090907030608090d0f100f09090703030709090d0f0f0c07070401000000000000000000000000000000000306070707070707070707070707070707070707070707070707070707070707070707070707070707070706050300000000000000000000000000000000000003060707060400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080b0e101212131312100d0a06060300000000000000000000000000000000000000000000000000000000000005080a0b13110d08080602000000000000000000000000000000000000000000000000000000000000000000000000030608090b080705020000000000000000000000000000000000000000000000000000000000000000000001040707080707040100000000000000000000000000000000000000000000000000000000000000000000000000000307090911130f07060400000000000000000000000105090b0b11100a090704000000000000000000000000000000000307090911130f0706040000000000000000000406070d100e0808060200000000000000000407090a111310080705020000000000000000000000000000000000000000000000010406070b0f11121312110e0a070603020507081013110a09070400000000000000000000000000000000000000030709090f0d07060400000000000000000000000000000000000000000000000000000000000002060a0c0d13110c0706040000000000000000000000000002070a0c0d12120e070604000000000000000000000000000000000000000306060b101213131313131313121212111111100f0f0e0d0c0a09070705010000000000000000000000000000000000000000000000000000000000000000030608090d0f1112131212100d0a07060400000000000000000000000000000000000000000000000000000000000000000000000000000000010406070b0d10111213131312100f0c09070603000000000000000000000000000000000000000000000000000003080b0d0e1312100a0a080400000000000000000000000000000000000000000000000000000306060e13110a090704000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000406070d100e080705020000000000000000000000000000000000000000000000000000000000020507080b0e101112131312100e0b070704010000000000000000000000000000000000000000000000000000000406070f12120a0a08040000000000000000000000000000000000000000010406070d1110090806030000000000000000000000000000000000000002090e1214151b1e201f1d1615130f1215151a1c1d1c1615130f0f1315161a1b1c191413110d0801000000000000000000000000060c1012131414141414141414141414141414141414141414141414141414141414141414141414141414141413120f0b060000000000000000000000000000060b1012131313100c0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003080e111414181b1d1e1f201f1e1d1a1613120f0b060000000000000000000000000000000000000000000000000000060c111517181f1e1a1514120e09030000000000000000000000000000000000000000000000000000000000000000030a0f121515181514120e090300000000000000000000000000000000000000000000000000000000000002080d111314151413110d080100000000000000000000000000000000000000000000000000000000000000000000040a0f1315161e1f1b1313100c070000000000000000060c111517181e1d171614100b05000000000000000000000000040a0f1315161e1f1c1413100c070100000000070c1012131a1d1b1514120e0903Line truncated
   m_StreamData:
     serializedVersion: 2
     offset: 0
@@ -999,31 +999,17 @@ MonoBehaviour:
       m_Height: 60
     m_Scale: 1
     m_AtlasIndex: 0
-  - m_Index: 59
+  - m_Index: 48
     m_Metrics:
-      m_Width: 39.03125
+      m_Width: 41.84375
       m_Height: 59.984375
-      m_HorizontalBearingX: 1.40625
+      m_HorizontalBearingX: 2.109375
       m_HorizontalBearingY: 59.984375
-      m_HorizontalAdvance: 41.84375
+      m_HorizontalAdvance: 46.0625
     m_GlyphRect:
       m_X: 743
       m_Y: 168
-      m_Width: 40
+      m_Width: 42
-      m_Height: 60
-    m_Scale: 1
-    m_AtlasIndex: 0
-  - m_Index: 43
-    m_Metrics:
-      m_Width: 35.546875
-      m_Height: 59.984375
-      m_HorizontalBearingX: 0.21875
-      m_HorizontalBearingY: 59.984375
-      m_HorizontalAdvance: 38.1875
-    m_GlyphRect:
-      m_X: 802
-      m_Y: 171
-      m_Width: 36
       m_Height: 60
     m_Scale: 1
     m_AtlasIndex: 0
@@ -1035,65 +1021,37 @@ MonoBehaviour:
       m_HorizontalBearingY: 59.984375
       m_HorizontalAdvance: 41.265625
     m_GlyphRect:
-      m_X: 857
+      m_X: 804
-      m_Y: 247
+      m_Y: 171
       m_Width: 39
       m_Height: 60
     m_Scale: 1
     m_AtlasIndex: 0
-  - m_Index: 9
+  - m_Index: 27
     m_Metrics:
-      m_Width: 17.1875
+      m_Width: 9.359375
-      m_Height: 59.984375
+      m_Height: 33.21875
-      m_HorizontalBearingX: 3.515625
+      m_HorizontalBearingX: 5.71875
-      m_HorizontalBearingY: 59.984375
+      m_HorizontalBearingY: 33.21875
-      m_HorizontalAdvance: 25.265625
+      m_HorizontalAdvance: 21
     m_GlyphRect:
       m_X: 992
       m_Y: 168
-      m_Width: 18
+      m_Width: 11
-      m_Height: 60
+      m_Height: 34
     m_Scale: 1
     m_AtlasIndex: 0
-  - m_Index: 33
+  - m_Index: 16
     m_Metrics:
-      m_Width: 46.796875
+      m_Width: 22.984375
-      m_Height: 50.265625
+      m_Height: 59.984375
-      m_HorizontalBearingX: 5.625
+      m_HorizontalBearingX: 1.1875
-      m_HorizontalBearingY: 55.5
+      m_HorizontalBearingY: 59.984375
-      m_HorizontalAdvance: 57.96875
+      m_HorizontalAdvance: 25.359375
     m_GlyphRect:
-      m_X: 915
+      m_X: 862
       m_Y: 247
-      m_Width: 48
+      m_Width: 24
-      m_Height: 51
-    m_Scale: 1
-    m_AtlasIndex: 0
-  - m_Index: 10
-    m_Metrics:
-      m_Width: 17.1875
-      m_Height: 59.984375
-      m_HorizontalBearingX: 4.4375
-      m_HorizontalBearingY: 59.984375
-      m_HorizontalAdvance: 25.265625
-    m_GlyphRect:
-      m_X: 591
-      m_Y: 169
-      m_Width: 18
-      m_Height: 60
-    m_Scale: 1
-    m_AtlasIndex: 0
-  - m_Index: 23
-    m_Metrics:
-      m_Width: 37.703125
-      m_Height: 59.984375
-      m_HorizontalBearingX: 5.5
-      m_HorizontalBearingY: 59.984375
-      m_HorizontalAdvance: 46.28125
-    m_GlyphRect:
-      m_X: 915
-      m_Y: 317
-      m_Width: 39
       m_Height: 60
     m_Scale: 1
     m_AtlasIndex: 0
@@ -1359,32 +1317,20 @@ MonoBehaviour:
     m_GlyphIndex: 98
     m_Scale: 1
   - m_ElementType: 1
-    m_Unicode: 90
+    m_Unicode: 79
-    m_GlyphIndex: 59
+    m_GlyphIndex: 48
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 74
-    m_GlyphIndex: 43
     m_Scale: 1
   - m_ElementType: 1
     m_Unicode: 67
     m_GlyphIndex: 36
     m_Scale: 1
   - m_ElementType: 1
-    m_Unicode: 40
+    m_Unicode: 58
-    m_GlyphIndex: 9
+    m_GlyphIndex: 27
     m_Scale: 1
   - m_ElementType: 1
-    m_Unicode: 64
+    m_Unicode: 47
-    m_GlyphIndex: 33
+    m_GlyphIndex: 16
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 41
-    m_GlyphIndex: 10
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 54
-    m_GlyphIndex: 23
     m_Scale: 1
   m_AtlasTextures:
   - {fileID: -583831555312551904}
@@ -1650,31 +1596,19 @@ MonoBehaviour:
     m_Height: 79
   - m_X: 733
     m_Y: 158
-    m_Width: 59
+    m_Width: 61
     m_Height: 79
-  - m_X: 792
+  - m_X: 794
     m_Y: 161
-    m_Width: 55
-    m_Height: 79
-  - m_X: 847
-    m_Y: 237
     m_Width: 58
     m_Height: 79
   - m_X: 982
     m_Y: 158
-    m_Width: 37
+    m_Width: 30
-    m_Height: 79
+    m_Height: 53
-  - m_X: 905
+  - m_X: 852
     m_Y: 237
-    m_Width: 67
+    m_Width: 43
-    m_Height: 70
-  - m_X: 581
-    m_Y: 159
-    m_Width: 37
-    m_Height: 79
-  - m_X: 905
-    m_Y: 307
-    m_Width: 58
     m_Height: 79
   m_FreeGlyphRects:
   - m_X: 100
@@ -1797,6 +1731,10 @@ MonoBehaviour:
     m_Y: 132
     m_Width: 20
     m_Height: 27
+  - m_X: 581
+    m_Y: 159
+    m_Width: 42
+    m_Height: 864
   - m_X: 232
     m_Y: 236
     m_Width: 291
@@ -1811,60 +1749,40 @@ MonoBehaviour:
     m_Height: 809
   - m_X: 232
     m_Y: 238
-    m_Width: 560
+    m_Width: 562
     m_Height: 785
-  - m_X: 792
+  - m_X: 581
+    m_Y: 237
+    m_Width: 213
+    m_Height: 786
+  - m_X: 794
     m_Y: 158
-    m_Width: 8
+    m_Width: 6
     m_Height: 3
-  - m_X: 232
+  - m_X: 982
-    m_Y: 240
+    m_Y: 211
-    m_Width: 615
+    m_Width: 41
-    m_Height: 783
+    m_Height: 812
-  - m_X: 847
+  - m_X: 1012
-    m_Y: 161
+    m_Y: 158
-    m_Width: 8
+    m_Width: 11
-    m_Height: 76
+    m_Height: 865
-  - m_X: 1018
-    m_Y: 79
-    m_Width: 5
-    m_Height: 79
-  - m_X: 1019
-    m_Y: 79
-    m_Width: 4
-    m_Height: 944
-  - m_X: 972
-    m_Y: 237
-    m_Width: 51
-    m_Height: 786
-  - m_X: 618
-    m_Y: 159
-    m_Width: 5
-    m_Height: 864
-  - m_X: 618
-    m_Y: 237
-    m_Width: 174
-    m_Height: 786
-  - m_X: 0
-    m_Y: 386
-    m_Width: 1023
-    m_Height: 637
-  - m_X: 0
-    m_Y: 341
-    m_Width: 905
-    m_Height: 682
-  - m_X: 92
-    m_Y: 340
-    m_Width: 813
-    m_Height: 683
   - m_X: 232
     m_Y: 316
-    m_Width: 673
+    m_Width: 791
     m_Height: 707
-  - m_X: 963
+  - m_X: 232
-    m_Y: 307
+    m_Y: 240
-    m_Width: 60
+    m_Width: 620
-    m_Height: 716
+    m_Height: 783
+  - m_X: 895
+    m_Y: 237
+    m_Width: 128
+    m_Height: 786
+  - m_X: 852
+    m_Y: 161
+    m_Width: 3
+    m_Height: 76
   m_fontInfo:
     Name: 
     PointSize: 0
@@ -3848,11 +3766,86 @@ MonoBehaviour:
           m_YAdvance: 0
       m_FeatureLookupFlags: 0
     - m_FirstAdjustmentRecord:
-        m_GlyphIndex: 43
+        m_GlyphIndex: 34
         m_GlyphValueRecord:
           m_XPlacement: 0
           m_YPlacement: 0
-          m_XAdvance: -9.96875
+          m_XAdvance: -2.640625
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 48
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 44
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.890625
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 48
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 51
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.578125
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 48
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 53
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -6.0625
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 48
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 58
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -5.625
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 48
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 48
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -10.109375
           m_YAdvance: 0
       m_SecondAdjustmentRecord:
         m_GlyphIndex: 13
@@ -3863,11 +3856,11 @@ MonoBehaviour:
           m_YAdvance: 0
       m_FeatureLookupFlags: 0
     - m_FirstAdjustmentRecord:
-        m_GlyphIndex: 43
+        m_GlyphIndex: 48
         m_GlyphValueRecord:
           m_XPlacement: 0
           m_YPlacement: 0
-          m_XAdvance: -9.671875
+          m_XAdvance: -9.84375
           m_YAdvance: 0
       m_SecondAdjustmentRecord:
         m_GlyphIndex: 15
@@ -3878,11 +3871,11 @@ MonoBehaviour:
           m_YAdvance: 0
       m_FeatureLookupFlags: 0
     - m_FirstAdjustmentRecord:
-        m_GlyphIndex: 43
+        m_GlyphIndex: 48
         m_GlyphValueRecord:
           m_XPlacement: 0
           m_YPlacement: 0
-          m_XAdvance: -4.265625
+          m_XAdvance: -3.953125
           m_YAdvance: 0
       m_SecondAdjustmentRecord:
         m_GlyphIndex: 34
@@ -3893,14 +3886,14 @@ MonoBehaviour:
           m_YAdvance: 0
       m_FeatureLookupFlags: 0
     - m_FirstAdjustmentRecord:
-        m_GlyphIndex: 43
+        m_GlyphIndex: 48
         m_GlyphValueRecord:
           m_XPlacement: 0
           m_YPlacement: 0
-          m_XAdvance: -0.828125
+          m_XAdvance: -5.9375
           m_YAdvance: 0
       m_SecondAdjustmentRecord:
-        m_GlyphIndex: 66
+        m_GlyphIndex: 53
         m_GlyphValueRecord:
           m_XPlacement: 0
           m_YPlacement: 0
@@ -3908,14 +3901,29 @@ MonoBehaviour:
           m_YAdvance: 0
       m_FeatureLookupFlags: 0
     - m_FirstAdjustmentRecord:
-        m_GlyphIndex: 43
+        m_GlyphIndex: 48
         m_GlyphValueRecord:
           m_XPlacement: 0
           m_YPlacement: 0
-          m_XAdvance: -0.828125
+          m_XAdvance: -1.578125
           m_YAdvance: 0
       m_SecondAdjustmentRecord:
-        m_GlyphIndex: 80
+        m_GlyphIndex: 57
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 48
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.875
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 58
         m_GlyphValueRecord:
           m_XPlacement: 0
           m_YPlacement: 0
@@ -3997,6 +4005,66 @@ MonoBehaviour:
           m_XAdvance: 0
           m_YAdvance: 0
       m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 53
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -14.328125
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 27
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 56
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -3.515625
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 27
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 58
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -10.90625
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 27
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 83
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -2.765625
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 27
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
   fallbackFontAssets: []
   m_FallbackFontAssetTable: []
   m_CreationSettings:

Assets/Prefabs/EndCredit Prefab.prefab

@@ -16,7 +16,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &687855467128986786
 Transform:
   m_ObjectHideFlags: 0
@@ -639,7 +639,7 @@ Camera:
   m_Enabled: 0
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_BackGroundColor: {r: 0.18039216, g: 0.13333334, b: 0.18431373, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -813,7 +813,7 @@ Camera:
   m_Enabled: 0
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_BackGroundColor: {r: 0.18039216, g: 0.13333334, b: 0.18431373, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -969,7 +969,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &6999723469281459480
 Transform:
   m_ObjectHideFlags: 0
@@ -979,7 +979,7 @@ Transform:
   m_GameObject: {fileID: 6999723469281459478}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 37.43464, y: 3.8132353, z: 15.87093}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 1}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 1}
   m_Children: []
   m_Father: {fileID: 4024298208675944916}
   m_RootOrder: 1

Assets/Scenes/Game Scenes/Dark Level.unity

@@ -8489,8 +8489,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7f3324bdaa895394db1ed827a820ab8c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  currentLevel: 0
+  currentLevel: 3
-  i: 2
+  i: 3
 --- !u!4 &1810438011
 Transform:
   m_ObjectHideFlags: 0
@@ -9658,6 +9658,10 @@ PrefabInstance:
       propertyPath: backupbyebye
       value: 
       objectReference: {fileID: 1312893925}
+    - target: {fileID: 687855467128986789, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1133138391673429717, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
       propertyPath: m_Camera
       value: 
@@ -9714,5 +9718,33 @@ PrefabInstance:
       propertyPath: audioManager
       value: 
       objectReference: {fileID: 1190348331}
+    - target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
+      propertyPath: emotes.Array.data[2]
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
+      propertyPath: emotes.Array.data[3]
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
+      propertyPath: emotes.Array.data[4]
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
+      propertyPath: emotes.Array.data[8]
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
+      propertyPath: emotes.Array.data[9]
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
+      propertyPath: emotes.Array.data[13]
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
+      propertyPath: emotes.Array.data[14]
+      value: 11
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}

UserSettings/EditorUserSettings.asset

@@ -5,6 +5,59 @@ EditorUserSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 4
   m_ConfigSettings:
+<<<<<<< HEAD
+=======
+    RecentlyUsedScenePath-0:
+<<<<<<< HEAD
+=======
+<<<<<<< Updated upstream
+<<<<<<< HEAD
+>>>>>>> origin/main
+      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
+=======
+<<<<<<< Updated upstream
+      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
+>>>>>>> Stashed changes
+      flags: 0
+    RecentlyUsedScenePath-1:
+      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
+      flags: 0
+<<<<<<< HEAD
+    RecentlyUsedScenePath-2:
+      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d
+=======
+<<<<<<< Updated upstream
+    RecentlyUsedScenePath-1:
+      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663f3af0e47414e7f133e5a92f31352d1b
+>>>>>>> origin/main
+=======
+    RecentlyUsedScenePath-2:
+      value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb
+      flags: 0
+    RecentlyUsedScenePath-3:
+      value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
+      flags: 0
+    RecentlyUsedScenePath-4:
+      value: 22424703114646680e0b0227036c6c1313191d7b623d28393930
+      flags: 0
+    RecentlyUsedScenePath-5:
+      value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
+=======
+      value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
+      flags: 0
+    RecentlyUsedScenePath-1:
+      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
+      flags: 0
+    RecentlyUsedScenePath-2:
+      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
+      flags: 0
+    RecentlyUsedScenePath-3:
+      value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
+>>>>>>> origin/main
+      flags: 0
+>>>>>>> origin/main
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0