Merge branch 'devVlad' into HelmetVersion

This commit is contained in:
2025-01-30 14:42:30 +03:00
18 changed files with 4821 additions and 13 deletions

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

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

File diff suppressed because it is too large Load Diff

View File

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