Merge remote-tracking branch 'origin/master'

Assets/_Game/Prefabs/GameManager.prefab

@@ -13,7 +13,6 @@ GameObject:
   - component: {fileID: 3337691057141475184}
   - component: {fileID: 6454913238435751179}
   - component: {fileID: 8614171064719550910}
-  - component: {fileID: -4997642436851303920}
   - component: {fileID: 414725474638597084}
   m_Layer: 0
   m_Name: GameManager
@@ -144,18 +143,6 @@ MonoBehaviour:
           m_BoolArgument: 0
         m_CallState: 2
   GameActionResponses: []
---- !u!114 &-4997642436851303920
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4594634929475243472}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5e63316a01ffd064f9714036fe18b5b8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &414725474638597084
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/_Game/Prefabs/InputManager.prefab

@@ -15,6 +15,7 @@ GameObject:
   - component: {fileID: 2183181155430601731}
   - component: {fileID: 3528950448350645319}
   - component: {fileID: 9073825360329480431}
+  - component: {fileID: 8766631267996839683}
   m_Layer: 0
   m_Name: InputManager
   m_TagString: Untagged
@@ -135,9 +136,9 @@ MonoBehaviour:
   UnityEventResponse:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 754722905866176789}
-        m_MethodName: LoadLevelAdd
-        m_Mode: 3
+      - m_Target: {fileID: 8766631267996839683}
+        m_MethodName: LoadNextLevel
+        m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -225,3 +226,15 @@ MonoBehaviour:
           m_BoolArgument: 0
         m_CallState: 2
   GameActionResponses: []
+--- !u!114 &8766631267996839683
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5274999794457739409}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e63316a01ffd064f9714036fe18b5b8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/_Game/Prefabs/Sound/AudioManager.prefab

@@ -91,12 +91,12 @@ MonoBehaviour:
     source: {fileID: 0}
   - name: SmallBlock
     clip: {fileID: 8300000, guid: 690c77fd79737ca49b6bbf0591c8bd7b, type: 3}
-    volume: 0.076
-    pitch: 1
+    volume: 0.1
+    pitch: 1.5
     loop: 0
-    randomized: 0
-    volumeMax: 0
-    pitchMax: 0
+    randomized: 1
+    volumeMax: 0.15
+    pitchMax: 1.64
     source: {fileID: 0}
   - name: ScaryPlatform
     clip: {fileID: 8300000, guid: 1fbfcd1ff39f75b4bbcc2c9be9f98ee9, type: 3}

Assets/_Game/Scenes/Audio_test/Audio_Test.unity

@@ -1474,7 +1474,7 @@ PrefabInstance:
     - target: {fileID: 1137017617239168229, guid: 195835b83616a6f4ab298b9684af5727,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 22.15
+      value: 4.79
       objectReference: {fileID: 0}
     - target: {fileID: 1137017617239168229, guid: 195835b83616a6f4ab298b9684af5727,
         type: 3}
@@ -1797,6 +1797,31 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9013319373316615295, guid: d73bf2d4f76f3f8429568a2b6140da3f,
+        type: 3}
+      propertyPath: sounds.Array.data[4].volumeMax
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 9013319373316615295, guid: d73bf2d4f76f3f8429568a2b6140da3f,
+        type: 3}
+      propertyPath: sounds.Array.data[4].pitchMax
+      value: 0.87
+      objectReference: {fileID: 0}
+    - target: {fileID: 9013319373316615295, guid: d73bf2d4f76f3f8429568a2b6140da3f,
+        type: 3}
+      propertyPath: sounds.Array.data[4].pitch
+      value: 0.84
+      objectReference: {fileID: 0}
+    - target: {fileID: 9013319373316615295, guid: d73bf2d4f76f3f8429568a2b6140da3f,
+        type: 3}
+      propertyPath: sounds.Array.data[4].volume
+      value: 0.111
+      objectReference: {fileID: 0}
+    - target: {fileID: 9013319373316615295, guid: d73bf2d4f76f3f8429568a2b6140da3f,
+        type: 3}
+      propertyPath: sounds.Array.data[4].randomized
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d73bf2d4f76f3f8429568a2b6140da3f, type: 3}
 --- !u!1001 &499194516

Assets/_Game/Scenes/Levels/Intro.unity

@@ -388,6 +388,18 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 670324593887583076}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &236864904 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: -4997642436851303920, guid: 31fc766ecf4087f4aad1da05a14dcc21,
+    type: 3}
+  m_PrefabInstance: {fileID: 986383257}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e63316a01ffd064f9714036fe18b5b8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &420303837
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -524,6 +536,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1137017617915017827, guid: 195835b83616a6f4ab298b9684af5727,
+        type: 3}
+      propertyPath: _tags.Array.size
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 1137017617915017825, guid: 195835b83616a6f4ab298b9684af5727,
         type: 3}
       propertyPath: TagPlayer2
@@ -536,11 +553,6 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 11400000, guid: 674df06fa0b942d49871851d43cf713c,
         type: 2}
-    - target: {fileID: 1137017617915017827, guid: 195835b83616a6f4ab298b9684af5727,
-        type: 3}
-      propertyPath: _tags.Array.size
-      value: 3
-      objectReference: {fileID: 0}
     - target: {fileID: 2668928506298788669, guid: 195835b83616a6f4ab298b9684af5727,
         type: 3}
       propertyPath: m_ApplyToSortingLayers.Array.size
@@ -737,7 +749,7 @@ PrefabInstance:
     - target: {fileID: 7061724010377381308, guid: d5ff09ff003fa294c819a3ab95c52e68,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 37.8
+      value: -4.9
       objectReference: {fileID: 0}
     - target: {fileID: 7061724010377381308, guid: d5ff09ff003fa294c819a3ab95c52e68,
         type: 3}
@@ -1249,6 +1261,21 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 9194533424942732315, guid: 31fc766ecf4087f4aad1da05a14dcc21,
+        type: 3}
+      propertyPath: UnityEventResponse.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 236864904}
+    - target: {fileID: 9194533424942732315, guid: 31fc766ecf4087f4aad1da05a14dcc21,
+        type: 3}
+      propertyPath: UnityEventResponse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: LoadNextLevel
+      objectReference: {fileID: 0}
+    - target: {fileID: 9194533424942732315, guid: 31fc766ecf4087f4aad1da05a14dcc21,
+        type: 3}
+      propertyPath: UnityEventResponse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4594634929475243472, guid: 31fc766ecf4087f4aad1da05a14dcc21,
         type: 3}
       propertyPath: m_Name