diff --git a/Assets/Inventory System/Assets/Icons/$temp.meta b/Assets/Inventory System/Assets/Icons/$temp.meta deleted file mode 100644 index b8110f32..00000000 --- a/Assets/Inventory System/Assets/Icons/$temp.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5c741c4d068619344a3e34e1a352d64b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Ammo Crafting.meta b/Assets/Inventory System/Prefabs/Item UI/Ammo Crafting.meta index 473f8e7d..3eaa4117 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Ammo Crafting.meta +++ b/Assets/Inventory System/Prefabs/Item UI/Ammo Crafting.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1f77eb24b6d4f8542a889a3b4255857c +guid: cf68ab2e51ec55445b129f8972ea6c92 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Inventory System/Prefabs/Item UI/Consumables.meta b/Assets/Inventory System/Prefabs/Item UI/Consumables.meta deleted file mode 100644 index 15352ab8..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Consumables.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 18906e0d14b4849448eb63ddd09e4f5f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Crafting Barter.meta b/Assets/Inventory System/Prefabs/Item UI/Crafting Barter.meta index 1c5ed496..7c0efec9 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Crafting Barter.meta +++ b/Assets/Inventory System/Prefabs/Item UI/Crafting Barter.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f8b68b123a4282459d0c35ccbc00a4a +guid: 4804f85357862fd4ca017089f4f2ffa9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Oil UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Oil UI.prefab index 02919cc9..759bda8d 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Oil UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Oil UI.prefab @@ -146,6 +146,7 @@ GameObject: - component: {fileID: 8715477175483360843} - component: {fileID: 47521878755422833} - component: {fileID: 2245991356252128075} + - component: {fileID: 6376190749716118047} m_Layer: 5 m_Name: Oil UI m_TagString: Untagged @@ -264,6 +265,20 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6376190749716118047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8715477175483360852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec4b16f08baaf5648a7e5ebe9e562069, type: 3} + m_Name: + m_EditorClassIdentifier: + textMeshProUGUI: {fileID: 6424707260248899052} + value: --- !u!1 &8715477176133586259 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/3_Day_Pack_5x6.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/3_Day_Pack_5x6.prefab index 7ff508a7..04e657e1 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/3_Day_Pack_5x6.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/3_Day_Pack_5x6.prefab @@ -34,6 +34,7 @@ RectTransform: - {fileID: 5026386302601682578} - {fileID: 1965388548171931476} - {fileID: 8715477176133586256} + - {fileID: 7670265204489671659} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1230,6 +1231,131 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2908037560868684885} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4958541595218167521 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8715477175483360853} + m_Modifications: + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6284063249306081589, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Name + value: Border + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9ec475d21131b48bbd9f90db858c68, type: 3} +--- !u!224 &7670265204489671659 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + m_PrefabInstance: {fileID: 4958541595218167521} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8282785704970028736 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Assault_Backpack_5x7.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Assault_Backpack_5x7.prefab index a6401542..c1e29b03 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Assault_Backpack_5x7.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Assault_Backpack_5x7.prefab @@ -34,6 +34,7 @@ RectTransform: - {fileID: 7616123581741202342} - {fileID: 1775188519605083184} - {fileID: 8715477176133586256} + - {fileID: 8062354132661481494} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1380,6 +1381,131 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 300557536410263905} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4702103814611641628 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8715477175483360853} + m_Modifications: + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6284063249306081589, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Name + value: Border + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9ec475d21131b48bbd9f90db858c68, type: 3} +--- !u!224 &8062354132661481494 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + m_PrefabInstance: {fileID: 4702103814611641628} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8148866894027097508 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Backpack_4x5.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Backpack_4x5.prefab index 97eadb21..d9524429 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Backpack_4x5.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Backpack_4x5.prefab @@ -34,6 +34,7 @@ RectTransform: - {fileID: 7664962644291540312} - {fileID: 2199334300289597590} - {fileID: 8715477176133586256} + - {fileID: 8979874229982603536} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -205,6 +206,131 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &5925869420354419738 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8715477175483360853} + m_Modifications: + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6284063249306081589, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Name + value: Border + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9ec475d21131b48bbd9f90db858c68, type: 3} +--- !u!224 &8979874229982603536 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + m_PrefabInstance: {fileID: 5925869420354419738} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7728438512005464791 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Battlepack_5x5.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Battlepack_5x5.prefab index a0d737a9..b29da122 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Battlepack_5x5.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Battlepack_5x5.prefab @@ -34,6 +34,7 @@ RectTransform: - {fileID: 1015048471988367725} - {fileID: 6804902031997364659} - {fileID: 8715477176133586256} + - {fileID: 367740344183565170} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1080,6 +1081,131 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1083584369421018850} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3150407829466857080 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8715477175483360853} + m_Modifications: + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6284063249306081589, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Name + value: Border + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9ec475d21131b48bbd9f90db858c68, type: 3} +--- !u!224 &367740344183565170 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + m_PrefabInstance: {fileID: 3150407829466857080} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4025080717662613543 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Mini_Backpack_4x4.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Mini_Backpack_4x4.prefab index 6bdb6f08..0ddff97a 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Mini_Backpack_4x4.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Mini_Backpack_4x4.prefab @@ -34,6 +34,7 @@ RectTransform: - {fileID: 4706156554331657003} - {fileID: 2951973147374790251} - {fileID: 8715477176133586256} + - {fileID: 3991279311555812182} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -205,6 +206,131 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &1856003925631127132 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8715477175483360853} + m_Modifications: + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6284063249306081589, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Name + value: Border + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9ec475d21131b48bbd9f90db858c68, type: 3} +--- !u!224 &3991279311555812182 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + m_PrefabInstance: {fileID: 1856003925631127132} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4634247415388079268 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Mini_Bag_4x3.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Mini_Bag_4x3.prefab index 94c636a2..eaab4926 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Mini_Bag_4x3.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Mini_Bag_4x3.prefab @@ -34,6 +34,7 @@ RectTransform: - {fileID: 2291742169139417640} - {fileID: 2469719015722690127} - {fileID: 8715477176133586256} + - {fileID: 7513786693892868152} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -690,6 +691,131 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2220943494795265447} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5108300165653306674 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8715477175483360853} + m_Modifications: + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6284063249306081589, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Name + value: Border + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9ec475d21131b48bbd9f90db858c68, type: 3} +--- !u!224 &7513786693892868152 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + m_PrefabInstance: {fileID: 5108300165653306674} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5472471210462363611 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Raid_Backpack_5x8.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Raid_Backpack_5x8.prefab index 0ddd8b9a..1cf1fed3 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Raid_Backpack_5x8.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Raid_Backpack_5x8.prefab @@ -108,6 +108,7 @@ RectTransform: - {fileID: 4023213652779627234} - {fileID: 1399803287079128932} - {fileID: 8715477176133586256} + - {fileID: 2839574668296663180} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -279,6 +280,131 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &705434299554997638 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8715477175483360853} + m_Modifications: + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6284063249306081589, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Name + value: Border + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9ec475d21131b48bbd9f90db858c68, type: 3} +--- !u!224 &2839574668296663180 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + m_PrefabInstance: {fileID: 705434299554997638} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1315644396212255917 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta deleted file mode 100644 index 7f808b94..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 035f1fba..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Plates.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 002278f8..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Foregrips.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 2d03a8f8..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Magazines.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 65e5415e..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Muzzle Devices.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 26f5227a..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Optics.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 8bc01d96..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Handguards.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 16729a39..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Pistol Grips.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 21eedbcf..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Stocks.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 6c552549..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Barrels.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index f606656e..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Handguards.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 4ca51258..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Pistol Grips.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 9f78c7aa..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Stocks.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 9ac18ac5..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Guns/G22.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 427cdf0a..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Medicine.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index bfe239c5..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Other.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8170ea60c9a2c714d870372fb89c306f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Sample ItemUI.prefab b/Assets/Inventory System/Prefabs/Item UI/Sample ItemUI.prefab index d41dd234..802498e5 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Sample ItemUI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Sample ItemUI.prefab @@ -331,6 +331,7 @@ RectTransform: - {fileID: 2562044338245339591} - {fileID: 4108165898887594765} - {fileID: 6562613965662162004} + - {fileID: 5912384438625887551} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -407,6 +408,8 @@ MonoBehaviour: StackLimit: 1 width: 2 height: 2 + weight: 0 + monetaryValue: 0 containerUIPrefab: {fileID: 0} backdropImage: {fileID: 7171308962330458650} emptyGridContainer: {fileID: 6562613965662162004} @@ -419,10 +422,12 @@ MonoBehaviour: canvas: {fileID: 0} PickedUpOnFrame: 0 ContextWindows: [] + StorageWindow: {fileID: 0} IsLinkedSlotClone: 0 limitStackSlotCapacity: {fileID: 0} pickUp: {fileID: 0} targetAttachment: {fileID: 0} + Inventory: {fileID: 0} --- !u!1 &8466052309901713054 GameObject: m_ObjectHideFlags: 0 @@ -848,3 +853,128 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &8984404789081731125 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6994269324057480138} + m_Modifications: + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6284063249306081589, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Name + value: Border + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9ec475d21131b48bbd9f90db858c68, type: 3} +--- !u!224 &5912384438625887551 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + m_PrefabInstance: {fileID: 8984404789081731125} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Inventory System/Prefabs/Item UI/TEMPLATE_ItemUI.prefab b/Assets/Inventory System/Prefabs/Item UI/TEMPLATE_ItemUI.prefab index 342beb32..e31fe727 100644 --- a/Assets/Inventory System/Prefabs/Item UI/TEMPLATE_ItemUI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/TEMPLATE_ItemUI.prefab @@ -34,6 +34,7 @@ RectTransform: - {fileID: 1491862847934857702} - {fileID: 4008412058978157412} - {fileID: 8715477176133586256} + - {fileID: 7984746941022182678} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -61,6 +62,8 @@ MonoBehaviour: StackLimit: 1 width: 1 height: 1 + weight: 0 + monetaryValue: 0 containerUIPrefab: {fileID: 4961555904879958529, guid: f3425cbf277fef64da5cb7046be46b55, type: 3} backdropImage: {fileID: 8623007654356922553} @@ -318,32 +321,32 @@ PrefabInstance: - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -37.5 objectReference: {fileID: 0} - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 75 objectReference: {fileID: 0} - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 75 objectReference: {fileID: 0} - target: {fileID: 4686011728059556148, guid: 6858ee0163bb6074ebcab8e7a1ce9582, type: 3} @@ -358,6 +361,131 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1561533354936407657} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4642511746259257372 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8715477175483360853} + m_Modifications: + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.x + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6284063249306081589, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + propertyPath: m_Name + value: Border + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9ec475d21131b48bbd9f90db858c68, type: 3} +--- !u!224 &7984746941022182678 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, + type: 3} + m_PrefabInstance: {fileID: 4642511746259257372} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6779208583214897904 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Inventory System/Prefabs/UI Elements/Border.prefab b/Assets/Inventory System/Prefabs/UI Elements/Border.prefab new file mode 100644 index 00000000..c3dff35e --- /dev/null +++ b/Assets/Inventory System/Prefabs/UI Elements/Border.prefab @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6284063249306081589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3360255829979632906} + - component: {fileID: 2425485941042523230} + - component: {fileID: 886952435392234239} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3360255829979632906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6284063249306081589} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2425485941042523230 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6284063249306081589} + m_CullTransparentMesh: 0 +--- !u!114 &886952435392234239 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6284063249306081589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e24459b8cb56b054397d141f5fb65751, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta b/Assets/Inventory System/Prefabs/UI Elements/Border.prefab.meta similarity index 63% rename from Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta rename to Assets/Inventory System/Prefabs/UI Elements/Border.prefab.meta index 4303815c..6d57375e 100644 --- a/Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta +++ b/Assets/Inventory System/Prefabs/UI Elements/Border.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 7032d000d3add4948ae9729fff4b493a -DefaultImporter: +guid: 2e9ec475d21131b48bbd9f90db858c68 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Items/Prefabs/Consumables.meta b/Assets/Items/Prefabs/Consumables.meta deleted file mode 100644 index b916c0a3..00000000 --- a/Assets/Items/Prefabs/Consumables.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index c0fe9783..00000000 --- a/Assets/Items/Prefabs/Gear/Headset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 932332605b143de408257962fa7ff175 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Items/Prefabs/Other.meta b/Assets/Items/Prefabs/Other.meta deleted file mode 100644 index addf3cdd..00000000 --- a/Assets/Items/Prefabs/Other.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 4f03d758..00000000 --- a/Assets/Map/Blender/MapsModelsImporter/map-0d1klcr.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 7a683e10..00000000 --- a/Assets/Map/Blender/MapsModelsImporter/map-fggisoa.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index f43ed4aa..00000000 --- a/Assets/Map/Blender/MapsModelsImporter/map2-hws3u1q.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f0b4fd9f8be79d34ba1fb5abecbb4aca -folderAsset: yes -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 deleted file mode 100644 index 34279aa4..00000000 --- a/Assets/NeoFPS/Extensions/NeoFpsExtension_InputSystem_v1.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9bd692981c3b41e4e9c65dd7cdb03cb8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Save.meta b/Assets/Save.meta deleted file mode 100644 index dc41f949..00000000 --- a/Assets/Save.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d61d18c239646e24ea7563da992aedaf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: 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 deleted file mode 100644 index d864551f..00000000 --- a/Assets/Standard Assets/Asset Store Downloads/Basic Motions/Basic Motions Pack/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c310a300a0358f94f81e0eeb585d6cf4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: