Merge pull request #25 from frizbee19/zoe

Zoe

Assets/Art Final/Shelf Sprites/polaroid frame_speed.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/EndLevelDialogue.cs

@@ -6,6 +6,8 @@ using TMPro;
 public class EndLevelDialogue : MonoBehaviour
 {
     public Animator animator;
+    public Animator animatorb;
+    public Animator animatorc;
     public RuntimeAnimatorController controller;
     public TMP_Text textbox;
     public TMP_Text arrow;
@@ -19,11 +21,14 @@ public class EndLevelDialogue : MonoBehaviour
     [Range(2, 20)] public int second = 4;
     [Range(1, 50)] public int last = 5;
     public GameObject lvlEnder;
+    public GameObject headshotb;
+    public GameObject headshotc;
 
     public Camera mainCam;
     public Camera secondCam;
     public Camera lastCam;
     public int current_cam = 0;
+    public GameObject byebye, backupbyebye, nickelback;
 
     //used to activate/deactivate test object
     //activate through outside means probably
@@ -44,6 +49,8 @@ public class EndLevelDialogue : MonoBehaviour
             arrow.text = "";
         }
         animator.runtimeAnimatorController = controller;
+        animatorb.runtimeAnimatorController = controller;
+        animatorc.runtimeAnimatorController = controller;
     }
 
     //Adds a page of text
@@ -67,6 +74,14 @@ public class EndLevelDialogue : MonoBehaviour
                 {
                     animator.SetInteger("Animation", emotes[curPage] - 1);
                 }
+                if (animatorb != null && emotes.Count == pages.Count)
+                {
+                    animatorb.SetInteger("Animation", emotes[curPage] - 1);
+                }
+                if (animatorc != null && emotes.Count == pages.Count)
+                {
+                    animatorc.SetInteger("Animation", emotes[curPage] - 1);
+                }
                 //prints the "next" arrow when at end of page except last page
                 if (curPage < pages.Count - 1)
                 {
@@ -111,6 +126,14 @@ public class EndLevelDialogue : MonoBehaviour
                 {
                     animator.SetInteger("Animation", emotes[curPage]);
                 }
+                if (animatorb != null && emotes.Count == pages.Count)
+                {
+                    animatorb.SetInteger("Animation", emotes[curPage]);
+                }
+                if (animatorc != null && emotes.Count == pages.Count)
+                {
+                    animatorc.SetInteger("Animation", emotes[curPage]);
+                }
                 //writes chars at specified pace
                 elapsed += Time.deltaTime;
                 if (elapsed > pace)
@@ -170,10 +193,17 @@ public class EndLevelDialogue : MonoBehaviour
             default: return;
             case (1): mainCam.enabled = false;
                 secondCam.enabled = true;
+                byebye.SetActive(false);
+                backupbyebye.SetActive(false);
+                headshotb.SetActive(true);
+
                 break;
             case (2):
                 secondCam.enabled = false;
                 lastCam.enabled = true;
+                nickelback.SetActive(true);
+                headshotb.SetActive(false);
+                headshotc.SetActive(true);
                 break;
             case (3):
                 Debug.Log("Gay Sex");

Assets/Font/SFCartoonistHand SDF 1.asset

@@ -1583,10 +1583,6 @@ MonoBehaviour:
     m_Y: 206
     m_Width: 49
     m_Height: 22
-  - m_X: 150
-    m_Y: 307
-    m_Width: 873
-    m_Height: 716
   - m_X: 0
     m_Y: 341
     m_Width: 1023

Assets/Prefabs/EndCredit Prefab.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8d960d2a345fc1e469e95f87418eb26d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Game Scenes/Crowds Level.unity

@@ -187,6 +187,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   currentLevel: 0
+  i: 2
 --- !u!4 &4739993
 Transform:
   m_ObjectHideFlags: 0
@@ -3551,7 +3552,7 @@ Camera:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 662343915}
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_ClearFlags: 1
   m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
@@ -4012,6 +4013,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   animator: {fileID: 1277072431}
+  animatorb: {fileID: 0}
+  animatorc: {fileID: 0}
   controller: {fileID: 0}
   textbox: {fileID: 1465832790}
   arrow: {fileID: 1662769350}
@@ -4026,10 +4029,15 @@ MonoBehaviour:
   second: 4
   last: 5
   lvlEnder: {fileID: 4739991}
+  headshotb: {fileID: 0}
+  headshotc: {fileID: 0}
   mainCam: {fileID: 1689002321}
   secondCam: {fileID: 662343916}
   lastCam: {fileID: 1786726257}
   current_cam: 0
+  byebye: {fileID: 0}
+  backupbyebye: {fileID: 0}
+  nickelback: {fileID: 0}
   textTest: {fileID: 681265260}
   isTalking: 1
 --- !u!4 &681265262
@@ -12079,7 +12087,7 @@ Camera:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1786726256}
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_ClearFlags: 1
   m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}

UserSettings/EditorUserSettings.asset

@@ -6,10 +6,17 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
+<<<<<<< HEAD
+      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
+      flags: 0
+    RecentlyUsedScenePath-1:
+      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
+=======
       value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
       flags: 0
     RecentlyUsedScenePath-1:
       value: 22424703114646680e0b0227036c78111b1258192f2d28353e663f3af0e47414e7f133e5a92f31352d1b
+>>>>>>> origin/main
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650