diff --git a/Assets/Crossy Road VR/Scenes/Test/Scripts/TileManagerScript.cs b/Assets/Crossy Road VR/Scenes/Test/Scripts/TileManagerScript.cs index dc3b4c1..21897b4 100644 --- a/Assets/Crossy Road VR/Scenes/Test/Scripts/TileManagerScript.cs +++ b/Assets/Crossy Road VR/Scenes/Test/Scripts/TileManagerScript.cs @@ -22,6 +22,11 @@ public class TileManagerScript : MonoBehaviour /// [SerializeField] private float _DistanceTiles; + public float DistanceTiles + { + get => _DistanceTiles; + set => _DistanceTiles = value; + } /// /// список префабов для случайной генерации @@ -226,6 +231,9 @@ public class TileManagerScript : MonoBehaviour // в подпись передаётся функция увелечения счёта child.GetComponent().TriggerZoneEvent.AddListener(scoreManager.Increase); + // в подпись передаётся функция перемещения счёта + child.GetComponent().TriggerZoneEvent.AddListener(scoreManager.UpdatePos); + // выход из цикла break; } diff --git a/Assets/Crossy Road VR/Scenes/Test/Scripts/TriggerZoneScript.cs b/Assets/Crossy Road VR/Scenes/Test/Scripts/TriggerZoneScript.cs index 275ce41..d60ccfe 100644 --- a/Assets/Crossy Road VR/Scenes/Test/Scripts/TriggerZoneScript.cs +++ b/Assets/Crossy Road VR/Scenes/Test/Scripts/TriggerZoneScript.cs @@ -29,7 +29,7 @@ public class TriggerZoneScript : MonoBehaviour { // если тег игрока и первая реакция if (other.gameObject.CompareTag("Player") && !WasTrigged) - { + { // Debug.Log("Was trigged"); diff --git a/Assets/Crossy Road VR/Scenes/Test/Test Generate Map.unity b/Assets/Crossy Road VR/Scenes/Test/Test Generate Map.unity index 13222d3..2c06c5e 100644 --- a/Assets/Crossy Road VR/Scenes/Test/Test Generate Map.unity +++ b/Assets/Crossy Road VR/Scenes/Test/Test Generate Map.unity @@ -138,7 +138,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &397243930 MonoBehaviour: m_ObjectHideFlags: 0 @@ -772,7 +772,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scoreManager: {fileID: 0} - _NumTile: 3 + _NumTile: 7 _DistanceTiles: 30 _TilePrefs: - {fileID: 7495788483562650455, guid: 4939760d0f519ec4f8d52cf5575a65c1, type: 3} @@ -981,6 +981,10 @@ PrefabInstance: propertyPath: m_Name value: XR Interaction Setup objectReference: {fileID: 0} + - target: {fileID: 7313654230448209575, guid: 895f6f3c2d334633b5800312285058d2, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7313654230448209575, guid: 895f6f3c2d334633b5800312285058d2, type: 3} propertyPath: m_TagString value: Player diff --git a/Assets/ScoreManagerScript.cs b/Assets/ScoreManagerScript.cs index 0e12271..150b756 100644 --- a/Assets/ScoreManagerScript.cs +++ b/Assets/ScoreManagerScript.cs @@ -27,7 +27,7 @@ public class ScoreManagerScript : MonoBehaviour private void Start() { - UppdateScore(_ScoreText); + } public void Increase() @@ -41,8 +41,9 @@ public class ScoreManagerScript : MonoBehaviour text.text = $"Счёт - {_CurrentScore}"; } - public void UpdatePos(GameObject tile) + public void UpdatePos() { - _ScoreText.gameObject.transform.position = tile.transform.position; + Vector3 newVector = new Vector3(_ScoreText.gameObject.transform.position.x, _ScoreText.gameObject.transform.position.y, _ScoreText.gameObject.transform.position.z + _tileManagerScript.DistanceTiles); + _ScoreText.gameObject.transform.position = newVector; } } diff --git a/Assets/XRI/Samples/XR Interaction Toolkit/2.6.3/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab b/Assets/XRI/Samples/XR Interaction Toolkit/2.6.3/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab index f58d68f..0791080 100644 --- a/Assets/XRI/Samples/XR Interaction Toolkit/2.6.3/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab +++ b/Assets/XRI/Samples/XR Interaction Toolkit/2.6.3/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab @@ -210,7 +210,7 @@ LineRenderer: m_Positions: [] m_Parameters: serializedVersion: 3 - widthMultiplier: 0.02 + widthMultiplier: 0.005 widthCurve: serializedVersion: 2 m_Curve: diff --git a/Assets/XRI/Samples/XR Interaction Toolkit/2.6.3/Starter Assets/Prefabs/XR Origin (XR Rig).prefab b/Assets/XRI/Samples/XR Interaction Toolkit/2.6.3/Starter Assets/Prefabs/XR Origin (XR Rig).prefab index 78e0692..5453069 100644 --- a/Assets/XRI/Samples/XR Interaction Toolkit/2.6.3/Starter Assets/Prefabs/XR Origin (XR Rig).prefab +++ b/Assets/XRI/Samples/XR Interaction Toolkit/2.6.3/Starter Assets/Prefabs/XR Origin (XR Rig).prefab @@ -1878,6 +1878,10 @@ PrefabInstance: propertyPath: m_Parameters.numCapVertices value: 4 objectReference: {fileID: 0} + - target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331, type: 3} + propertyPath: m_Parameters.widthMultiplier + value: 0.01 + objectReference: {fileID: 0} - target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331, type: 3} propertyPath: m_Parameters.numCornerVertices value: 4 @@ -2314,6 +2318,10 @@ PrefabInstance: propertyPath: m_Parameters.numCapVertices value: 4 objectReference: {fileID: 0} + - target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331, type: 3} + propertyPath: m_Parameters.widthMultiplier + value: 0.01 + objectReference: {fileID: 0} - target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331, type: 3} propertyPath: m_Parameters.numCornerVertices value: 4