Merge remote-tracking branch 'origin/main'

Assets/Audio/AudioLibrary.asset

@@ -24,10 +24,8 @@ MonoBehaviour:
   - {fileID: 8300000, guid: fb0ae77bbbd11e64fa44bb6e23071458, type: 3}
   - {fileID: 8300000, guid: 3a67073d446ad0c4eaebc3e828cab46b, type: 3}
   - {fileID: 8300000, guid: 3c5f4ff19d63cc8458b6acb0756192ab, type: 3}
-  - {fileID: 8300000, guid: fa96879f1e5773e4aa5ba67c98756caf, type: 3}
   - {fileID: 8300000, guid: bd37e0997c3891d41960e3d4a2820944, type: 3}
   - {fileID: 8300000, guid: 15abfea15ac15c94bb6ac7814c5304b8, type: 3}
-  - {fileID: 8300000, guid: 1199ff79c1f3044478a1d7fb88f09f20, type: 3}
   - {fileID: 8300000, guid: 2680edc40e917f24fb02c267f4eab914, type: 3}
   - {fileID: 8300000, guid: b6ec2727446618b44b5af3a511e5e1b1, type: 3}
   - {fileID: 8300000, guid: 26c6aabbabe544f45b385c0e978c35ff, type: 3}

Assets/Scenes/GameScene.unity

@@ -593,6 +593,14 @@ PrefabInstance:
       propertyPath: MaxVibration
       value: 0.5
       objectReference: {fileID: 0}
+    - target: {fileID: 5150961666696654592, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
+      propertyPath: Volume
+      value: 0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5150961666696654592, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
+      propertyPath: StepInterval
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7071433868121438663, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
       propertyPath: otherPlayerAttack
       value: 
@@ -759,6 +767,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1691493459240420355, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
+      propertyPath: Volume
+      value: 0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 1691493459240420355, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
+      propertyPath: StepInterval
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1749848915408613053, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
       propertyPath: otherPlayerAttack
       value: 
@@ -2651,10 +2667,30 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4158834148864819268}
     - targetCorrespondingSourceObject: {fileID: 203935764274243221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
       insertIndex: -1
       addedObject: {fileID: 872164355}
   m_SourcePrefab: {fileID: 100100000, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
+--- !u!1 &4158834148864819267 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
+  m_PrefabInstance: {fileID: 4158834148864819266}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &4158834148864819268
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4158834148864819267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 94eb4529510a25d448334415d28e7fa4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &4910321061857220295
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scenes/MainMenu.unity

@@ -665,7 +665,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.7647059}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
     m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
@@ -686,7 +686,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 398610165}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 1304688536}
+        m_TargetAssemblyTypeName: QuitGame, Assembly-CSharp
+        m_MethodName: Quit
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &398610165
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1390,6 +1402,7 @@ GameObject:
   - component: {fileID: 1304688534}
   - component: {fileID: 1304688533}
   - component: {fileID: 1304688532}
+  - component: {fileID: 1304688536}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -1492,6 +1505,18 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!114 &1304688536
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1304688531}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858666303fe5d464a806d086b87f5c30, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1526912310
 GameObject:
   m_ObjectHideFlags: 0
@@ -1554,7 +1579,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.7647059}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
     m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}

Assets/Scripts/Misc/IngameMusic.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class IngameMusic : MonoBehaviour
+{
+    void Start()
+    {
+        AudioManager.PlaySound("Intro_Flatline", new Vector3(0f, 0f, 0f), false, false).volume = 1f;
+
+        Invoke("PlayMusic", 3);
+    }
+
+    void PlayMusic()
+    {
+        AudioManager.PlaySound("Ingame_Theme", new Vector3(0f, 0f, 0f), false, false, true, true).volume = 1f;
+    }
+}

Assets/Scripts/Misc/IngameMusic.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 94eb4529510a25d448334415d28e7fa4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Misc/MainMenuTransitionAnimation.cs

@@ -27,8 +27,8 @@ public class MainMenuTransitionAnimation : MonoBehaviour
             yield return new WaitForSecondsRealtime(0.1f);
         }
 
-        
+        AudioManager.StopAllAudio();
         SceneManager.LoadScene(1);
-        //SceneManager.sceneLoaded += () => AudioManager.Instance.
+        //SceneManager.sceneLoaded += () => AudioManager.stop
     }
 }

Assets/Scripts/Player/FootStepSounder.cs

@@ -14,9 +14,9 @@ public class FootStepSounder : MonoBehaviour
     void Update()
     {
         movedDist += Vector3.Distance(transform.position, prevPos);
-        if (movedDist % StepInterval < 0.1f)
+        if (movedDist % StepInterval < 0.2f)
         {
-            AudioManager.PlaySound("Footstep_" + UnityEngine.Random.Range(1, 6), transform.position, true).volume = Volume;
+            AudioManager.PlaySound("Footstep_" + UnityEngine.Random.Range(1, 6), transform.position).volume = Volume;
         }
 
         prevPos = transform.position;

Assets/Scripts/Rumbling/RumbleManager.cs

@@ -4,6 +4,8 @@ using UnityEngine.InputSystem;
 
 public class RumbleManager : MonoBehaviour
 {
+    public bool DoRubling = true;
+
     public static RumbleManager Instance { get; private set; }
 
     public static Gamepad[] pads;
@@ -54,7 +56,7 @@ public class RumbleManager : MonoBehaviour
     bool initialized = false;
     private void Update()
     {
-        if (!initialized) return;
+        if (!initialized || !DoRubling) return;
 
         foreach (var player in playerRumbles.Keys)
         {

Assets/Scripts/UI/QuitGame.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class QuitGame : MonoBehaviour
+{
+    public void Quit()
+    {
+        Application.Quit();
+    }
+}

Assets/Scripts/UI/QuitGame.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 858666303fe5d464a806d086b87f5c30
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: