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

Assets/BNG Framework/Scripts/Extras/CalibratePlayerHeight.cs

@@ -27,7 +27,7 @@ namespace BNG {
 
         private float _initialOffset = 0;
 
-        void Start() {
+        private IEnumerator Start() {
 
             if(CalibrateHeightAction != null) {
                 CalibrateHeightAction.Enable();
@@ -38,6 +38,8 @@ namespace BNG {
                 PlayerController = GetComponentInChildren<BNGPlayerController>();
             }
 
+            yield return new WaitForSeconds(1);
+
             if(CalibrateOnStart) {
                 StartCoroutine(setupInitialOffset());
             }

Assets/DisableAfterFinish.cs

@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DisableAfterFinish : MonoBehaviour
+{
+    private DisableAfterFinishController disableController;
+
+    private void Awake()
+    {
+        disableController = FindObjectOfType<DisableAfterFinishController>();
+    }
+
+    private void OnEnable()
+    {
+        disableController.DoDisable += Disable;
+    }
+
+    private void OnDisable()
+    {
+        disableController.DoDisable -= Disable;
+    }
+
+    private void Disable()
+    {
+        gameObject.SetActive(false);
+    }
+}

Assets/DisableAfterFinish.cs.meta

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

Assets/DisableAfterFinishController.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DisableAfterFinishController : MonoBehaviour
+{
+    public event Action DoDisable;
+    public void Disabele()
+    {
+        DoDisable?.Invoke();
+    }
+}

Assets/DisableAfterFinishController.cs.meta

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

Assets/Prefabs/Environment.prefab

@@ -471,6 +471,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1466160490}
+  - component: {fileID: 3163011771511261305}
   m_Layer: 0
   m_Name: Road
   m_TagString: Untagged
@@ -495,6 +496,18 @@ Transform:
   m_Father: {fileID: 5213765417582927736}
   m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 58.205, z: 0}
+--- !u!114 &3163011771511261305
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1466160489}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa81bf86d9e6976459821f77be724766, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1865814382
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/GAME.prefab

@@ -12868,6 +12868,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 936928571943603786}
+  - component: {fileID: 4748635743268413816}
   m_Layer: 0
   m_Name: PathComponents
   m_TagString: Untagged
@@ -12901,6 +12902,18 @@ Transform:
   m_Father: {fileID: 936928570282710676}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4748635743268413816
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 936928571943603829}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa81bf86d9e6976459821f77be724766, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &936928572095971807
 GameObject:
   m_ObjectHideFlags: 0
@@ -13431,8 +13444,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1352652685726883887}
-  m_LocalRotation: {x: 0.031079192, y: 0.10775654, z: 0.1040905, w: 0.9882246}
+  m_LocalRotation: {x: 0.031167625, y: 0.107694134, z: 0.10407601, w: 0.9882301}
-  m_LocalPosition: {x: 3.7902184, y: -4.7262297, z: 12.67462}
+  m_LocalPosition: {x: 3.9465113, y: -4.754686, z: 13.368861}
   m_LocalScale: {x: 6, y: 6, z: 6}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -13528,19 +13541,19 @@ MonoBehaviour:
   targetRigidbody2D: {fileID: 0}
   targetTransform: {fileID: 397953845580526555}
   _result:
-    position: {x: 2.8844576, y: -0.5248022, z: 12.807304}
+    position: {x: 3.0407927, y: -0.553246, z: 13.501449}
-    up: {x: -0.21064202, y: 0.9770761, z: 0.030856963}
+    up: {x: -0.21063223, y: 0.97707903, z: 0.030834284}
-    forward: {x: 0.21207698, y: -0.0035296269, z: 0.9772466}
+    forward: {x: 0.211974, y: -0.0037209205, z: 0.9772683}
     color: {r: 1, g: 1, b: 1, a: 1}
     size: 1
-    percent: 0.0014260224939554797
+    percent: 0.001503311316276009
   _finalResult:
-    position: {x: 2.8844576, y: -0.5248022, z: 12.807304}
+    position: {x: 3.0407927, y: -0.553246, z: 13.501449}
-    up: {x: -0.21064202, y: 0.9770761, z: 0.030856963}
+    up: {x: -0.21063223, y: 0.97707903, z: 0.030834284}
-    forward: {x: 0.21207698, y: -0.0035296269, z: 0.9772466}
+    forward: {x: 0.211974, y: -0.0037209205, z: 0.9772683}
     color: {r: 1, g: 1, b: 1, a: 1}
     size: 1
-    percent: 0.0014260224939554797
+    percent: 0.001503311316276009
   _mode: 1
   _autoProject: 1
   _subdivide: 4
@@ -13549,7 +13562,7 @@ MonoBehaviour:
   _targetObject: {fileID: 1352652685726883887}
   _offset: {x: 0, y: 0}
   _rotationOffset: {x: 0, y: 0, z: 0}
-  lastPosition: {x: 3.7902184, y: -4.7262297, z: 12.67462}
+  lastPosition: {x: 3.9465113, y: -4.754686, z: 13.368861}
 --- !u!1 &2208235562426114317
 GameObject:
   m_ObjectHideFlags: 0
@@ -23331,6 +23344,31 @@ PrefabInstance:
       propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1015454708057895328, guid: 9069c86c178f3fa4eaf02c85a5a52483,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015454708057895328, guid: 9069c86c178f3fa4eaf02c85a5a52483,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015454708057895328, guid: 9069c86c178f3fa4eaf02c85a5a52483,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015454708057895328, guid: 9069c86c178f3fa4eaf02c85a5a52483,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015454708057895328, guid: 9069c86c178f3fa4eaf02c85a5a52483,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1095097892851625415, guid: 9069c86c178f3fa4eaf02c85a5a52483,
         type: 3}
       propertyPath: m_SizeDelta.y
@@ -23461,6 +23499,31 @@ PrefabInstance:
       propertyPath: m_Value
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7515477862142752990, guid: 9069c86c178f3fa4eaf02c85a5a52483,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7515477862142752990, guid: 9069c86c178f3fa4eaf02c85a5a52483,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7515477862142752990, guid: 9069c86c178f3fa4eaf02c85a5a52483,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7515477862142752990, guid: 9069c86c178f3fa4eaf02c85a5a52483,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7515477862142752990, guid: 9069c86c178f3fa4eaf02c85a5a52483,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7577225838663604392, guid: 9069c86c178f3fa4eaf02c85a5a52483,
         type: 3}
       propertyPath: m_SizeDelta.y
@@ -28025,41 +28088,6 @@ PrefabInstance:
       propertyPath: _result.forward.z
       value: 0.9768391
       objectReference: {fileID: 0}
-    - target: {fileID: 4574774226093017456, guid: 4261da25920e00f41b87a4410b9d42eb,
-        type: 3}
-      propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4574774226093017456, guid: 4261da25920e00f41b87a4410b9d42eb,
-        type: 3}
-      propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4574774226093017456, guid: 4261da25920e00f41b87a4410b9d42eb,
-        type: 3}
-      propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[1].m_Target
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 4574774226093017456, guid: 4261da25920e00f41b87a4410b9d42eb,
-        type: 3}
-      propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 4574774226093017456, guid: 4261da25920e00f41b87a4410b9d42eb,
-        type: 3}
-      propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
-      value: Play
-      objectReference: {fileID: 0}
-    - target: {fileID: 4574774226093017456, guid: 4261da25920e00f41b87a4410b9d42eb,
-        type: 3}
-      propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
-      value: SoundEmitter, Assembly-CSharp
-      objectReference: {fileID: 0}
-    - target: {fileID: 4574774226093017456, guid: 4261da25920e00f41b87a4410b9d42eb,
-        type: 3}
-      propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
-      value: UnityEngine.Object, UnityEngine
-      objectReference: {fileID: 0}
     - target: {fileID: 4574774226093017459, guid: 4261da25920e00f41b87a4410b9d42eb,
         type: 3}
       propertyPath: m_RootOrder

Assets/Prefabs/LeaderboardEntry.prefab

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

Assets/Prefabs/Player.prefab

@@ -483,7 +483,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DoNotTesselate: 0
-  savedPos: {x: 38.479973, y: -10.480004, z: -1.0000337}
+  savedPos: {x: 38.479946, y: -10.480896, z: -0.000017797727}
   savedUp: {x: 0.0000000059975327, y: 1, z: -0.000000006440586}
   savedRectSize: {x: 3.5900002, y: 73.02098}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
@@ -739,7 +739,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DoNotTesselate: 0
-  savedPos: {x: 70.229965, y: -36.50012, z: -2.200036}
+  savedPos: {x: 70.22996, y: -36.499928, z: 0.0000032211337}
   savedUp: {x: -0.0000000063142522, y: 1, z: -0.0000000023176716}
   savedRectSize: {x: 77.18, y: 63.62}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
@@ -896,7 +896,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DoNotTesselate: 0
-  savedPos: {x: -24.750008, y: -10.480064, z: -1.0000054}
+  savedPos: {x: -24.749958, y: -10.479895, z: -0.0000043382515}
   savedUp: {x: 0.0000000059975327, y: 1, z: -0.000000006440586}
   savedRectSize: {x: 106.85, y: 73.02098}
   savedColor: {r: 0, g: 0, b: 0, a: 0.011764706}
@@ -995,7 +995,7 @@ MonoBehaviour:
   savedPos: {x: 0.1409942, y: 1.3998911, z: -0.50001895}
   savedUp: {x: -0.0000000063142522, y: 1, z: -0.0000000023176716}
   savedRectSize: {x: 163.712, y: 107.61098}
-  savedColor: {r: 1, g: 1, b: 1, a: 0.12156863}
+  savedColor: {r: 1, g: 1, b: 1, a: 0.7921569}
   savedTextUV0: {x: 0, y: 0, z: 0, w: 0}
   savedFill: 1
 --- !u!1 &3190739416021401043
@@ -1157,7 +1157,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 5318814964633080599}
   m_HandleRect: {fileID: 4778527686744051039}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -1176,7 +1176,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DoNotTesselate: 0
-  savedPos: {x: 40.274986, y: -10.479984, z: -1.0000356}
+  savedPos: {x: 40.274967, y: -10.479996, z: -0.0000134942675}
   savedUp: {x: 0.0000000059975327, y: 1, z: -0.000000006440586}
   savedRectSize: {x: 3.59, y: 73.02098}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1495,6 +1495,7 @@ GameObject:
   - component: {fileID: 5885267484555030673}
   - component: {fileID: 4554157844629752389}
   - component: {fileID: 9095889423631209330}
+  - component: {fileID: 4029234530319435169}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -1644,6 +1645,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 4029234530319435169}
+        m_TargetAssemblyTypeName: DisableAfterFinishController, Assembly-CSharp
+        m_MethodName: Disabele
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
   _unityOnBeginningReached:
     m_PersistentCalls:
       m_Calls: []
@@ -1749,6 +1762,18 @@ MonoBehaviour:
   _textAutoscroll: {fileID: 4667959773318436821}
   _UIFader: {fileID: 3356217451915231819}
   _nameText: {fileID: 2431526707684633184}
+--- !u!114 &4029234530319435169
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4574774226093017486}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f3df0992729b6f242aca267e0aa8315f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4574774226115770231
 GameObject:
   m_ObjectHideFlags: 0
@@ -3967,7 +3992,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000003814697, y: -0.0025253296}
+  m_AnchoredPosition: {x: 0.000003814697, y: -0.000118255615}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7736634052481951840
@@ -16741,7 +16766,7 @@ MonoBehaviour:
   savedPos: {x: -0.000021719652, y: -0.00005809875, z: -0.50002193}
   savedUp: {x: -0.0000000063142522, y: 1, z: -0.0000000023176716}
   savedRectSize: {x: 180, y: 126.02098}
-  savedColor: {r: 1, g: 1, b: 1, a: 0.12156863}
+  savedColor: {r: 1, g: 1, b: 1, a: 0.7921569}
   savedTextUV0: {x: 0, y: 0, z: 0, w: 0}
   savedFill: 1
 --- !u!1 &9187018933432071473

Assets/Resources/Monumet_1.asset

@@ -63,4 +63,4 @@ MonoBehaviour:
   ShortClip: {fileID: 8300000, guid: 4792ddb587257084498be5e06bef4022, type: 3}
   LongClip: {fileID: 8300000, guid: 5ce77c79dfd1e664d901af515b7bb311, type: 3}
   ShortDuration: 10
-  LongDuration: 19
+  LongDuration: 20

Assets/Resources/Monumet_10.asset

@@ -62,4 +62,4 @@ MonoBehaviour:
   ShortClip: {fileID: 8300000, guid: d9b4abc909573b54e9462e14e1405366, type: 3}
   LongClip: {fileID: 8300000, guid: 4c96b07fb8642f440a53729cfcca73b8, type: 3}
   ShortDuration: 10
-  LongDuration: 15
+  LongDuration: 20

Assets/Resources/Monumet_2.asset

@@ -62,4 +62,4 @@ MonoBehaviour:
   ShortClip: {fileID: 8300000, guid: 7ced65ad712249e49977c67b5c774627, type: 3}
   LongClip: {fileID: 8300000, guid: 5037649a0e51f7c4c879ae05c8af6eba, type: 3}
   ShortDuration: 10
-  LongDuration: 10
+  LongDuration: 20

Assets/Resources/Monumet_3.asset

@@ -63,4 +63,4 @@ MonoBehaviour:
   ShortClip: {fileID: 8300000, guid: cf438d7bd0cc69f408fa33c84da609a9, type: 3}
   LongClip: {fileID: 8300000, guid: 2a33b90b030167f40a06a3802fc767fe, type: 3}
   ShortDuration: 10
-  LongDuration: 12
+  LongDuration: 20

Assets/Resources/Monumet_4.asset

@@ -57,4 +57,4 @@ MonoBehaviour:
   ShortClip: {fileID: 8300000, guid: 109406e7f29ab2b4a9700da0815ab277, type: 3}
   LongClip: {fileID: 8300000, guid: 718bbc4dab3929742ab11b9e7c8402b8, type: 3}
   ShortDuration: 10
-  LongDuration: 9
+  LongDuration: 20

Assets/Resources/Monumet_5.asset

@@ -62,4 +62,4 @@ MonoBehaviour:
   ShortClip: {fileID: 8300000, guid: bd1664c3c81c8074b9177a09d23765f1, type: 3}
   LongClip: {fileID: 8300000, guid: 5ae1050b1d13d5c478dd06e2bc46492f, type: 3}
   ShortDuration: 10
-  LongDuration: 11
+  LongDuration: 20

Assets/Resources/Monumet_6.asset

@@ -66,4 +66,4 @@ MonoBehaviour:
   ShortClip: {fileID: 8300000, guid: b658ce0dd2e326444a9009a3441f9fc5, type: 3}
   LongClip: {fileID: 8300000, guid: fbfded5ba926ecc448630e7d2797d969, type: 3}
   ShortDuration: 10
-  LongDuration: 22
+  LongDuration: 20

Assets/Resources/Monumet_7.asset

@@ -60,4 +60,4 @@ MonoBehaviour:
   ShortClip: {fileID: 8300000, guid: da43be0c6e7bc68488b25fad4f318819, type: 3}
   LongClip: {fileID: 8300000, guid: ad021ad33e12f8044be6cb4a0e3e5002, type: 3}
   ShortDuration: 10
-  LongDuration: 12
+  LongDuration: 20

Assets/Resources/Monumet_8.asset

@@ -64,4 +64,4 @@ MonoBehaviour:
   ShortClip: {fileID: 8300000, guid: 5dfe89922eeed304188ddcbdf7c7c08f, type: 3}
   LongClip: {fileID: 8300000, guid: ffaecc38e1d9c1f41afba5f217721935, type: 3}
   ShortDuration: 10
-  LongDuration: 17
+  LongDuration: 20

Assets/Resources/Monumet_9.asset

@@ -31,4 +31,4 @@ MonoBehaviour:
   ShortClip: {fileID: 8300000, guid: 3b87ea3111e5f1147b9129477b244999, type: 3}
   LongClip: {fileID: 8300000, guid: a216250512a70a143b565afa6c369022, type: 3}
   ShortDuration: 10
-  LongDuration: 13
+  LongDuration: 20

Assets/Scripts/MonumentController.cs

@@ -48,7 +48,7 @@ public class MonumentController : MonoBehaviour
     public void PlaySound()
     {
         _previewSound.PlaySound(_info.LongClip);
-        _monumentPreview.ShowInfo(_info.Name, _info.Image, _info.LongDescription, _info.LongDuration);
+        //_monumentPreview.ShowInfo(_info.Name, _info.Image, _info.LongDescription, _info.LongDuration);
     }