diff --git a/Assets/Inventory System/2D Assets/Icons/$temp.meta b/Assets/Inventory System/2D Assets/Icons/$temp.meta index fc0e432c..b3004625 100644 --- a/Assets/Inventory System/2D Assets/Icons/$temp.meta +++ b/Assets/Inventory System/2D Assets/Icons/$temp.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Scenes/Test Scene Tony.unity.meta -guid: 84e7ae53e32c42d44b04a8512ca3969f +guid: 4a48de047d26dda409ce792a321bdff5 ======== guid: 5c741c4d068619344a3e34e1a352d64b folderAsset: yes diff --git a/Assets/Inventory System/Prefabs/Item UI/Consumables.meta b/Assets/Inventory System/Prefabs/Item UI/Consumables.meta new file mode 100644 index 00000000..15352ab8 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Consumables.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18906e0d14b4849448eb63ddd09e4f5f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta new file mode 100644 index 00000000..7f808b94 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57975bed53103674291bed4602b12f03 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Plates.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Plates.meta new file mode 100644 index 00000000..035f1fba --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Plates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e46cfcdccd19f145a485a489ac6d072 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Foregrips.meta b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Foregrips.meta new file mode 100644 index 00000000..002278f8 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Foregrips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eaa582e1c7ae46b46869cf09bfe48dc0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Magazines.meta b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Magazines.meta new file mode 100644 index 00000000..2d03a8f8 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Magazines.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4736df418d82ce346baffcb35f1807f6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Muzzle Devices.meta b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Muzzle Devices.meta new file mode 100644 index 00000000..65e5415e --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Muzzle Devices.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55d7e84284c5299489973477b29d9ea1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Optics.meta b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Optics.meta new file mode 100644 index 00000000..26f5227a --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Optics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40f32ad70335b6043b2197f3ed7bb64e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Handguards.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Handguards.meta new file mode 100644 index 00000000..8bc01d96 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Handguards.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8504e037e12f7f447b28bd369185f166 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Pistol Grips.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Pistol Grips.meta new file mode 100644 index 00000000..16729a39 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Pistol Grips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c79a6cbe08269e647ac6ef99ee85173a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Stocks.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Stocks.meta new file mode 100644 index 00000000..21eedbcf --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Stocks.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b40bc90553027a4428365fe9e0df128d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Barrels.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Barrels.meta new file mode 100644 index 00000000..6c552549 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Barrels.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 147e163ede9beb34fb999c4a636f1b94 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Handguards.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Handguards.meta new file mode 100644 index 00000000..f606656e --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Handguards.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a4f411128826bae4c8b1c847000dfe8c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Pistol Grips.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Pistol Grips.meta new file mode 100644 index 00000000..4ca51258 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Pistol Grips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d3ae93cb811ae449876214caa44b476 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Stocks.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Stocks.meta new file mode 100644 index 00000000..9f78c7aa --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Stocks.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32feeb0af8e5895449b8f58944051699 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/G22.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/G22.meta new file mode 100644 index 00000000..9ac18ac5 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/G22.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1027cbd82e54d944b0c0bd9bacb6294 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Medicine.meta b/Assets/Inventory System/Prefabs/Item UI/Medicine.meta new file mode 100644 index 00000000..427cdf0a --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Medicine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c113e73eb85290248966d38f6fa27420 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Other.meta b/Assets/Inventory System/Prefabs/Item UI/Other.meta new file mode 100644 index 00000000..bfe239c5 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Other.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8170ea60c9a2c714d870372fb89c306f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/UI Elements/Border.prefab b/Assets/Inventory System/Prefabs/UI Elements/Border.prefab index 0fed8b3d..555f0ac4 100644 --- a/Assets/Inventory System/Prefabs/UI Elements/Border.prefab +++ b/Assets/Inventory System/Prefabs/UI Elements/Border.prefab @@ -73,4 +73,4 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 0.2 + m_PixelsPerUnitMultiplier: 0.5 diff --git a/Assets/Inventory System/Prefabs/UI Elements/StackCount.prefab b/Assets/Inventory System/Prefabs/UI Elements/StackCount.prefab index c51ac685..5fd3080f 100644 --- a/Assets/Inventory System/Prefabs/UI Elements/StackCount.prefab +++ b/Assets/Inventory System/Prefabs/UI Elements/StackCount.prefab @@ -128,7 +128,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 1 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 3, w: 1} + m_margin: {x: 0, y: 0, z: 4, w: 2} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/Items/Prefabs/Consumables.meta b/Assets/Items/Prefabs/Consumables.meta new file mode 100644 index 00000000..b916c0a3 --- /dev/null +++ b/Assets/Items/Prefabs/Consumables.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26f808e8ee3809c43867c1c1eb226124 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Prefabs/Gear/Headset.meta b/Assets/Items/Prefabs/Gear/Headset.meta new file mode 100644 index 00000000..c0fe9783 --- /dev/null +++ b/Assets/Items/Prefabs/Gear/Headset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 932332605b143de408257962fa7ff175 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Prefabs/Gear/Plate Carriers/Precision Plate Carrier.prefab b/Assets/Items/Prefabs/Gear/Plate Carriers/Precision Plate Carrier.prefab index ba94cfa1..e1b7b442 100644 --- a/Assets/Items/Prefabs/Gear/Plate Carriers/Precision Plate Carrier.prefab +++ b/Assets/Items/Prefabs/Gear/Plate Carriers/Precision Plate Carrier.prefab @@ -450,6 +450,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8715477175483360842, guid: 004fc0e3f060e8942ab8379feb15c21c, + type: 3} + propertyPath: emptyGridContainer + value: + objectReference: {fileID: 2663550850753990593} - target: {fileID: 8715477175483360852, guid: 004fc0e3f060e8942ab8379feb15c21c, type: 3} propertyPath: m_Name @@ -610,6 +615,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &2663550850753990593 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 299101071701878437, guid: 004fc0e3f060e8942ab8379feb15c21c, + type: 3} + m_PrefabInstance: {fileID: 2364473049272232292} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7854409540325217258 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Items/Prefabs/Other.meta b/Assets/Items/Prefabs/Other.meta new file mode 100644 index 00000000..addf3cdd --- /dev/null +++ b/Assets/Items/Prefabs/Other.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34df9cfc25be6f547a48b9abf4422566 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Map/Blender/MapsModelsImporter/map-0d1klcr.meta b/Assets/Map/Blender/MapsModelsImporter/map-0d1klcr.meta new file mode 100644 index 00000000..4f03d758 --- /dev/null +++ b/Assets/Map/Blender/MapsModelsImporter/map-0d1klcr.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4313c97c87b0da42b32b9465a89e002 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Map/Blender/MapsModelsImporter/map-fggisoa.meta b/Assets/Map/Blender/MapsModelsImporter/map-fggisoa.meta new file mode 100644 index 00000000..7a683e10 --- /dev/null +++ b/Assets/Map/Blender/MapsModelsImporter/map-fggisoa.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b0c4bb5983488a438c06d5e35e09d2b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Map/Blender/MapsModelsImporter/map2-hws3u1q.meta b/Assets/Map/Blender/MapsModelsImporter/map2-hws3u1q.meta new file mode 100644 index 00000000..f43ed4aa --- /dev/null +++ b/Assets/Map/Blender/MapsModelsImporter/map2-hws3u1q.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0b4fd9f8be79d34ba1fb5abecbb4aca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta b/Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta new file mode 100644 index 00000000..4303815c --- /dev/null +++ b/Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7032d000d3add4948ae9729fff4b493a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NeoFPS/Extensions/NeoFpsExtension_InputSystem_v1.unitypackage.meta b/Assets/NeoFPS/Extensions/NeoFpsExtension_InputSystem_v1.unitypackage.meta new file mode 100644 index 00000000..34279aa4 --- /dev/null +++ b/Assets/NeoFPS/Extensions/NeoFpsExtension_InputSystem_v1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9bd692981c3b41e4e9c65dd7cdb03cb8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Save.meta b/Assets/Save.meta new file mode 100644 index 00000000..dc41f949 --- /dev/null +++ b/Assets/Save.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d61d18c239646e24ea7563da992aedaf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Test Scene Chris.unity b/Assets/Scenes/Test Scene Chris.unity index 82d600b1..5d916ff5 100644 --- a/Assets/Scenes/Test Scene Chris.unity +++ b/Assets/Scenes/Test Scene Chris.unity @@ -18985,6 +18985,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: hasBeenLooted: 0 + itemsHaveBeenInstantiated: 0 + itemsHaveBeenHidden: 0 prefabs: [] itemUIs: [] --- !u!82 &1216902021 @@ -29800,7 +29802,24 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: hasBeenLooted: 0 + itemsHaveBeenInstantiated: 0 + itemsHaveBeenHidden: 0 prefabs: + - {fileID: 1118060305950738, guid: d80239d41a076084ea046b27e60cbdc2, type: 3} + - {fileID: 8053794548077495502, guid: f0fbb4c62750a814c8baa4eeceba5d63, type: 3} + - {fileID: 8053794548077495502, guid: f0fbb4c62750a814c8baa4eeceba5d63, type: 3} + - {fileID: 8053794548077495502, guid: f0fbb4c62750a814c8baa4eeceba5d63, type: 3} + - {fileID: 8053794548077495502, guid: f0fbb4c62750a814c8baa4eeceba5d63, type: 3} + - {fileID: 8053794548077495502, guid: e9b8f0343c36d26428676aabf242e7a8, type: 3} + - {fileID: 1150301423181574, guid: 20873817cc3f7fe4288964d76bdb466a, type: 3} + - {fileID: 1916028363477544, guid: fa9977b69f980364989f85633bee4aa6, type: 3} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} - {fileID: 0} - {fileID: 0} - {fileID: 0} diff --git a/Assets/Scenes/Test Scene Tony.unity.meta b/Assets/Scenes/Test Scene Tony.unity.meta index fc0e432c..7c12ff41 100644 --- a/Assets/Scenes/Test Scene Tony.unity.meta +++ b/Assets/Scenes/Test Scene Tony.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Scenes/Test Scene Tony.unity.meta -guid: 84e7ae53e32c42d44b04a8512ca3969f +guid: e60e217ed02bf7347862d7d2e99ee286 ======== guid: 5c741c4d068619344a3e34e1a352d64b folderAsset: yes diff --git a/Assets/Standard Assets/Asset Store Downloads/Basic Motions/Basic Motions Pack/Models.meta b/Assets/Standard Assets/Asset Store Downloads/Basic Motions/Basic Motions Pack/Models.meta new file mode 100644 index 00000000..d864551f --- /dev/null +++ b/Assets/Standard Assets/Asset Store Downloads/Basic Motions/Basic Motions Pack/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c310a300a0358f94f81e0eeb585d6cf4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: