From f1453a6f99352d5184199d29b1e783f4163372da Mon Sep 17 00:00:00 2001 From: tonyomendoza Date: Mon, 13 Feb 2023 14:15:10 -0800 Subject: [PATCH] Fixed bug with Storage Window: click through --- .../Prefabs/Item UI/Consumables.meta | 8 - .../Prefabs/Item UI/Gear/Headset.meta | 8 - .../Item UI/Gun Attachments/Foregrips.meta | 8 - .../Item UI/Gun Attachments/Magazines.meta | 8 - .../Gun Attachments/Muzzle Devices.meta | 8 - .../Item UI/Gun Attachments/Optics.meta | 8 - .../Item UI/Guns/AK Platform/Handguards.meta | 8 - .../Guns/AK Platform/Pistol Grips.meta | 8 - .../Item UI/Guns/AK Platform/Stocks.meta | 8 - .../Item UI/Guns/AR Platform/Barrels.meta | 8 - .../Item UI/Guns/AR Platform/Handguards.meta | 8 - .../Guns/AR Platform/Pistol Grips.meta | 8 - .../Item UI/Guns/AR Platform/Stocks.meta | 8 - .../Prefabs/Item UI/Guns/G22.meta | 8 - .../Prefabs/Item UI/Other.meta | 8 - .../Prefabs/UI Windows/Storage Window.prefab | 503 +++++++++--------- .../Scripts/Inventory/InventorySystem.cs | 9 +- .../Scripts/UI/BlockRaycast.cs | 18 + .../Scripts/UI/BlockRaycast.cs.meta | 11 + Assets/Inventory System/Scripts/UI/ItemUI.cs | 23 +- Assets/Items/$Prefabs/Consumables.meta | 8 - Assets/Items/$Prefabs/Gear/Headset.meta | 8 - Assets/Items/$Prefabs/Other.meta | 8 - .../MapsModelsImporter/map-0d1klcr.meta | 8 - .../MapsModelsImporter/map-fggisoa.meta | 8 - .../MapsModelsImporter/map2-hws3u1q.meta | 8 - ...Extension_Cinemachine_v1.unitypackage.meta | 7 - ...Extension_InputSystem_v1.unitypackage.meta | 7 - Assets/Save.meta | 8 - Assets/Scenes/Test Scene Tony.unity | 445 ++++++++++++++-- .../Basic Motions Pack/Models.meta | 8 - 31 files changed, 709 insertions(+), 498 deletions(-) delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Consumables.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Foregrips.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Magazines.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Muzzle Devices.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Optics.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Handguards.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Pistol Grips.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Stocks.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Barrels.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Handguards.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Pistol Grips.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Stocks.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Guns/G22.meta delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Other.meta create mode 100644 Assets/Inventory System/Scripts/UI/BlockRaycast.cs create mode 100644 Assets/Inventory System/Scripts/UI/BlockRaycast.cs.meta delete mode 100644 Assets/Items/$Prefabs/Consumables.meta delete mode 100644 Assets/Items/$Prefabs/Gear/Headset.meta delete mode 100644 Assets/Items/$Prefabs/Other.meta delete mode 100644 Assets/Map/Blender/MapsModelsImporter/map-0d1klcr.meta delete mode 100644 Assets/Map/Blender/MapsModelsImporter/map-fggisoa.meta delete mode 100644 Assets/Map/Blender/MapsModelsImporter/map2-hws3u1q.meta delete mode 100644 Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta delete mode 100644 Assets/NeoFPS/Extensions/NeoFpsExtension_InputSystem_v1.unitypackage.meta delete mode 100644 Assets/Save.meta delete mode 100644 Assets/Standard Assets/Asset Store Downloads/Basic Motions/Basic Motions Pack/Models.meta 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/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/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/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/UI Windows/Storage Window.prefab b/Assets/Inventory System/Prefabs/UI Windows/Storage Window.prefab index 1034ee02..0d00af22 100644 --- a/Assets/Inventory System/Prefabs/UI Windows/Storage Window.prefab +++ b/Assets/Inventory System/Prefabs/UI Windows/Storage Window.prefab @@ -276,6 +276,7 @@ GameObject: - component: {fileID: 4417106255924003216} - component: {fileID: 4417106255924003219} - component: {fileID: 3792222715588787966} + - component: {fileID: 9131793476022473716} m_Layer: 5 m_Name: Storage Window m_TagString: Untagged @@ -325,7 +326,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} + m_Color: {r: 1, g: 0, b: 0, a: 0.78431374} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -356,6 +357,18 @@ MonoBehaviour: StorageContainer: {fileID: 4417106257405200098} itemUI: {fileID: 0} dragWindowUI: {fileID: 4417106256859116618} +--- !u!114 &9131793476022473716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4417106255924003221} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4417106256853968310 GameObject: m_ObjectHideFlags: 0 @@ -814,422 +827,422 @@ PrefabInstance: - target: {fileID: 178634135328337995, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 178634135328337995, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 178634135328337995, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 178634135328337995, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -412.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 178634135328337995, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 178634135328337995, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 389610612508398720, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 389610612508398720, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 389610612508398720, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 389610612508398720, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 389610612508398720, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 389610612508398720, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 777276034094796963, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 777276034094796963, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 777276034094796963, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 777276034094796963, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 777276034094796963, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 777276034094796963, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 779793384197759545, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 779793384197759545, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 779793384197759545, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 779793384197759545, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -562.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 779793384197759545, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 779793384197759545, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 871683502128403812, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 871683502128403812, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 871683502128403812, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 871683502128403812, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -487.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 871683502128403812, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 871683502128403812, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163962740171814032, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163962740171814032, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163962740171814032, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163962740171814032, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -412.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163962740171814032, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163962740171814032, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1296283072648602026, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1296283072648602026, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1296283072648602026, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1296283072648602026, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1296283072648602026, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1296283072648602026, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1310235884245913703, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1310235884245913703, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1310235884245913703, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1310235884245913703, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1310235884245913703, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1310235884245913703, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1365946678165312095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1365946678165312095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1365946678165312095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1365946678165312095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1365946678165312095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1365946678165312095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1852199261173386448, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1852199261173386448, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1852199261173386448, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1852199261173386448, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1852199261173386448, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1852199261173386448, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2191848398620657406, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2191848398620657406, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2191848398620657406, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2191848398620657406, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2191848398620657406, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2191848398620657406, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2304921691083849905, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2304921691083849905, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2304921691083849905, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2304921691083849905, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2304921691083849905, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2304921691083849905, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2397301153360339959, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2397301153360339959, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2397301153360339959, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2397301153360339959, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2397301153360339959, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2397301153360339959, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2664190022094426019, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2664190022094426019, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2664190022094426019, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2664190022094426019, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -562.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2664190022094426019, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2664190022094426019, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2708712984969514575, guid: ee00e230c852cd64f93d347378eccd87, type: 3} @@ -1339,212 +1352,212 @@ PrefabInstance: - target: {fileID: 2724280277744432212, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2724280277744432212, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2724280277744432212, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2724280277744432212, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -412.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2724280277744432212, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2724280277744432212, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2773543562101396160, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2773543562101396160, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2773543562101396160, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2773543562101396160, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2773543562101396160, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2773543562101396160, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2920329822942689982, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2920329822942689982, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2920329822942689982, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2920329822942689982, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2920329822942689982, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2920329822942689982, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3063496803861842746, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3063496803861842746, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3063496803861842746, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3063496803861842746, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -487.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3063496803861842746, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3063496803861842746, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124926758718665427, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124926758718665427, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124926758718665427, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124926758718665427, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -487.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124926758718665427, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124926758718665427, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3619471971749963798, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3619471971749963798, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3619471971749963798, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3619471971749963798, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -487.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3619471971749963798, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3619471971749963798, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3812570085307612496, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3812570085307612496, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3812570085307612496, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3812570085307612496, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -562.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3812570085307612496, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3812570085307612496, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3908357204979535327, guid: ee00e230c852cd64f93d347378eccd87, type: 3} @@ -1554,577 +1567,577 @@ PrefabInstance: - target: {fileID: 3908357204979535327, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3986777078439205644, guid: ee00e230c852cd64f93d347378eccd87, + type: 3} + propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3986777078439205644, guid: ee00e230c852cd64f93d347378eccd87, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3986777078439205644, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3986777078439205644, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3986777078439205644, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3986777078439205644, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3986777078439205644, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4365781328607049098, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4365781328607049098, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4365781328607049098, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4365781328607049098, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4365781328607049098, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4365781328607049098, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4856591222135111136, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4856591222135111136, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4856591222135111136, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4856591222135111136, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4856591222135111136, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4856591222135111136, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4909354492968754658, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4909354492968754658, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4909354492968754658, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4909354492968754658, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4909354492968754658, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4909354492968754658, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4946537444301188980, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4946537444301188980, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4946537444301188980, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4946537444301188980, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4946537444301188980, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4946537444301188980, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5273847145825710039, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5273847145825710039, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5273847145825710039, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5273847145825710039, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -487.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5273847145825710039, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5273847145825710039, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5523410674477535326, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5523410674477535326, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5523410674477535326, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5523410674477535326, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -412.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5523410674477535326, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5523410674477535326, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5676116169552408502, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5676116169552408502, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5676116169552408502, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5676116169552408502, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5676116169552408502, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5676116169552408502, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5728818116594554940, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5728818116594554940, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5728818116594554940, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5728818116594554940, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5728818116594554940, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5728818116594554940, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5833133267874086894, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5833133267874086894, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5833133267874086894, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5833133267874086894, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5833133267874086894, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5833133267874086894, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5880742281047425553, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5880742281047425553, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5880742281047425553, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5880742281047425553, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5880742281047425553, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5880742281047425553, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6070511343368306804, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6070511343368306804, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6070511343368306804, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6070511343368306804, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -412.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6070511343368306804, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6070511343368306804, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6646436913057222099, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6646436913057222099, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6646436913057222099, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6646436913057222099, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6646436913057222099, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6646436913057222099, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7104811017625151950, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7104811017625151950, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7104811017625151950, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7104811017625151950, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -262.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7104811017625151950, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7104811017625151950, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7353329372363136192, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7353329372363136192, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7353329372363136192, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7353329372363136192, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -562.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7353329372363136192, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7353329372363136192, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7680581248335964625, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7680581248335964625, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7680581248335964625, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 187.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7680581248335964625, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7680581248335964625, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7680581248335964625, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8393152194412375243, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8393152194412375243, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8393152194412375243, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8393152194412375243, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8393152194412375243, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8393152194412375243, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509733312379002095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509733312379002095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509733312379002095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509733312379002095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -337.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509733312379002095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509733312379002095, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9075799964108960865, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9075799964108960865, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9075799964108960865, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.x - value: 112.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9075799964108960865, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_AnchoredPosition.y - value: -562.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9075799964108960865, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.x - value: 75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9075799964108960865, guid: ee00e230c852cd64f93d347378eccd87, type: 3} propertyPath: m_SizeDelta.y - value: 75 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee00e230c852cd64f93d347378eccd87, type: 3} diff --git a/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs b/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs index 82e8d0ab..060fc24a 100644 --- a/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs +++ b/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs @@ -292,6 +292,7 @@ namespace SimpleInventorySystem public GameObject StorageWindowPrefab; public Transform DefaultItemSpawn; [HideInInspector] public bool IsDraggingItem; + public List hResults; public enum States { Undefined, Loot, PickUp }; public States CurrentState = States.Undefined; @@ -414,7 +415,7 @@ namespace SimpleInventorySystem } } - hoverResults = GetPointerOverUIObject(); + hResults= hoverResults = GetPointerOverUIObject(); } private List GetPointerOverUIObject() @@ -456,8 +457,14 @@ namespace SimpleInventorySystem } foreach(GameObject go in hoverResults) { + if(go.GetComponent() != null) + { + Debug.Log("BlockRaycast"); + return false; + } if(go.GetComponent() != null) { + Debug.Log(hoverResults); if (go.GetComponent() == item) return true; else diff --git a/Assets/Inventory System/Scripts/UI/BlockRaycast.cs b/Assets/Inventory System/Scripts/UI/BlockRaycast.cs new file mode 100644 index 00000000..6f026cb6 --- /dev/null +++ b/Assets/Inventory System/Scripts/UI/BlockRaycast.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BlockRaycast : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Inventory System/Scripts/UI/BlockRaycast.cs.meta b/Assets/Inventory System/Scripts/UI/BlockRaycast.cs.meta new file mode 100644 index 00000000..298e2b7d --- /dev/null +++ b/Assets/Inventory System/Scripts/UI/BlockRaycast.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f47e497dfc27e9947bc9e6a360f5d2dd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Scripts/UI/ItemUI.cs b/Assets/Inventory System/Scripts/UI/ItemUI.cs index 08b19d8b..cf037f52 100644 --- a/Assets/Inventory System/Scripts/UI/ItemUI.cs +++ b/Assets/Inventory System/Scripts/UI/ItemUI.cs @@ -215,14 +215,6 @@ namespace SimpleInventorySystem return slot; } - public void OnBeginDrag(PointerEventData eventData) - { - } - - public void OnDrag(PointerEventData eventData) - { - } - public void OnEndDrag(PointerEventData eventData) { //rectTransform.localPosition = new Vector3(0, 0); @@ -706,10 +698,14 @@ namespace SimpleInventorySystem { if (Input.GetMouseButtonDown(0) && !isDragging && InventorySystem.instance.DraggedItem == null && !slot.DroppedOnFrame) { + Debug.Log("Grab and drag"); GrabAndDragItem(); } - - if (Input.GetMouseButtonDown(1) && !InventorySystem.instance.IsDraggingItem) + else if (Input.GetMouseButtonDown(2)) + { + ShowStorageWindow(); + } + else if (Input.GetMouseButtonDown(1) && !InventorySystem.instance.IsDraggingItem) { InventorySystem.instance.OpenContextMenu(this); } @@ -764,13 +760,6 @@ namespace SimpleInventorySystem } } } - else - { - if (PointerIsHoveredOver && Input.GetMouseButtonDown(2)) - { - ShowStorageWindow(); - } - } } public void ShowStorageWindow() 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_Cinemachine_v1.unitypackage.meta b/Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta deleted file mode 100644 index 4303815c..00000000 --- a/Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 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/Scenes/Test Scene Tony.unity b/Assets/Scenes/Test Scene Tony.unity index 73cb7c09..6af8f572 100644 --- a/Assets/Scenes/Test Scene Tony.unity +++ b/Assets/Scenes/Test Scene Tony.unity @@ -2430,7 +2430,7 @@ Transform: m_Children: - {fileID: 1827148514} m_Father: {fileID: 896911593} - m_RootOrder: 45 + m_RootOrder: 46 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &147581201 PrefabInstance: @@ -2540,7 +2540,7 @@ Transform: m_Children: - {fileID: 577706698} m_Father: {fileID: 1543407502} - m_RootOrder: 60 + m_RootOrder: 64 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &152712156 stripped Rigidbody: @@ -5171,18 +5171,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 421f12c4cc2c4614f9e0616ef942cf44, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &236675543 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4462357582487606, guid: e3c3fc737aaecec47998dbddc1dc85f6, - type: 3} - m_PrefabInstance: {fileID: 752842957} - m_PrefabAsset: {fileID: 0} ---- !u!54 &236675544 stripped +--- !u!54 &236675544 Rigidbody: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 54694976647650114, guid: e3c3fc737aaecec47998dbddc1dc85f6, type: 3} m_PrefabInstance: {fileID: 752842957} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080500731} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &239185982 GameObject: m_ObjectHideFlags: 0 @@ -10147,7 +10152,7 @@ Transform: m_Children: - {fileID: 825909253} m_Father: {fileID: 896911593} - m_RootOrder: 48 + m_RootOrder: 49 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &478349765 PrefabInstance: @@ -10437,12 +10442,23 @@ Transform: type: 3} m_PrefabInstance: {fileID: 485058209} m_PrefabAsset: {fileID: 0} ---- !u!54 &493699447 stripped +--- !u!54 &493699447 Rigidbody: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 54694976647650114, guid: e3c3fc737aaecec47998dbddc1dc85f6, type: 3} m_PrefabInstance: {fileID: 1575759680} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260416192} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &502088768 PrefabInstance: m_ObjectHideFlags: 0 @@ -10628,7 +10644,7 @@ Transform: m_Children: - {fileID: 1858303648} m_Father: {fileID: 896911593} - m_RootOrder: 56 + m_RootOrder: 57 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &511873482 stripped Transform: @@ -14403,7 +14419,7 @@ Transform: m_Children: - {fileID: 1868654628} m_Father: {fileID: 896911593} - m_RootOrder: 55 + m_RootOrder: 56 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &723908773 PrefabInstance: @@ -17434,6 +17450,20 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3c3fc737aaecec47998dbddc1dc85f6, type: 3} +--- !u!4 &752842958 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 752842957} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1429423539} + 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: 1235512995} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &760591746 PrefabInstance: m_ObjectHideFlags: 0 @@ -19612,6 +19642,38 @@ Transform: m_Father: {fileID: 1543407502} m_RootOrder: 48 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &848824643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1575759680} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 848824644} + m_Layer: 0 + m_Name: Backpack (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &848824644 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1575759680} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 848824643} + 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: 1575759681} + - {fileID: 1260416193} + m_Father: {fileID: 1543407502} + m_RootOrder: 60 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &849794424 PrefabInstance: m_ObjectHideFlags: 0 @@ -21130,7 +21192,7 @@ Transform: m_Children: - {fileID: 1723763466} m_Father: {fileID: 896911593} - m_RootOrder: 49 + m_RootOrder: 50 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &871110459 PrefabInstance: @@ -22159,6 +22221,7 @@ Transform: - {fileID: 1937331975} - {fileID: 1458130169} - {fileID: 2100709406} + - {fileID: 1235512995} - {fileID: 146975374} - {fileID: 2144425236} - {fileID: 1238533176} @@ -22174,12 +22237,11 @@ Transform: - {fileID: 914884887} - {fileID: 1968508996} - {fileID: 1972564566} - - {fileID: 1181260133} - {fileID: 1551725618} - {fileID: 451266285} - {fileID: 1453301001} - {fileID: 1117495336} - - {fileID: 236675543} + - {fileID: 1181260133} - {fileID: 789072850} - {fileID: 1891920042} - {fileID: 333145655} @@ -22803,7 +22865,7 @@ Transform: m_Children: - {fileID: 1006786797} m_Father: {fileID: 896911593} - m_RootOrder: 57 + m_RootOrder: 58 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &915529562 PrefabInstance: @@ -26823,6 +26885,37 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 50f24670ae4142c46b36d06fea8a88d8, type: 3} +--- !u!1 &1080500731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 752842957} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1080500732} + - component: {fileID: 236675544} + 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!4 &1080500732 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 752842957} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080500731} + 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: 1235512995} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1083955393 PrefabInstance: m_ObjectHideFlags: 0 @@ -30941,7 +31034,7 @@ Transform: m_Children: - {fileID: 1466038347} m_Father: {fileID: 896911593} - m_RootOrder: 52 + m_RootOrder: 53 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1152892792 stripped Transform: @@ -31749,7 +31842,7 @@ Transform: m_Children: - {fileID: 525123086} m_Father: {fileID: 896911593} - m_RootOrder: 60 + m_RootOrder: 65 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1187474055 PrefabInstance: @@ -32320,7 +32413,7 @@ Transform: m_Children: - {fileID: 1766696291} m_Father: {fileID: 896911593} - m_RootOrder: 51 + m_RootOrder: 52 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1208310747 GameObject: @@ -32949,6 +33042,38 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1234393278} m_PrefabAsset: {fileID: 0} +--- !u!1 &1235512994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 752842957} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1235512995} + m_Layer: 0 + m_Name: Backpack (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1235512995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 752842957} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235512994} + 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: 752842958} + - {fileID: 1080500732} + m_Father: {fileID: 896911593} + m_RootOrder: 45 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1236457452 PrefabInstance: m_ObjectHideFlags: 0 @@ -33116,7 +33241,7 @@ Transform: m_Children: - {fileID: 790323254} m_Father: {fileID: 896911593} - m_RootOrder: 47 + m_RootOrder: 48 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1239567271 PrefabInstance: @@ -33364,6 +33489,37 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: afbc9b9e8f21b404cbdd2f3b19fb7620, type: 3} +--- !u!1 &1260416192 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1575759680} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1260416193} + - component: {fileID: 493699447} + 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!4 &1260416193 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1575759680} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260416192} + 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: 848824644} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1263612017 PrefabInstance: m_ObjectHideFlags: 0 @@ -37631,6 +37787,22 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1429109133} m_PrefabAsset: {fileID: 0} +--- !u!1 &1429423539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 752842957} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 752842958} + 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 &1447027985 PrefabInstance: m_ObjectHideFlags: 0 @@ -40222,11 +40394,11 @@ Transform: - {fileID: 1040389512} - {fileID: 630456241} - {fileID: 867708039} - - {fileID: 150068387} + - {fileID: 848824644} - {fileID: 1464582468} - {fileID: 224145751} - {fileID: 1128457984} - - {fileID: 1575759681} + - {fileID: 150068387} - {fileID: 1367057314} - {fileID: 2121566407} - {fileID: 1646753860} @@ -42215,12 +42387,20 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3c3fc737aaecec47998dbddc1dc85f6, type: 3} ---- !u!4 &1575759681 stripped +--- !u!4 &1575759681 Transform: - m_CorrespondingSourceObject: {fileID: 4462357582487606, guid: e3c3fc737aaecec47998dbddc1dc85f6, - type: 3} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 1575759680} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1598470842} + 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: 848824644} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1580578181 PrefabInstance: m_ObjectHideFlags: 0 @@ -42739,6 +42919,22 @@ Transform: type: 3} m_PrefabInstance: {fileID: 849794424} m_PrefabAsset: {fileID: 0} +--- !u!1 &1598470842 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1575759680} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1575759681} + 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!4 &1602372552 Transform: m_ObjectHideFlags: 0 @@ -49129,7 +49325,7 @@ Transform: m_Children: - {fileID: 1208310748} m_Father: {fileID: 896911593} - m_RootOrder: 54 + m_RootOrder: 55 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1924286665 GameObject: @@ -49841,7 +50037,7 @@ Transform: m_Children: - {fileID: 1193367205} m_Father: {fileID: 896911593} - m_RootOrder: 50 + m_RootOrder: 51 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1950903344 PrefabInstance: @@ -50397,7 +50593,7 @@ Transform: m_Children: - {fileID: 1753173232} m_Father: {fileID: 896911593} - m_RootOrder: 58 + m_RootOrder: 59 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1971328865 PrefabInstance: @@ -50503,7 +50699,7 @@ Transform: m_Children: - {fileID: 857731646} m_Father: {fileID: 896911593} - m_RootOrder: 59 + m_RootOrder: 60 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1974746329 GameObject: @@ -55829,7 +56025,7 @@ Transform: m_Children: - {fileID: 881077467} m_Father: {fileID: 896911593} - m_RootOrder: 53 + m_RootOrder: 54 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2140522442 PrefabInstance: @@ -56002,7 +56198,7 @@ Transform: m_Children: - {fileID: 1756650106} m_Father: {fileID: 896911593} - m_RootOrder: 46 + m_RootOrder: 47 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2144888369 PrefabInstance: @@ -56283,6 +56479,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326605036912737, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326605244884164, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -56493,6 +56694,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326605623600441, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326605625768898, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -56513,6 +56719,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -56616,12 +56847,12 @@ PrefabInstance: - target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2770326605844417883, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} @@ -56643,6 +56874,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -56666,17 +56922,17 @@ PrefabInstance: - target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -2500 objectReference: {fileID: 0} - target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} @@ -56703,6 +56959,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606150301029, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -56933,6 +57209,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606530529104, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -56958,6 +57254,56 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -56978,6 +57324,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y 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: