Остановка игрока после сбития

This commit is contained in:
Dizel 2025-01-25 16:31:39 +03:00
parent b194dc0191
commit ce43dd94fe
5 changed files with 1806 additions and 1921 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 370de91caccb06340a180df8efc5b27a guid: ece2161f7d9e2a143b4ddb22c44736e1
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -2009,7 +2009,7 @@ MonoBehaviour:
- {fileID: 7148581504057363994, guid: c520ecccf52fb014783029c3f5d8c682, type: 3} - {fileID: 7148581504057363994, guid: c520ecccf52fb014783029c3f5d8c682, type: 3}
- {fileID: 3410038953211091240, guid: 42d807bcf003c3d41a3da89aa93e16bf, type: 3} - {fileID: 3410038953211091240, guid: 42d807bcf003c3d41a3da89aa93e16bf, type: 3}
_Tiles: [] _Tiles: []
_PlayerSetup: {fileID: 3310916099714090641} _PlayerSetup: {fileID: 7479059670474095696}
--- !u!4 &1750947391 --- !u!4 &1750947391
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2267,7 +2267,12 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2234663093327250926 --- !u!1 &7479059670474095696 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2920656843664225551, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
m_PrefabInstance: {fileID: 8980011879413088817}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8980011879413088817
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
@ -2275,196 +2280,55 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 1575580412162811263, guid: 370de91caccb06340a180df8efc5b27a, type: 3} - target: {fileID: 2920656843664225551, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_UIHoverExited.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnHoverExited
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnHoverEntered
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_UIHoverExited.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: ActivateUILineScript, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: ActivateUILineScript, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_UIHoverExited.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: ActivateUILineScript, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2878356912286848869, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_UIHoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_UIHoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnHoverExited
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnHoverEntered
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: ActivateUILineScript, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: ActivateUILineScript, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 3109341510149640168, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_HoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 3270564236375070860, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4852402167008346479, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalPosition.y
value: 1.25
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalPosition.z
value: -10.01
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6923556806421342620, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8703746257660459454, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Player Setup value: Player Setup
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8703746257660459454, guid: 370de91caccb06340a180df8efc5b27a, type: 3} - target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_IsActive 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: -10.01
objectReference: {fileID: 0}
- target: {fileID: 5348617443534978374, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
propertyPath: m_LocalRotation.w
value: 1 value: 1
objectReference: {fileID: 0} 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_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 370de91caccb06340a180df8efc5b27a, type: 3} m_SourcePrefab: {fileID: 100100000, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
--- !u!1 &3310916099714090641 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8703746257660459454, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
m_PrefabInstance: {fileID: 2234663093327250926}
m_PrefabAsset: {fileID: 0}
--- !u!1660057539 &9223372036854775807 --- !u!1660057539 &9223372036854775807
SceneRoots: SceneRoots:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2474,5 +2338,5 @@ SceneRoots:
- {fileID: 1750947391} - {fileID: 1750947391}
- {fileID: 1744412849} - {fileID: 1744412849}
- {fileID: 1991568992} - {fileID: 1991568992}
- {fileID: 2234663093327250926} - {fileID: 8980011879413088817}
- {fileID: 1322744478} - {fileID: 1322744478}

View File

@ -6877,6 +6877,14 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Road 2 value: Road 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7661146061833324316, guid: d87c071498c41b040a14b829ff279c6f, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7661146061833324316, guid: d87c071498c41b040a14b829ff279c6f, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: b3186208b7cc28c449e2cd6509adc565, type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []

View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
using UnityEngine.XR.Interaction.Toolkit;
public class HitDetectorScript : MonoBehaviour public class HitDetectorScript : MonoBehaviour
{ {
@ -9,6 +10,7 @@ public class HitDetectorScript : MonoBehaviour
[SerializeField] private GameObject _Menu; [SerializeField] private GameObject _Menu;
[SerializeField] private GameObject _ForwardSource; [SerializeField] private GameObject _ForwardSource;
[SerializeField] private ActionBasedContinuousMoveProvider move;
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
@ -29,6 +31,8 @@ public class HitDetectorScript : MonoBehaviour
// Меню смотрит в том же направлении, что и источник, но фиксируется по вертикали // Меню смотрит в том же направлении, что и источник, но фиксируется по вертикали
Quaternion newRot = Quaternion.LookRotation(new Vector3(forward.x, 0, forward.z)); Quaternion newRot = Quaternion.LookRotation(new Vector3(forward.x, 0, forward.z));
move.enabled = false;
// Создание объекта // Создание объекта
Instantiate(_Menu, newPos, newRot); Instantiate(_Menu, newPos, newRot);