Merge branch 'devVlad' into PCVersion

Assets/Crossy Road VR/Images/quest2_1.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: e4b57e1d2428e644898af8c5ded7a5d8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -835,6 +835,10 @@ MonoBehaviour:
   _Duration: 2
   _LeftController: {fileID: 1877538280431894419}
   _RightController: {fileID: 5296553034864190854}
+  Dead:
+    m_PersistentCalls:
+      m_Calls: []
+  _ScoreManager: {fileID: 0}
 --- !u!114 &674649897995790958
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -319,6 +319,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3248555397218002163, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: OnContinues
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/FirstMenuScript.cs

@@ -1,30 +1,51 @@
-using UnityEngine;
+using System.Collections.Generic;
+using Unity.VisualScripting;
+using UnityEngine;
 using UnityEngine.XR.Interaction.Toolkit;
 
 public class FirstMenuScript : MonoBehaviour
 {
-    [SerializeField] private GameObject _UIMenu;
     [SerializeField] private ActionBasedContinuousMoveProvider _Move;
     [SerializeField] private CharacterController _CharacterController;
 
+    // список всех элементов UI для пролистывания
+    [SerializeField] private GameObject[] _UIPanel;
+
+    // индекс текущего элемента UI 
+    private int _currentIndex = 0;
+
     public void Init(ActionBasedContinuousMoveProvider move, CharacterController cc)
     {
-        _UIMenu = gameObject;
         _Move = move;
         _CharacterController = cc;
     }
 
     // Start is called before the first frame update
 
-    public void UserAgree()
+    // действие на кнопку закончить
+    public void OnEnd()
     {
         _Move.enabled = true;
         _CharacterController.enabled = true;
-        _UIMenu.SetActive(false);
+        gameObject.SetActive(false);
     }
 
-    public void UserDisagree()
+    // действие на кнопку продолжить
+    public void OnContinues()
     {
-        Application.Quit();
+        if (_currentIndex == _UIPanel.Length-1)
+        {
+            OnEnd();
+            return;
+        }
+
+        _UIPanel[_currentIndex++].SetActive(false);
+    
+        _UIPanel[_currentIndex].SetActive(true);
     }
+
+    // public void UserDisagree()
+    // {
+    //     Application.Quit();
+    // }
 }