Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp

Assets/Fonts/ArodoraPro-Light SDF.asset

@@ -10,7 +10,8 @@ Material:
   m_Name: ArodoraPro-Light SDF Material
   m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords: []
+  m_InvalidKeywords:
+  - MASK_HARD
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

Assets/Images/UI/Leaderboard/Gradient.png.meta

@@ -101,6 +101,18 @@ TextureImporter:
     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/Prefabs/BoostZone.prefab

@@ -82,7 +82,7 @@ MonoBehaviour:
   OnTriggerEvent:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 4953496122477050765}
+      - m_Target: {fileID: 3243466452170232741}
         m_TargetAssemblyTypeName: BoostZone, Assembly-CSharp
         m_MethodName: UseBoost2
         m_Mode: 0
@@ -94,7 +94,7 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 1
         m_CallState: 2
-      - m_Target: {fileID: 8924682101612324444}
+      - m_Target: {fileID: 2794755039707102077}
         m_TargetAssemblyTypeName: VibrationEffect, Assembly-CSharp
         m_MethodName: Vibrate
         m_Mode: 1
@@ -284,6 +284,9 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5552326657438865862}
+  - component: {fileID: 2794755039707102077}
+  - component: {fileID: 3243466452170232741}
+  - component: {fileID: 6601852460502406984}
   m_Layer: 0
   m_Name: Content
   m_TagString: Untagged
@@ -309,6 +312,58 @@ Transform:
   m_Father: {fileID: 4953496122477050764}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2794755039707102077
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1917013683912293262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6b6c961a89b242845a25e88b6e94436f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Settings:
+    Frequency: 0.08
+    Amplitude: 0.15
+    Duration: 0.15
+  DoVibration: 0
+--- !u!114 &3243466452170232741
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1917013683912293262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e4735f0b1d3f704aa24c701dfcca26b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _breakMultiplier: 0.6
+--- !u!114 &6601852460502406984
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1917013683912293262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a2dc6f3489b430644a64e340f565bc29, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Sound:
+    Clip: {fileID: 8300000, guid: 23f7633b7918f7c49827eb9a6c9fd915, type: 3}
+    Volume: 0.45
+    Priority: 128
+    Pitch: 1
+    Zone: 0.224
+    PlayOnAwake: 0
+    Loop: 0
+  SoundPlayer: {fileID: 8851741688417011874, guid: d8aaa15f51dd55a4fb0b37cecdd79846,
+    type: 3}
 --- !u!1 &4040730502614986303
 GameObject:
   m_ObjectHideFlags: 0
@@ -350,8 +405,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4953496122477050764}
-  - component: {fileID: 4953496122477050765}
-  - component: {fileID: 8924682101612324444}
   - component: {fileID: 4509245511465371113}
   m_Layer: 0
   m_Name: BoostZone
@@ -376,36 +429,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4953496122477050765
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4953496122477050767}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5e4735f0b1d3f704aa24c701dfcca26b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _breakMultiplier: 0.6
---- !u!114 &8924682101612324444
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4953496122477050767}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6b6c961a89b242845a25e88b6e94436f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Settings:
-    Frequency: 0.08
-    Amplitude: 0.15
-    Duration: 0.15
-  DoVibration: 0
 --- !u!205 &4509245511465371113
 LODGroup:
   m_ObjectHideFlags: 0

Assets/Prefabs/Player.prefab

@@ -16791,6 +16791,16 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7845899282681458536, guid: c965b0e766128f84db08120e924035d7,
+        type: 3}
+      propertyPath: m_Volume
+      value: 0.405
+      objectReference: {fileID: 0}
+    - target: {fileID: 7845899282681458536, guid: c965b0e766128f84db08120e924035d7,
+        type: 3}
+      propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c965b0e766128f84db08120e924035d7, type: 3}
 --- !u!4 &4574774226647623292 stripped

Assets/SoundsMusic/Speed_up.ogg.meta

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

ProjectSettings/ProjectSettings.asset

@@ -237,8 +237,7 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
-  - {fileID: -6517218471499782410, guid: 1a4c68ca72a83449f938d669337cb305, type: 2}
+  - {fileID: 0}
-  - {fileID: 648089955447955448, guid: ac7df53da7627c941aa8b5303dd3d14f, type: 2}
   - {fileID: 0}
   metroInputSource: 0
   wsaTransparentSwapchain: 0