From 8b901504ab8b9b84110f200b4e3d2fb9420e1dbf Mon Sep 17 00:00:00 2001 From: OceanSlim Date: Fri, 17 Mar 2023 22:36:33 -0400 Subject: [PATCH] small changes --- .../Prefabs/Inventory System.prefab | 10 +++++----- .../Prefabs/Item UI/Gear/Gun Attachments.meta | 8 ++++++++ .../Gear/Gun Attachments/Foregrips.meta | 8 ++++++++ .../Gear/Gun Attachments/Magazines.meta | 8 ++++++++ .../Gear/Gun Attachments/Muzzle Devices.meta | 8 ++++++++ .../Item UI/Gear/Gun Attachments/Optics.meta | 8 ++++++++ .../Multi Mission Plate Carrier UI.prefab | 4 ++-- .../Gear/Tactical Rigs/Belt Rig UI.prefab | 4 ++-- .../Gear/Tactical Rigs/Chest Rig UI.prefab | 4 ++-- .../Tactical Rigs/Heavy Chest Rig UI.prefab | 4 ++-- .../Gear/Tactical Rigs/Heavy Vest UI.prefab | 4 ++-- .../Tactical Rigs/High Capacity Rig UI.prefab | 4 ++-- .../Gear/Tactical Rigs/Hunting Vest UI.prefab | 8 ++++---- .../Tactical Rigs/Load Bearing Rig UI.prefab | 4 ++-- .../Tactical Rigs/Micro Chest Rig UI.prefab | 4 ++-- .../Minimalist Harness UI.prefab | 4 ++-- Assets/Scenes/Test Scene Chris.unity | 20 ++++++++++++++----- 17 files changed, 82 insertions(+), 32 deletions(-) create mode 100644 Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments.meta create mode 100644 Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Foregrips.meta create mode 100644 Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Magazines.meta create mode 100644 Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Muzzle Devices.meta create mode 100644 Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Optics.meta diff --git a/Assets/Inventory System/Prefabs/Inventory System.prefab b/Assets/Inventory System/Prefabs/Inventory System.prefab index 2c5c659b..a506aee7 100644 --- a/Assets/Inventory System/Prefabs/Inventory System.prefab +++ b/Assets/Inventory System/Prefabs/Inventory System.prefab @@ -684,7 +684,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1165938063523323413} m_HandleRect: {fileID: 2233503621217788993} m_Direction: 0 - m_Value: 0.00000086234917 + m_Value: 0.0000009581657 m_Size: 0.47786885 m_NumberOfSteps: 0 m_OnValueChanged: @@ -897,7 +897,7 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 75 m_Viewport: {fileID: 4086661973484093150} m_HorizontalScrollbar: {fileID: 51727583602948897} m_VerticalScrollbar: {fileID: 3684466523276116297} @@ -8293,7 +8293,7 @@ MonoBehaviour: m_HandleRect: {fileID: 2770326605532365201} m_Direction: 0 m_Value: 0 - m_Size: 0.99999994 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -12751,7 +12751,7 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 25 + m_ScrollSensitivity: 75 m_Viewport: {fileID: 2770326606707198991} m_HorizontalScrollbar: {fileID: 2770326605669370232} m_VerticalScrollbar: {fileID: 2770326606805154120} @@ -19200,7 +19200,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 8873855520739210168} m_HandleRect: {fileID: 52681282418728116} m_Direction: 2 - m_Value: 1.0000002 + m_Value: 1.0000006 m_Size: 0.6525 m_NumberOfSteps: 0 m_OnValueChanged: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments.meta new file mode 100644 index 00000000..e86d3b41 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 183eed49c46610f4480e1fc76b3ffae5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Foregrips.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Foregrips.meta new file mode 100644 index 00000000..57122dcc --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Foregrips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a642bf0a33311a4c80ac8379cae7684 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Magazines.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Magazines.meta new file mode 100644 index 00000000..27037639 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Magazines.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d0cda18af15aae468f87fe0f86fc466 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Muzzle Devices.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Muzzle Devices.meta new file mode 100644 index 00000000..657d26cc --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Muzzle Devices.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2943919ce44692d4c95c6d63c910e349 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Optics.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Optics.meta new file mode 100644 index 00000000..5afc5d92 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Optics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02b4de7a2e9e6494f855610cfdc896a6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Plate Carriers/Multi Mission Plate Carrier UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Plate Carriers/Multi Mission Plate Carrier UI.prefab index 2c41fa26..4343f7ba 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Plate Carriers/Multi Mission Plate Carrier UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Plate Carriers/Multi Mission Plate Carrier UI.prefab @@ -120,13 +120,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b6202942353da9e41a594e4634086deb, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Belt Rig UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Belt Rig UI.prefab index 28b82dd8..5952b349 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Belt Rig UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Belt Rig UI.prefab @@ -120,13 +120,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b47dd777d3ae7dd4e9077610b7efc076, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Chest Rig UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Chest Rig UI.prefab index 6cc394cd..57231900 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Chest Rig UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Chest Rig UI.prefab @@ -120,13 +120,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f8156b803f9da3942be32e89da51cd82, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Heavy Chest Rig UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Heavy Chest Rig UI.prefab index 3163d3cc..1540bbca 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Heavy Chest Rig UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Heavy Chest Rig UI.prefab @@ -120,13 +120,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7e6ed147a394a284b80781b90dc3278f, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Heavy Vest UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Heavy Vest UI.prefab index f5d7ad34..471076e7 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Heavy Vest UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Heavy Vest UI.prefab @@ -119,13 +119,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4abfc2bbb8e255044b329facef0f669b, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/High Capacity Rig UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/High Capacity Rig UI.prefab index 6e703fe9..fcc90996 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/High Capacity Rig UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/High Capacity Rig UI.prefab @@ -120,13 +120,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3cb6925eecceb0542a798dbf4efc77ea, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Hunting Vest UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Hunting Vest UI.prefab index d92e9f26..b7cdd7cc 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Hunting Vest UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Hunting Vest UI.prefab @@ -120,14 +120,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -309,7 +309,7 @@ PrefabInstance: - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, type: 3} propertyPath: m_SizeDelta.y - value: 25 + value: 225 objectReference: {fileID: 0} - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, type: 3} diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Load Bearing Rig UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Load Bearing Rig UI.prefab index ea5f9aa0..54fba8b6 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Load Bearing Rig UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Load Bearing Rig UI.prefab @@ -120,13 +120,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 675507ce9bfd14942a4d005b93020a55, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Micro Chest Rig UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Micro Chest Rig UI.prefab index 6d14e1ea..754996ac 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Micro Chest Rig UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Micro Chest Rig UI.prefab @@ -120,13 +120,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4d7bef859ab9a1b4692a170abb5541c0, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Minimalist Harness UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Minimalist Harness UI.prefab index 159eb208..803c2298 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Minimalist Harness UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Minimalist Harness UI.prefab @@ -120,13 +120,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0ea04d9703ad8c648aae120d87fc5093, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scenes/Test Scene Chris.unity b/Assets/Scenes/Test Scene Chris.unity index ef11dfe4..0d5f8101 100644 --- a/Assets/Scenes/Test Scene Chris.unity +++ b/Assets/Scenes/Test Scene Chris.unity @@ -43938,12 +43938,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: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} @@ -44028,17 +44028,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} @@ -44160,6 +44160,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606164476906, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_ScrollSensitivity + value: 75 + objectReference: {fileID: 0} - target: {fileID: 2770326606255359851, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -44595,6 +44600,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7264834851934661000, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_ScrollSensitivity + value: 75 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} --- !u!64 &3968453558880047856