Merge branch 'devVlad' into HelmetVersion

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

@@ -9,6 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2912464425011237244}
+  - component: {fileID: 578604373907376277}
   m_Layer: 0
   m_Name: UI Dead Menu
   m_TagString: Untagged
@@ -32,6 +33,20 @@ Transform:
   - {fileID: 1626125390382248321}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &578604373907376277
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2491700103206237577}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 26b0535106e8eb44eb01489621492bb6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _BestScore: 0
+  _TextScore: {fileID: 6861686341026857159}
 --- !u!1 &3064946160174015917
 GameObject:
   m_ObjectHideFlags: 0
@@ -166,7 +181,6 @@ GameObject:
   - component: {fileID: 1221892974624549006}
   - component: {fileID: 3709016947546890618}
   - component: {fileID: 30235646743473522}
-  - component: {fileID: 999928618707099267}
   m_Layer: 0
   m_Name: Exit
   m_TagString: Untagged
@@ -276,7 +290,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 999928618707099267}
+      - m_Target: {fileID: 578604373907376277}
         m_TargetAssemblyTypeName: MenuScript, Assembly-CSharp
         m_MethodName: ExitGame
         m_Mode: 1
@@ -288,19 +302,7 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!114 &999928618707099267
+--- !u!1 &3267614602042467083
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3243890560722535985}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 26b0535106e8eb44eb01489621492bb6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!1 &5154819245734834048
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -308,50 +310,50 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4497212580997773771}
+  - component: {fileID: 5829420946625490178}
-  - component: {fileID: 7678253570494542606}
+  - component: {fileID: 5428736052106271351}
-  - component: {fileID: 60494907233705596}
+  - component: {fileID: 6861686341026857159}
   m_Layer: 0
-  m_Name: Text Menu
+  m_Name: Text (TMP)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &4497212580997773771
+--- !u!224 &5829420946625490178
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5154819245734834048}
+  m_GameObject: {fileID: 3267614602042467083}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.50944, y: 0.50944, z: 0.50944}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 806725748840471782}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.00036874, y: 32.2}
+  m_AnchoredPosition: {x: -0.00015830994, y: 33}
-  m_SizeDelta: {x: 196.3, y: 50}
+  m_SizeDelta: {x: 111.58, y: 33.99}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7678253570494542606
+--- !u!222 &5428736052106271351
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5154819245734834048}
+  m_GameObject: {fileID: 3267614602042467083}
   m_CullTransparentMesh: 1
---- !u!114 &60494907233705596
+--- !u!114 &6861686341026857159
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5154819245734834048}
+  m_GameObject: {fileID: 3267614602042467083}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -365,7 +367,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u041C\u0435\u043D\u044E"
+  m_text: "\u041B\u0443\u0447\u0448\u0438\u0439 \u0441\u0447\u0451\u0442 - \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -392,8 +394,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 36
+  m_fontSize: 8
-  m_fontSizeBase: 36
+  m_fontSizeBase: 8
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -714,7 +716,6 @@ GameObject:
   - component: {fileID: 4593441900393274271}
   - component: {fileID: 8115490023355118325}
   - component: {fileID: 8273003462027176948}
-  - component: {fileID: 1885431052390382377}
   m_Layer: 0
   m_Name: Restart
   m_TagString: Untagged
@@ -824,7 +825,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 1885431052390382377}
+      - m_Target: {fileID: 578604373907376277}
         m_TargetAssemblyTypeName: MenuScript, Assembly-CSharp
         m_MethodName: RestartGame
         m_Mode: 1
@@ -836,18 +837,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!114 &1885431052390382377
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8648730552506336334}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 26b0535106e8eb44eb01489621492bb6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &8920512261675831601
 GameObject:
   m_ObjectHideFlags: 0
@@ -878,7 +867,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4497212580997773771}
+  - {fileID: 5829420946625490178}
   - {fileID: 8663007926287732105}
   - {fileID: 850979864550986239}
   m_Father: {fileID: 1626125390382248321}

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

@@ -324,6 +324,17 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
+--- !u!114 &938744124 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1510913528632895574, guid: d345ba61556173847ba32546368899cd, type: 3}
+  m_PrefabInstance: {fileID: 1744412849}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3139efcae2b31a64f88f543730cea817, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1004186269
 GameObject:
   m_ObjectHideFlags: 0
@@ -2528,6 +2539,10 @@ PrefabInstance:
       propertyPath: _Menu
       value: 
       objectReference: {fileID: 593427418}
+    - target: {fileID: 2487509848654189369, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
+      propertyPath: _ScoreManager
+      value: 
+      objectReference: {fileID: 938744124}
     - target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0

Assets/Crossy Road VR/Scripts/HitDetectorScript.cs

@@ -1,7 +1,6 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.XR.Interaction.Toolkit;
-using static UnityEngine.XR.OpenXR.Features.Interactions.DPadInteraction;
 
 public class HitDetectorScript : MonoBehaviour
 {
@@ -23,13 +22,20 @@ public class HitDetectorScript : MonoBehaviour
     [SerializeField] XRBaseController _LeftController;
     [SerializeField] XRBaseController _RightController;
 
+    [HideInInspector]
     public UnityEvent Dead = new UnityEvent();
 
+    [SerializeField] private ScoreManagerScript _ScoreManager;
+
     private void OnTriggerEnter(Collider other)
     {
         //Debug.Log(other.gameObject.name);
         if (other.gameObject.CompareTag("Car") && !_IsDead)
         {
+            if (PlayerPrefs.GetInt("Best score") < _ScoreManager.CurrentScore)
+            {
+                PlayerPrefs.SetInt("Best score", _ScoreManager.CurrentScore);
+            }    
             _IsDead = true;
 
             Dead.Invoke();
@@ -40,7 +46,7 @@ public class HitDetectorScript : MonoBehaviour
             UISpawn();
 
             TriggerHaptic(_LeftController);
-            TriggerHaptic (_RightController);
+            TriggerHaptic(_RightController);
 
             Debug.Log("Player was hitted car");
             //SceneManager.LoadSceneAsync(SceneManager.GetActiveScene().name);

Assets/Crossy Road VR/Scripts/MenuScript.cs

@@ -1,10 +1,18 @@
-using System.Collections;
+using TMPro;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
 public class MenuScript : MonoBehaviour
 {
+    [SerializeField] private int _BestScore;
+    [SerializeField] private TextMeshProUGUI _TextScore;
+
+    private void OnEnable()
+    {
+        _BestScore = PlayerPrefs.GetInt("Best score");
+        _TextScore.text = "Лучший счёт - " + _BestScore;
+    }
+
     // Start is called before the first frame update
     public void RestartGame()
     {

Assets/Crossy Road VR/Scripts/ScoreManagerScript.cs

@@ -18,6 +18,11 @@ public class ScoreManagerScript : MonoBehaviour
 
     private int _CurrentScore = 0;
 
+    public int CurrentScore
+    {
+        get { return _CurrentScore; }
+    }
+
     [SerializeField]
     private TextMeshPro _ScoreText;