likhenko/Crossy_Road_VR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devVlad' into HelmetVersion

Browse Source
This commit is contained in:
Dizel 2025-01-30 13:04:55 +03:00
commit 5b7c96977c
5 changed files with 2439 additions and 2365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4423
Assets/Crossy Road VR/Prefabs/Players/Player Setup.prefab
View File

File diff suppressed because it is too large Load Diff

272
Assets/Crossy Road VR/Scenes/Game/Game Scence.unity
View File

@ -122,154 +122,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &889366719
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 889366720}
- component: {fileID: 889366722}
- component: {fileID: 889366721}
m_Layer: 0
m_Name: Music
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &889366720
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 889366719}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1832352350}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &889366721
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 889366719}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 0.5
m_Pitch: 1
Loop: 1
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &889366722
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 889366719}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 57b6a86afb37be341a1589bb98bdeb60, type: 3}
m_Name:
m_EditorClassIdentifier:
_MusicClipList:
- {fileID: 8300000, guid: ab50ca0fe44166e458f7c6f96dca3413, type: 3}
- {fileID: 8300000, guid: e3cc6a5f177942a4f96a97913c8b3d11, type: 3}
- {fileID: 8300000, guid: 257122f42cf9fe74e9146f3e374f4df1, type: 3}
- {fileID: 8300000, guid: 056fef58ca9d41746aeaac1649ee6e49, type: 3}
- {fileID: 8300000, guid: 992aed4c1adf91a449d2ee7fe0a2e270, type: 3}
- {fileID: 8300000, guid: ad4624927aa471b4f9969fa6aded149b, type: 3}
--- !u!1 &894356741
GameObject:
m_ObjectHideFlags: 0
@ -2299,11 +2151,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 359741391555935905, guid: d345ba61556173847ba32546368899cd, type: 3}
m_PrefabInstance: {fileID: 1744412849}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1832352350 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7715044902281673486, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
m_PrefabInstance: {fileID: 1879847889}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1870866336
GameObject:
m_ObjectHideFlags: 0
@ -2441,66 +2288,6 @@ MonoBehaviour:
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!1001 &1879847889
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2920656843664225551, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_Name
value: Player Setup
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalPosition.y
value: 1.25
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalPosition.z
value: -15.26
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 7715044902281673486, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
insertIndex: -1
addedObject: {fileID: 889366720}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
--- !u!1 &1991568987
GameObject:
m_ObjectHideFlags: 0
@ -2606,6 +2393,63 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &3034490512036249413
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1143685360112307188, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_Name
value: Player Setup
objectReference: {fileID: 0}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalPosition.y
value: 1.25
objectReference: {fileID: 0}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalPosition.z
value: -15.26
objectReference: {fileID: 0}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@ -2616,4 +2460,4 @@ SceneRoots:
- {fileID: 1744412849}
- {fileID: 1991568992}
- {fileID: 1322744478}
- {fileID: 1879847889}
- {fileID: 3034490512036249413}

35
Assets/Crossy Road VR/Scripts/HitDetectorScript.cs
View File

@ -8,6 +8,7 @@ public class HitDetectorScript : MonoBehaviour
[SerializeField] private GameObject _Menu;
[SerializeField] private GameObject _ForwardSource;
[SerializeField] private ActionBasedContinuousMoveProvider move;
[SerializeField] private CharacterController _CharacterController;
[Range(0f, 1f)]
[SerializeField] private float _Intensity;
@ -23,22 +24,10 @@ public class HitDetectorScript : MonoBehaviour
{
_IsDead = true;
Vector3 pos = _ForwardSource.transform.position;
Vector3 forward = _ForwardSource.transform.forward;
// Определите расстояние перед объектом
float distance = 1.0f;
// Вычислите новую позицию с учетом расстояния
Vector3 newPos = pos + forward.normalized * distance;
// Меню смотрит в том же направлении, что и источник, но фиксируется по вертикали
Quaternion newRot = Quaternion.LookRotation(new Vector3(forward.x, 0, forward.z));
move.enabled = false;
_CharacterController.enabled = false;
// Создание объекта
Instantiate(_Menu, newPos, newRot);
UISpawn();
TriggerHaptic(_LeftController);
TriggerHaptic (_RightController);
@ -48,6 +37,24 @@ public class HitDetectorScript : MonoBehaviour
}
}
private void UISpawn()
{
Vector3 pos = _ForwardSource.transform.position;
Vector3 forward = _ForwardSource.transform.forward;
// Определите расстояние перед объектом
float distance = 1.0f;
// Вычислите новую позицию с учетом расстояния
Vector3 newPos = pos + forward.normalized * distance;
// Меню смотрит в том же направлении, что и источник, но фиксируется по вертикали
Quaternion newRot = Quaternion.LookRotation(new Vector3(forward.x, 0, forward.z));
// Создание объекта
Instantiate(_Menu, newPos, newRot);
}
public void TriggerHaptic(XRBaseController controller)
{
if (_Intensity > 0)

72
Assets/PlayerJumpScript.cs
View File

@ -1,17 +1,73 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine;
using UnityEngine.InputSystem;
public class PlayerJumpScript : MonoBehaviour
{
[SerializeField] private InputActionProperty _JumpButton;
[SerializeField] private float _JumpHeight = 0f;
[SerializeField] private float _JumpHeight = 0f; // Высота прыжка
[SerializeField] private CharacterController _CharacterController;
[SerializeField] private LayerMask _GroundLayers;
[SerializeField] private float rad = 0;
//private bool IsGrounded()
//{
// //return Physics.CheckSphere(transform)
//}
private float _verticalVelocity = 0f; // Вертикальная скорость
private float _gravity = Physics.gravity.y; // Гравитация
private bool _isGrounded;
private void Update()
{
_isGrounded = IsGrounded();
//if (_JumpButton.action.WasPressedThisFrame())
//{
// if (_isGrounded)
// {
// Debug.Log("Will Jump from gruond");
// }
// else
// {
// Debug.Log("Not Jump");
// }
//}
// Если персонаж на земле, обнуляем вертикальную скорость и проверяем прыжок
if (_isGrounded)
{
_verticalVelocity = -1f; // Небольшое значение, чтобы персонаж не зависал в воздухе
// Если кнопка прыжка нажата
if (_JumpButton.action.WasPressedThisFrame())
{
Jump();
}
}
else
{
// Применяем гравитацию, если персонаж не на земле
_verticalVelocity += _gravity * Time.deltaTime;
}
// Перемещение персонажа с учетом вертикальной скорости
Vector3 movement = new Vector3(0, _verticalVelocity, 0);
if (_CharacterController.enabled == true)
{
_CharacterController.Move(movement * Time.deltaTime);
}
}
private bool IsGrounded()
{
return Physics.CheckSphere(transform.position, rad, _GroundLayers); // Радиус может быть отрегулирован
}
private void Jump()
{
if (_isGrounded)
{
// Применяем силу прыжка
_verticalVelocity = Mathf.Sqrt(_JumpHeight * -2f * _gravity); // Формула для прыжка с заданной высотой
}
}
}

2
ProjectSettings/TagManager.asset
View File

@ -20,7 +20,7 @@ TagManager:
-
- Water
- UI
-
- Ground
-
-
-