diff --git a/Assets/Scenes/NeoFPS Test-TonysEdit.unity b/Assets/Scenes/NeoFPS Test-TonysEdit.unity index 1e64e601..69095e90 100644 --- a/Assets/Scenes/NeoFPS Test-TonysEdit.unity +++ b/Assets/Scenes/NeoFPS Test-TonysEdit.unity @@ -2094,7 +2094,7 @@ Transform: m_Children: - {fileID: 577706698} m_Father: {fileID: 1543407502} - m_RootOrder: 57 + m_RootOrder: 59 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &152712156 stripped Rigidbody: @@ -2131,7 +2131,7 @@ Transform: m_Children: - {fileID: 645183859} m_Father: {fileID: 1543407502} - m_RootOrder: 51 + m_RootOrder: 52 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &156665552 PrefabInstance: @@ -3790,6 +3790,37 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &248964771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 580538020} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 248964772} + m_Layer: 0 + m_Name: Tactical Vest (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &248964772 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 580538020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 248964771} + 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_Children: + - {fileID: 580538021} + m_Father: {fileID: 1543407502} + m_RootOrder: 45 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &249307110 PrefabInstance: m_ObjectHideFlags: 0 @@ -4991,6 +5022,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4725810821136636439, guid: 6f1462f9bf7be38429725c068101b5f0, + type: 3} + propertyPath: m_Convex + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6188667877590786865, guid: 6f1462f9bf7be38429725c068101b5f0, type: 3} propertyPath: m_AnchorMin.y @@ -8013,6 +8049,22 @@ Transform: type: 3} m_PrefabInstance: {fileID: 485058209} m_PrefabAsset: {fileID: 0} +--- !u!1 &486838748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1368908863} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1368908864} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!54 &493699447 stripped Rigidbody: m_CorrespondingSourceObject: {fileID: 54694976647650114, guid: e3c3fc737aaecec47998dbddc1dc85f6, @@ -9617,12 +9669,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9e87660b4562f6345a306e6e3f7dcfe5, type: 3} ---- !u!4 &580538021 stripped +--- !u!4 &580538021 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4938125481204364, guid: 9e87660b4562f6345a306e6e3f7dcfe5, type: 3} m_PrefabInstance: {fileID: 580538020} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057534826} + 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_Children: [] + m_Father: {fileID: 248964772} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &588022069 PrefabInstance: m_ObjectHideFlags: 0 @@ -10355,7 +10416,7 @@ Transform: m_Children: - {fileID: 1877145106} m_Father: {fileID: 1543407502} - m_RootOrder: 55 + m_RootOrder: 57 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &630669528 PrefabInstance: @@ -12542,7 +12603,7 @@ Transform: m_Children: - {fileID: 344199253} m_Father: {fileID: 1543407502} - m_RootOrder: 48 + m_RootOrder: 49 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &765197597 PrefabInstance: @@ -13374,7 +13435,7 @@ Transform: m_Children: - {fileID: 2115369883} m_Father: {fileID: 1543407502} - m_RootOrder: 59 + m_RootOrder: 67 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &831625432 GameObject: @@ -13773,7 +13834,7 @@ Transform: m_Children: - {fileID: 1509799104} m_Father: {fileID: 1543407502} - m_RootOrder: 47 + m_RootOrder: 48 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &861363563 PrefabInstance: @@ -14049,7 +14110,7 @@ Transform: m_Children: - {fileID: 131887817} m_Father: {fileID: 1543407502} - m_RootOrder: 56 + m_RootOrder: 58 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &871110459 PrefabInstance: @@ -14212,7 +14273,7 @@ Transform: m_Children: - {fileID: 55051807} m_Father: {fileID: 1543407502} - m_RootOrder: 53 + m_RootOrder: 55 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &876338155 PrefabInstance: @@ -17030,7 +17091,7 @@ Transform: m_Children: - {fileID: 877380173} m_Father: {fileID: 1543407502} - m_RootOrder: 46 + m_RootOrder: 47 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1037072336 PrefabInstance: @@ -17211,7 +17272,7 @@ Transform: m_Children: - {fileID: 632912227} m_Father: {fileID: 1543407502} - m_RootOrder: 54 + m_RootOrder: 56 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1041295484 stripped GameObject: @@ -21250,7 +21311,7 @@ Transform: m_Children: - {fileID: 1751282828} m_Father: {fileID: 1543407502} - m_RootOrder: 52 + m_RootOrder: 53 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1160716013 PrefabInstance: @@ -22844,6 +22905,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: hasBeenLooted: 0 + itemsHaveBeenInstantiated: 0 + itemsHaveBeenHidden: 0 prefabs: [] itemUIs: [] --- !u!82 &1216902021 @@ -24897,7 +24960,7 @@ Transform: m_Children: - {fileID: 134466802} m_Father: {fileID: 1543407502} - m_RootOrder: 45 + m_RootOrder: 46 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1351873219 PrefabInstance: @@ -26439,12 +26502,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c98a0caf6b43fca47808482b6b3bc5c1, type: 3} ---- !u!4 &1368908864 stripped +--- !u!4 &1368908864 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4738738240007314, guid: c98a0caf6b43fca47808482b6b3bc5c1, type: 3} m_PrefabInstance: {fileID: 1368908863} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 486838748} + 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_Children: [] + m_Father: {fileID: 1665404366} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1369428063 PrefabInstance: m_ObjectHideFlags: 0 @@ -29613,6 +29685,7 @@ Transform: - {fileID: 356056091} - {fileID: 1941140126} - {fileID: 103117887} + - {fileID: 248964772} - {fileID: 1350527089} - {fileID: 1035861824} - {fileID: 848068312} @@ -29621,22 +29694,21 @@ Transform: - {fileID: 1945340717} - {fileID: 155001913} - {fileID: 1142949453} + - {fileID: 1665404366} - {fileID: 872169240} - {fileID: 1040389512} - {fileID: 630456241} - {fileID: 867708039} - {fileID: 150068387} - {fileID: 1646753860} - - {fileID: 831609403} - - {fileID: 1612758345} - {fileID: 1464582468} - {fileID: 224145751} - {fileID: 1128457984} - {fileID: 1575759681} - {fileID: 1367057314} - {fileID: 2121566407} - - {fileID: 580538021} - - {fileID: 1368908864} + - {fileID: 831609403} + - {fileID: 1612758345} - {fileID: 302316257} - {fileID: 1736408858} - {fileID: 189241836} @@ -32357,7 +32429,7 @@ Transform: m_Children: - {fileID: 1818996530} m_Father: {fileID: 1543407502} - m_RootOrder: 60 + m_RootOrder: 68 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1616783316 PrefabInstance: @@ -32712,7 +32784,7 @@ Transform: m_Children: - {fileID: 1647558718} m_Father: {fileID: 1543407502} - m_RootOrder: 58 + m_RootOrder: 60 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1647558718 Transform: @@ -33029,6 +33101,37 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1665050069} m_PrefabAsset: {fileID: 0} +--- !u!1 &1665404365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1368908863} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1665404366} + m_Layer: 0 + m_Name: Carrier 1 (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1665404366 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1368908863} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665404365} + 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_Children: + - {fileID: 1368908864} + m_Father: {fileID: 1543407502} + m_RootOrder: 54 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1676822697 PrefabInstance: m_ObjectHideFlags: 0 @@ -33861,6 +33964,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1543407502} m_Modifications: + - target: {fileID: -6209976137525347502, guid: 5cc425b8fa880084c9eb54016e69f8f1, + type: 3} + propertyPath: m_Convex + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1241596305986958, guid: 5cc425b8fa880084c9eb54016e69f8f1, type: 3} propertyPath: m_Name value: Bullet Proof Vest @@ -37264,7 +37372,7 @@ Transform: m_Children: - {fileID: 1602372552} m_Father: {fileID: 1543407502} - m_RootOrder: 49 + m_RootOrder: 50 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1924744326 PrefabInstance: @@ -37630,6 +37738,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: hasBeenLooted: 0 + itemsHaveBeenInstantiated: 0 + itemsHaveBeenHidden: 0 prefabs: - {fileID: 1118060305950738, guid: b7c4da9eb00a5ba44a6ed00f2509b08d, type: 3} - {fileID: 1241596305986958, guid: 27d010d9bce6c2c4db69a77df4c3723e, type: 3} @@ -37879,7 +37989,7 @@ Transform: m_Children: - {fileID: 1800813350} m_Father: {fileID: 1543407502} - m_RootOrder: 50 + m_RootOrder: 51 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1954387268 PrefabInstance: @@ -39379,6 +39489,22 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2049012702} m_PrefabAsset: {fileID: 0} +--- !u!1 &2057534826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 580538020} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 580538021} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &2060037156 PrefabInstance: m_ObjectHideFlags: 0