Merge branch 'devVlad' into HelmetVersion

Assets/Crossy Road VR/Prefabs/Cars/Kamaz1.prefab

@@ -791,7 +791,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: a796b9db18caa96448869ca422ec9271, type: 3}
+  m_audioClip: {fileID: 8300000, guid: 834ad4d54110c204793e02eb6a8f9e2a, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 1
   m_Pitch: 1

Assets/Crossy Road VR/Prefabs/Cars/Sportcar.prefab

@@ -536,7 +536,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: a796b9db18caa96448869ca422ec9271, type: 3}
+  m_audioClip: {fileID: 8300000, guid: 6c9b00e9f803335409f5840f11bc086a, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 1
   m_Pitch: 1

Assets/Crossy Road VR/Prefabs/Cars/car2_nd.prefab

@@ -42,7 +42,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: a796b9db18caa96448869ca422ec9271, type: 3}
+  m_audioClip: {fileID: 8300000, guid: 2f0eedd813389fd4fa40cd83e624a36e, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 1
   m_Pitch: 1

Assets/Crossy Road VR/Prefabs/Players/Player Setup.prefab

@@ -2424,6 +2424,7 @@ GameObject:
   - component: {fileID: 6816638489069482198}
   - component: {fileID: 5964534008193362612}
   - component: {fileID: 3203601341080865406}
+  - component: {fileID: 3397185174789479497}
   m_Layer: 0
   m_Name: XR Origin (XR Rig)
   m_TagString: Player
@@ -2616,6 +2617,35 @@ MonoBehaviour:
   IsRecovering: 0
   RecoveryTimer: 0
   _IsPreRecovery: 0
+--- !u!114 &3397185174789479497
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7147664097568639172}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 53004812adcae72458f6ee795a7354df, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _JumpButton:
+    m_UseReference: 0
+    m_Action:
+      m_Name: Jump Button
+      m_Type: 0
+      m_ExpectedControlType: 
+      m_Id: 3a8ca516-8592-460e-937a-2deba90edab4
+      m_Processors: 
+      m_Interactions: 
+      m_SingletonActionBindings: []
+      m_Flags: 0
+    m_Reference: {fileID: 0}
+  _JumpHeight: 0
+  _CharacterController: {fileID: 0}
+  _GroundLayers:
+    serializedVersion: 2
+    m_Bits: 0
 --- !u!1 &7658757051952670264
 GameObject:
   m_ObjectHideFlags: 0

Assets/Crossy Road VR/Prefabs/Players/UI.prefab

@@ -909,7 +909,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.27450982, g: 0.54509807, b: 1, a: 0.392}
+  m_Color: {r: 0.27450982, g: 0.54509807, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Crossy Road VR/Scenes/Game/Game Scence.unity

@@ -122,6 +122,154 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &889366719
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 889366720}
+  - component: {fileID: 889366722}
+  - component: {fileID: 889366721}
+  m_Layer: 0
+  m_Name: Music
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &889366720
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 889366719}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1832352350}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &889366721
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 889366719}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 1
+  m_Volume: 0.5
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!114 &889366722
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 889366719}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 57b6a86afb37be341a1589bb98bdeb60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _MusicClipList:
+  - {fileID: 8300000, guid: ab50ca0fe44166e458f7c6f96dca3413, type: 3}
+  - {fileID: 8300000, guid: e3cc6a5f177942a4f96a97913c8b3d11, type: 3}
+  - {fileID: 8300000, guid: 257122f42cf9fe74e9146f3e374f4df1, type: 3}
+  - {fileID: 8300000, guid: 056fef58ca9d41746aeaac1649ee6e49, type: 3}
+  - {fileID: 8300000, guid: 992aed4c1adf91a449d2ee7fe0a2e270, type: 3}
+  - {fileID: 8300000, guid: ad4624927aa471b4f9969fa6aded149b, type: 3}
 --- !u!1 &894356741
 GameObject:
   m_ObjectHideFlags: 0
@@ -2151,6 +2299,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 359741391555935905, guid: d345ba61556173847ba32546368899cd, type: 3}
   m_PrefabInstance: {fileID: 1744412849}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &1832352350 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7715044902281673486, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
+  m_PrefabInstance: {fileID: 1879847889}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1870866336
 GameObject:
   m_ObjectHideFlags: 0
@@ -2342,7 +2495,10 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7715044902281673486, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 889366720}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
 --- !u!1 &1991568987

Assets/Crossy Road VR/Sounds/Just the noise of cars.mp3.meta

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

Assets/Crossy Road VR/Sounds/Musics.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b5a15d9e3c7da24b8eb455648dc883b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Crossy Road VR/Sounds/Musics/Among Us - Trap Remix.mp3.meta

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

Assets/Crossy Road VR/Sounds/Musics/CRWFRD - Angry Birdz.mp3.meta

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

Assets/Crossy Road VR/Sounds/Musics/Jasper Byrne - Hotline.mp3.meta

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

Assets/Crossy Road VR/Sounds/Musics/M O O N - Crystals.mp3.meta

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

Assets/Crossy Road VR/Sounds/Musics/Plants vs zombie - mini games walnout (trap remix).mp3.meta

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

Assets/Crossy Road VR/Sounds/Musics/Scattle - Knock Knock.mp3.meta

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

Assets/Crossy Road VR/Sounds/Sports car.mp3.meta

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

Assets/Crossy Road VR/Sounds/Truck.mp3.meta

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

Assets/PlayerJumpScript.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.InputSystem;
+
+public class PlayerJumpScript : MonoBehaviour
+{
+    [SerializeField] private InputActionProperty _JumpButton;
+    [SerializeField] private float _JumpHeight = 0f;
+    [SerializeField] private CharacterController _CharacterController;
+    [SerializeField] private LayerMask _GroundLayers;
+
+    private bool IsGrounded()
+    {
+        //return Physics.CheckSphere(transform)
+    }
+}

Assets/PlayerJumpScript.cs.meta

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

Assets/RandomMusicSelectScript.cs

@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[RequireComponent(typeof(AudioSource))]
+public class RandomMusicSelectScript : MonoBehaviour
+{
+    [SerializeField] List<AudioClip> _MusicClipList;
+
+    private AudioSource _Audio;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        _Audio = GetComponent<AudioSource>();
+        _Audio.clip = GetRandomObject<AudioClip>(_MusicClipList);
+        _Audio.Play();
+    }
+
+    T GetRandomObject<T>(List<T> list)
+    {
+        // проверка на пустоту списка
+        if (list == null || list.Count == 0)
+        {
+            return default;
+        }
+
+        // Генерация случайного индекса
+        int randomIndex = UnityEngine.Random.Range(0, list.Count);
+        return list[randomIndex];
+    }
+}

Assets/RandomMusicSelectScript.cs.meta

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

Assets/XRI/Samples/XR Interaction Toolkit/2.6.3/Starter Assets/XRI Default Input Actions.inputactions

@@ -687,7 +687,7 @@
                     "name": "Select",
                     "type": "Button",
                     "id": "33754c03-48ec-46ef-9bc6-22ed6bfdd8e8",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
@@ -1483,7 +1483,7 @@
                     "name": "Select",
                     "type": "Button",
                     "id": "ac96c10b-c955-4a46-8e67-bf16bc069b53",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
@@ -1564,7 +1564,7 @@
                     "name": "Scale Toggle",
                     "type": "Button",
                     "id": "5ad73d15-99a4-4bce-a76f-f49815602416",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
@@ -1577,6 +1577,15 @@
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": true
+                },
+                {
+                    "name": "Jump",
+                    "type": "Button",
+                    "id": "6f3ba83b-5a27-4d0c-ab18-c0d8a3bdafdf",
+                    "expectedControlType": "",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                 }
             ],
             "bindings": [
@@ -1744,6 +1753,17 @@
                     "action": "Scale Delta",
                     "isComposite": false,
                     "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "a8e593e4-9205-48c8-9286-603e076d5a31",
+                    "path": "<XRController>{RightHand}/primaryButton",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": ";Generic XR Controller",
+                    "action": "Jump",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                 }
             ]
         },