Merge branch 'devVlad' into HelmetVersion

This commit is contained in:
Dizel 2025-01-25 16:48:48 +03:00
commit e2619c05f3
15 changed files with 2126 additions and 1934 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

@ -1157,7 +1157,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6345276865645612453} m_GameObject: {fileID: 6345276865645612453}
m_Enabled: 0 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1
@ -1170,7 +1170,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - {fileID: 2100000, guid: 784e0db4409d4c247b7ad702ac9e9346, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -422,7 +422,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2640876633597832360} m_GameObject: {fileID: 2640876633597832360}
m_Enabled: 0 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1
@ -435,7 +435,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - {fileID: 2100000, guid: 784e0db4409d4c247b7ad702ac9e9346, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -1998,7 +1998,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9104006873736500137} m_GameObject: {fileID: 9104006873736500137}
m_Enabled: 0 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1
@ -2011,7 +2011,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - {fileID: 2100000, guid: 784e0db4409d4c247b7ad702ac9e9346, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -535,7 +535,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1979185982489454764} m_GameObject: {fileID: 1979185982489454764}
m_Enabled: 0 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1
@ -548,7 +548,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - {fileID: 2100000, guid: 784e0db4409d4c247b7ad702ac9e9346, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -1587,7 +1587,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6330538734577302002} m_GameObject: {fileID: 6330538734577302002}
m_Enabled: 0 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1
@ -1600,7 +1600,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - {fileID: 2100000, guid: 784e0db4409d4c247b7ad702ac9e9346, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -272,7 +272,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 629367407569910832} m_GameObject: {fileID: 629367407569910832}
m_Enabled: 0 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1
@ -285,7 +285,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - {fileID: 2100000, guid: 784e0db4409d4c247b7ad702ac9e9346, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -1226,7 +1226,7 @@ MonoBehaviour:
m_Camera: {fileID: 1311509731} m_Camera: {fileID: 1311509731}
m_OriginBaseGameObject: {fileID: 1322744475} m_OriginBaseGameObject: {fileID: 1322744475}
m_CameraFloorOffsetObject: {fileID: 1238380410} m_CameraFloorOffsetObject: {fileID: 1238380410}
m_RequestedTrackingOriginMode: 0 m_RequestedTrackingOriginMode: 1
m_CameraYOffset: 1.1176 m_CameraYOffset: 1.1176
--- !u!4 &1322744478 --- !u!4 &1322744478
Transform: Transform:
@ -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

@ -0,0 +1,57 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4134173836893730182
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5430818692394673249}
- component: {fileID: 8281967657942942186}
m_Layer: 0
m_Name: Tile Manager
m_TagString: Tile Manager
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5430818692394673249
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4134173836893730182}
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8281967657942942186
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4134173836893730182}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 673f57172fdd6084f8c03e4433c6967c, type: 3}
m_Name:
m_EditorClassIdentifier:
scoreManager: {fileID: 0}
_NumTile: 30
_DistanceTiles: 30
_TilePrefs:
- {fileID: 7495788483562650455, guid: 4939760d0f519ec4f8d52cf5575a65c1, type: 3}
- {fileID: 6977198257239599931, guid: d87c071498c41b040a14b829ff279c6f, type: 3}
- {fileID: 8076585379630842389, guid: 43f560422b69e464b883f9735cdf3727, type: 3}
- {fileID: 7148581504057363994, guid: c520ecccf52fb014783029c3f5d8c682, type: 3}
- {fileID: 3410038953211091240, guid: 42d807bcf003c3d41a3da89aa93e16bf, type: 3}
_Tiles: []
_PlayerSetup: {fileID: 2920656843664225551, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}

View File

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

View File

@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2580588369055410037
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Close Zone Material
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _DstBlendAlpha: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 1
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 0, b: 0, a: 0.47843137}
- _Color: {r: 0, g: 0, b: 0, a: 0.47843137}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 784e0db4409d4c247b7ad702ac9e9346
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -821,6 +821,111 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 189138649} m_Father: {fileID: 189138649}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &373654111
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 373654115}
- component: {fileID: 373654114}
- component: {fileID: 373654113}
- component: {fileID: 373654112}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &373654112
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 373654111}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &373654113
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 373654111}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: b3186208b7cc28c449e2cd6509adc565, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &373654114
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 373654111}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &373654115
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 373654111}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -23.323534, y: 87.72688, z: -610.021}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &399794495 --- !u!1 &399794495
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6954,3 +7059,4 @@ SceneRoots:
- {fileID: 3804171104957673174} - {fileID: 3804171104957673174}
- {fileID: 7332733545551619345} - {fileID: 7332733545551619345}
- {fileID: 5629860619266579138} - {fileID: 5629860619266579138}
- {fileID: 373654115}

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);