From c5b2237f52e523311a50c384bcf679ac1e766cd8 Mon Sep 17 00:00:00 2001 From: Dizel Date: Tue, 28 Jan 2025 13:03:23 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=B8=D0=B1=D1=80=D0=B0=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D1=81=D1=82=D0=BE=D0=BB=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D0=BD=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Players/Player Setup.prefab | 4 ++++ .../Scripts/HitDetectorScript.cs | 22 +++++++++++++++---- .../Scripts}/StaminaBarScript.cs | 0 .../Scripts}/StaminaBarScript.cs.meta | 0 4 files changed, 22 insertions(+), 4 deletions(-) rename Assets/{ => Crossy Road VR/Scripts}/StaminaBarScript.cs (100%) rename Assets/{ => Crossy Road VR/Scripts}/StaminaBarScript.cs.meta (100%) diff --git a/Assets/Crossy Road VR/Prefabs/Players/Player Setup.prefab b/Assets/Crossy Road VR/Prefabs/Players/Player Setup.prefab index 7173e24..2a2a938 100644 --- a/Assets/Crossy Road VR/Prefabs/Players/Player Setup.prefab +++ b/Assets/Crossy Road VR/Prefabs/Players/Player Setup.prefab @@ -2519,6 +2519,10 @@ MonoBehaviour: _Menu: {fileID: 2491700103206237577, guid: 4a7a5deffd236a749be84a26f6641caf, type: 3} _ForwardSource: {fileID: 4098506887931384771} move: {fileID: 5964534008193362612} + _Intensity: 1 + _Duration: 2 + _LeftController: {fileID: 5690972490677766018} + _RightController: {fileID: 8496130537008775401} --- !u!114 &6816638489069482198 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Crossy Road VR/Scripts/HitDetectorScript.cs b/Assets/Crossy Road VR/Scripts/HitDetectorScript.cs index 238a01e..08817f4 100644 --- a/Assets/Crossy Road VR/Scripts/HitDetectorScript.cs +++ b/Assets/Crossy Road VR/Scripts/HitDetectorScript.cs @@ -1,7 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.SceneManagement; +using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; public class HitDetectorScript : MonoBehaviour @@ -12,6 +9,13 @@ public class HitDetectorScript : MonoBehaviour [SerializeField] private GameObject _ForwardSource; [SerializeField] private ActionBasedContinuousMoveProvider move; + [Range(0f, 1f)] + [SerializeField] private float _Intensity; + [SerializeField] private float _Duration; + + [SerializeField] XRBaseController _LeftController; + [SerializeField] XRBaseController _RightController; + private void OnTriggerEnter(Collider other) { //Debug.Log(other.gameObject.name); @@ -36,11 +40,21 @@ public class HitDetectorScript : MonoBehaviour // Создание объекта Instantiate(_Menu, newPos, newRot); + TriggerHaptic(_LeftController); + TriggerHaptic (_RightController); + Debug.Log("Player was hitted car"); //SceneManager.LoadSceneAsync(SceneManager.GetActiveScene().name); } } + public void TriggerHaptic(XRBaseController controller) + { + if (_Intensity > 0) + { + controller.SendHapticImpulse(_Intensity, _Duration); + } + } //private void OnCollisionEnter(Collision collision) //{ // Debug.Log(collision.gameObject.name); diff --git a/Assets/StaminaBarScript.cs b/Assets/Crossy Road VR/Scripts/StaminaBarScript.cs similarity index 100% rename from Assets/StaminaBarScript.cs rename to Assets/Crossy Road VR/Scripts/StaminaBarScript.cs diff --git a/Assets/StaminaBarScript.cs.meta b/Assets/Crossy Road VR/Scripts/StaminaBarScript.cs.meta similarity index 100% rename from Assets/StaminaBarScript.cs.meta rename to Assets/Crossy Road VR/Scripts/StaminaBarScript.cs.meta