OceanSlim/projectEli
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

small changes

Browse Source
This commit is contained in:
OceanSlim 2023-03-17 22:36:33 -04:00
parent f16c738928
commit 8b901504ab
17 changed files with 82 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Inventory System/Prefabs/Inventory System.prefab
View File

@ -684,7 +684,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1165938063523323413} m_TargetGraphic: {fileID: 1165938063523323413}
m_HandleRect: {fileID: 2233503621217788993} m_HandleRect: {fileID: 2233503621217788993}
m_Direction: 0 m_Direction: 0
m_Value: 0.00000086234917 m_Value: 0.0000009581657
m_Size: 0.47786885 m_Size: 0.47786885
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
@ -897,7 +897,7 @@ MonoBehaviour:
m_Elasticity: 0.1 m_Elasticity: 0.1
m_Inertia: 1 m_Inertia: 1
m_DecelerationRate: 0.135 m_DecelerationRate: 0.135
m_ScrollSensitivity: 1 m_ScrollSensitivity: 75
m_Viewport: {fileID: 4086661973484093150} m_Viewport: {fileID: 4086661973484093150}
m_HorizontalScrollbar: {fileID: 51727583602948897} m_HorizontalScrollbar: {fileID: 51727583602948897}
m_VerticalScrollbar: {fileID: 3684466523276116297} m_VerticalScrollbar: {fileID: 3684466523276116297}
@ -8293,7 +8293,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 2770326605532365201} m_HandleRect: {fileID: 2770326605532365201}
m_Direction: 0 m_Direction: 0
m_Value: 0 m_Value: 0
m_Size: 0.99999994 m_Size: 1
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
@ -12751,7 +12751,7 @@ MonoBehaviour:
m_Elasticity: 0.1 m_Elasticity: 0.1
m_Inertia: 1 m_Inertia: 1
m_DecelerationRate: 0.135 m_DecelerationRate: 0.135
m_ScrollSensitivity: 25 m_ScrollSensitivity: 75
m_Viewport: {fileID: 2770326606707198991} m_Viewport: {fileID: 2770326606707198991}
m_HorizontalScrollbar: {fileID: 2770326605669370232} m_HorizontalScrollbar: {fileID: 2770326605669370232}
m_VerticalScrollbar: {fileID: 2770326606805154120} m_VerticalScrollbar: {fileID: 2770326606805154120}
@ -19200,7 +19200,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 8873855520739210168} m_TargetGraphic: {fileID: 8873855520739210168}
m_HandleRect: {fileID: 52681282418728116} m_HandleRect: {fileID: 52681282418728116}
m_Direction: 2 m_Direction: 2
m_Value: 1.0000002 m_Value: 1.0000006
m_Size: 0.6525 m_Size: 0.6525
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:

8
Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 183eed49c46610f4480e1fc76b3ffae5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Foregrips.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1a642bf0a33311a4c80ac8379cae7684
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Magazines.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5d0cda18af15aae468f87fe0f86fc466
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Muzzle Devices.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2943919ce44692d4c95c6d63c910e349
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Optics.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 02b4de7a2e9e6494f855610cfdc896a6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Inventory System/Prefabs/Item UI/Gear/Plate Carriers/Multi Mission Plate Carrier UI.prefab
View File

@ -120,13 +120,13 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: b6202942353da9e41a594e4634086deb, type: 3} m_Sprite: {fileID: 0}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

4
Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Belt Rig UI.prefab
View File

@ -120,13 +120,13 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: b47dd777d3ae7dd4e9077610b7efc076, type: 3} m_Sprite: {fileID: 0}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

4
Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Chest Rig UI.prefab
View File

@ -120,13 +120,13 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: f8156b803f9da3942be32e89da51cd82, type: 3} m_Sprite: {fileID: 0}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

4
Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Heavy Chest Rig UI.prefab
View File

@ -120,13 +120,13 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7e6ed147a394a284b80781b90dc3278f, type: 3} m_Sprite: {fileID: 0}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

4
Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Heavy Vest UI.prefab
View File

@ -119,13 +119,13 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 4abfc2bbb8e255044b329facef0f669b, type: 3} m_Sprite: {fileID: 0}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

4
Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/High Capacity Rig UI.prefab
View File

@ -120,13 +120,13 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3cb6925eecceb0542a798dbf4efc77ea, type: 3} m_Sprite: {fileID: 0}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

8
Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Hunting Vest UI.prefab
View File

@ -120,14 +120,14 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 0}
m_Type: 1 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
@ -309,7 +309,7 @@ PrefabInstance:
- target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 25 value: 225
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9,
type: 3} type: 3}

4
Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Load Bearing Rig UI.prefab
View File

@ -120,13 +120,13 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 675507ce9bfd14942a4d005b93020a55, type: 3} m_Sprite: {fileID: 0}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

4
Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Micro Chest Rig UI.prefab
View File

@ -120,13 +120,13 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 4d7bef859ab9a1b4692a170abb5541c0, type: 3} m_Sprite: {fileID: 0}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

4
Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Minimalist Harness UI.prefab
View File

@ -120,13 +120,13 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0ea04d9703ad8c648aae120d87fc5093, type: 3} m_Sprite: {fileID: 0}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

20
Assets/Scenes/Test Scene Chris.unity
View File

@ -43938,12 +43938,12 @@ PrefabInstance:
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
@ -44028,17 +44028,17 @@ PrefabInstance:
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -2500
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
@ -44160,6 +44160,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326606164476906, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_ScrollSensitivity
value: 75
objectReference: {fileID: 0}
- target: {fileID: 2770326606255359851, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326606255359851, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
@ -44595,6 +44600,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7264834851934661000, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_ScrollSensitivity
value: 75
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
--- !u!64 &3968453558880047856 --- !u!64 &3968453558880047856