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 14:42:30 +03:00
commit 43c1fd460e
18 changed files with 4821 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -705,6 +705,7 @@ GameObject:
- component: {fileID: 674649897995790958}
- component: {fileID: 8362737562193945698}
- component: {fileID: 4568295102360243241}
- component: {fileID: 2214660188290312135}
m_Layer: 0
m_Name: XR Origin (XR Rig)
m_TagString: Player
@ -943,6 +944,22 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 64
rad: 0.05
--- !u!114 &2214660188290312135
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1174993261558678387}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 12adac03b8a8552459794dee4dca6c79, type: 3}
m_Name:
m_EditorClassIdentifier:
_Menu: {fileID: 2491700103206237577, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
_ForwardSource: {fileID: 7692445296189415856}
move: {fileID: 674649897995790958}
_CharacterController: {fileID: 740023556193931342}
--- !u!1 &1338674527300045479
GameObject:
m_ObjectHideFlags: 0

2
Assets/Crossy Road VR/Prefabs/Players/UI.prefab → Assets/Crossy Road VR/Prefabs/Players/UI Dead Menu.prefab
View File

@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 2912464425011237244}
m_Layer: 0
m_Name: UI
m_Name: UI Dead Menu
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

0
Assets/Crossy Road VR/Prefabs/Players/UI.prefab.meta → Assets/Crossy Road VR/Prefabs/Players/UI Dead Menu.prefab.meta
View File

1917
Assets/Crossy Road VR/Prefabs/Players/UI First Menu.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Crossy Road VR/Prefabs/Players/UI First Menu.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ad34e5f884ceba0459e127656e282c6e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

@ -122,6 +122,11 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &593427418 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2491700103206237577, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
m_PrefabInstance: {fileID: 904496846}
m_PrefabAsset: {fileID: 0}
--- !u!1 &894356741
GameObject:
m_ObjectHideFlags: 0
@ -240,6 +245,67 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 894356741}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &904496846
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2491700103206237577, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_Name
value: UI First Menu
objectReference: {fileID: 0}
- target: {fileID: 2491700103206237577, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2912464425011237244, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2912464425011237244, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_LocalPosition.y
value: 2.75
objectReference: {fileID: 0}
- target: {fileID: 2912464425011237244, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_LocalPosition.z
value: -12.76
objectReference: {fileID: 0}
- target: {fileID: 2912464425011237244, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2912464425011237244, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2912464425011237244, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2912464425011237244, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2912464425011237244, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2912464425011237244, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2912464425011237244, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
--- !u!1 &1004186269
GameObject:
m_ObjectHideFlags: 0
@ -2130,7 +2196,7 @@ MonoBehaviour:
- {fileID: 7148581504057363994, guid: c520ecccf52fb014783029c3f5d8c682, type: 3}
- {fileID: 3410038953211091240, guid: 42d807bcf003c3d41a3da89aa93e16bf, type: 3}
_Tiles: []
_PlayerSetup: {fileID: 0}
_PlayerSetup: {fileID: 1930314926}
--- !u!4 &1750947391
Transform:
m_ObjectHideFlags: 0
@ -2288,6 +2354,11 @@ MonoBehaviour:
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!1 &1930314926 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1143685360112307188, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
m_PrefabInstance: {fileID: 3034490512036249413}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1991568987
GameObject:
m_ObjectHideFlags: 0
@ -2405,6 +2476,14 @@ PrefabInstance:
propertyPath: m_Name
value: Player Setup
objectReference: {fileID: 0}
- target: {fileID: 1143685360112307188, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2214660188290312135, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: _Menu
value:
objectReference: {fileID: 593427418}
- target: {fileID: 5148910712891496511, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -2461,3 +2540,4 @@ SceneRoots:
- {fileID: 1991568992}
- {fileID: 1322744478}
- {fileID: 3034490512036249413}
- {fileID: 904496846}

0
Assets/PlayerJumpScript.cs → Assets/Crossy Road VR/Scripts/PlayerJumpScript.cs
View File

0
Assets/PlayerJumpScript.cs.meta → Assets/Crossy Road VR/Scripts/PlayerJumpScript.cs.meta
View File

0
Assets/RandomMusicSelectScript.cs → Assets/Crossy Road VR/Scripts/RandomMusicSelectScript.cs
View File

0
Assets/RandomMusicSelectScript.cs.meta → Assets/Crossy Road VR/Scripts/RandomMusicSelectScript.cs.meta
View File

0
Assets/SpawnRandomObjectsScript.cs → Assets/Crossy Road VR/Scripts/SpawnRandomObjectsScript.cs
View File

0
Assets/SpawnRandomObjectsScript.cs.meta → Assets/Crossy Road VR/Scripts/SpawnRandomObjectsScript.cs.meta
View File

2
Assets/Crossy Road VR/Scripts/TileManagerScript.cs
View File

@ -82,7 +82,7 @@ public class TileManagerScript : MonoBehaviour
//_PlayerSetup.SetActive(true);
_PlayerSetup.SetActive(true);
}
/// <summary>

30
Assets/FirstMenuScript.cs Normal file
View File

@ -0,0 +1,30 @@
using UnityEngine;
using UnityEngine.XR.Interaction.Toolkit;
public class FirstMenuScript : MonoBehaviour
{
[SerializeField] private GameObject _UIMenu;
[SerializeField] private ActionBasedContinuousMoveProvider _Move;
[SerializeField] private CharacterController _CharacterController;
public void Init(ActionBasedContinuousMoveProvider move, CharacterController cc)
{
_UIMenu = gameObject;
_Move = move;
_CharacterController = cc;
}
// Start is called before the first frame update
public void UserAgree()
{
_Move.enabled = true;
_CharacterController.enabled = true;
_UIMenu.SetActive(false);
}
public void UserDisagree()
{
Application.Quit();
}
}

11
Assets/FirstMenuScript.cs.meta Normal file
View File

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

2715
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

File diff suppressed because one or more lines are too long

40
Assets/UIFirstMenuSpawnScript.cs Normal file
View File

@ -0,0 +1,40 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.XR.Interaction.Toolkit;
public class UIFirstMenuSpawnScript : MonoBehaviour
{
[SerializeField] private GameObject _Menu;
[SerializeField] private GameObject _ForwardSource;
[SerializeField] private ActionBasedContinuousMoveProvider move;
[SerializeField] private CharacterController _CharacterController;
void Start()
{
move.enabled = false;
_CharacterController.enabled = false;
_Menu.SetActive(true);
//UISpawn();
_Menu.GetComponent<FirstMenuScript>().Init(move, _CharacterController);
}
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));
// Создание объекта
GameObject newMenu = Instantiate(_Menu, newPos, newRot);
newMenu.GetComponent<FirstMenuScript>().Init(move, _CharacterController);
}
}

11
Assets/UIFirstMenuSpawnScript.cs.meta Normal file
View File

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