From eee855551ae2f4c8e0b6b3742510103df6afec41 Mon Sep 17 00:00:00 2001 From: tonyomendoza Date: Thu, 16 Mar 2023 15:44:34 -0700 Subject: [PATCH] Loot container prototyping --- .../UI Windows/Inspection Window.prefab | 939 +++--------------- .../Prefabs/UI Windows/Storage Window.prefab | 34 +- .../Inventory System/ScriptableObjects.meta | 8 + .../Tool Box Loot Container.asset | 43 + .../Tool Box Loot Container.asset.meta | 8 + .../Scripts/Helpers/DeriveSizeFromChild.cs | 2 +- .../Scripts/Inventory/InventorySystem.cs | 30 +- .../Scripts/Inventory/LootContainer.cs | 138 +++ .../Scripts/Inventory/LootContainer.cs.meta | 11 + .../Scripts/ScriptableObjects.meta | 8 + .../ScriptableInventoryDatabase.cs | 23 + .../ScriptableInventoryDatabase.cs.meta | 11 + .../ScriptableLootContainer.cs | 94 ++ .../ScriptableLootContainer.cs.meta | 11 + .../Scripts/UI/BlockRaycast.cs | 21 +- .../Scripts/UI/ContextMenuManagerUI.cs | 13 + .../Scripts/UI/InspectionWindowUI.cs | 23 + Assets/Inventory System/Scripts/UI/ItemUI.cs | 4 +- Assets/New Noise Settings.asset | 28 + Assets/New Noise Settings.asset.meta | 8 + Assets/Scenes/Test Scene Tony.unity | 215 +++- 21 files changed, 849 insertions(+), 823 deletions(-) create mode 100644 Assets/Inventory System/ScriptableObjects.meta create mode 100644 Assets/Inventory System/ScriptableObjects/Tool Box Loot Container.asset create mode 100644 Assets/Inventory System/ScriptableObjects/Tool Box Loot Container.asset.meta create mode 100644 Assets/Inventory System/Scripts/Inventory/LootContainer.cs create mode 100644 Assets/Inventory System/Scripts/Inventory/LootContainer.cs.meta create mode 100644 Assets/Inventory System/Scripts/ScriptableObjects.meta create mode 100644 Assets/Inventory System/Scripts/ScriptableObjects/ScriptableInventoryDatabase.cs create mode 100644 Assets/Inventory System/Scripts/ScriptableObjects/ScriptableInventoryDatabase.cs.meta create mode 100644 Assets/Inventory System/Scripts/ScriptableObjects/ScriptableLootContainer.cs create mode 100644 Assets/Inventory System/Scripts/ScriptableObjects/ScriptableLootContainer.cs.meta create mode 100644 Assets/New Noise Settings.asset create mode 100644 Assets/New Noise Settings.asset.meta diff --git a/Assets/Inventory System/Prefabs/UI Windows/Inspection Window.prefab b/Assets/Inventory System/Prefabs/UI Windows/Inspection Window.prefab index acc54c14..a1a33625 100644 --- a/Assets/Inventory System/Prefabs/UI Windows/Inspection Window.prefab +++ b/Assets/Inventory System/Prefabs/UI Windows/Inspection Window.prefab @@ -216,6 +216,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2764895542204776886} + - component: {fileID: 2331738382842702951} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -243,6 +244,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0, y: 1} +--- !u!114 &2331738382842702951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874213782547560193} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &952534877174571241 GameObject: m_ObjectHideFlags: 0 @@ -739,7 +752,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3204513166066327335 RectTransform: m_ObjectHideFlags: 0 @@ -755,10 +768,10 @@ RectTransform: m_Father: {fileID: 6690087508671267694} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 600, y: -65} + m_SizeDelta: {x: 200, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &523745541398240781 CanvasRenderer: @@ -858,7 +871,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3568450731546814198 RectTransform: m_ObjectHideFlags: 0 @@ -874,10 +887,10 @@ RectTransform: m_Father: {fileID: 6690087508671267694} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 600, y: -35} + m_SizeDelta: {x: 200, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2128984398052825052 CanvasRenderer: @@ -977,7 +990,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &746131632634787799 RectTransform: m_ObjectHideFlags: 0 @@ -993,10 +1006,10 @@ RectTransform: m_Father: {fileID: 6690087508671267694} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 400, y: -35} + m_SizeDelta: {x: 200, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3735615083562572036 CanvasRenderer: @@ -1089,6 +1102,7 @@ GameObject: - component: {fileID: 3828836906028103513} - component: {fileID: 165981492520315138} - component: {fileID: 2296978434918097453} + - component: {fileID: 410289282785155896} m_Layer: 5 m_Name: DisplayPanel m_TagString: Untagged @@ -1139,7 +1153,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 0.318, g: 0.318, b: 0.318, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -1155,6 +1169,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &410289282785155896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2980745418580413377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4046604672146526969 GameObject: m_ObjectHideFlags: 0 @@ -1190,9 +1216,9 @@ RectTransform: m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} + m_SizeDelta: {x: -17, y: 20} m_Pivot: {x: 0, y: 0} --- !u!222 &1726105788166072588 CanvasRenderer: @@ -1591,14 +1617,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} - m_RaycastTarget: 1 + m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 1} + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1718,8 +1744,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1740,6 +1766,7 @@ GameObject: - component: {fileID: 4417106256859116616} - component: {fileID: 4417106256859116619} - component: {fileID: 4417106256859116618} + - component: {fileID: 7385385453595551987} m_Layer: 5 m_Name: Handle m_TagString: Untagged @@ -1795,8 +1822,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1818,6 +1845,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: title: {fileID: 4936616483716529338} +--- !u!114 &7385385453595551987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4417106256859116620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4417106256897273753 GameObject: m_ObjectHideFlags: 0 @@ -1964,6 +2003,7 @@ GameObject: - component: {fileID: 4308990909546901523} - component: {fileID: 1651271832990124042} - component: {fileID: 8079050674296521017} + - component: {fileID: 259573170387889164} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -2070,6 +2110,18 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!114 &259573170387889164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4417106257405200098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4549245584255577778 GameObject: m_ObjectHideFlags: 0 @@ -2082,6 +2134,7 @@ GameObject: - component: {fileID: 1223644676432677386} - component: {fileID: 9051355898530768533} - component: {fileID: 2350508404122221994} + - component: {fileID: 5865323966723344135} m_Layer: 5 m_Name: ButtonsPanel m_TagString: Untagged @@ -2135,7 +2188,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 0.392} + m_Color: {r: 0.318, g: 0.318, b: 0.318, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -2175,6 +2228,18 @@ MonoBehaviour: m_Spacing: {x: 0, y: 5} m_Constraint: 1 m_ConstraintCount: 3 +--- !u!114 &5865323966723344135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4549245584255577778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4763874833067037508 GameObject: m_ObjectHideFlags: 0 @@ -2320,6 +2385,7 @@ GameObject: - component: {fileID: 8617953084343279972} - component: {fileID: 96532191640467273} - component: {fileID: 2133508413287582991} + - component: {fileID: 6991608646427918022} m_Layer: 5 m_Name: ItemTraitsPanel m_TagString: Untagged @@ -2337,13 +2403,7 @@ RectTransform: 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: 4166959166661115046} - - {fileID: 510361270546705931} - - {fileID: 4810188549295641869} - - {fileID: 5845045231528990077} - - {fileID: 1859239239645228338} - - {fileID: 3933474912191392966} + m_Children: [] m_Father: {fileID: 4417106257405200099} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2373,7 +2433,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.17834817, g: 1, b: 0.023584902, a: 0.392} + m_Color: {r: 0.318, g: 0.318, b: 0.318, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -2413,6 +2473,18 @@ MonoBehaviour: m_Spacing: {x: 5, y: 5} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!114 &6991608646427918022 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5672717887992336363} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5918683632342874328 GameObject: m_ObjectHideFlags: 0 @@ -2431,7 +2503,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3282197089391553433 RectTransform: m_ObjectHideFlags: 0 @@ -2665,7 +2737,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Content: {fileID: 2764895542204776886} m_Horizontal: 0 - m_Vertical: 1 + m_Vertical: 0 m_MovementType: 2 m_Elasticity: 0.1 m_Inertia: 0 @@ -2675,7 +2747,7 @@ MonoBehaviour: m_HorizontalScrollbar: {fileID: 5716117638359715931} m_VerticalScrollbar: {fileID: 2679542099955711945} m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 0 m_HorizontalScrollbarSpacing: -3 m_VerticalScrollbarSpacing: -3 m_OnValueChanged: @@ -2777,7 +2849,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8487659294082181118 RectTransform: m_ObjectHideFlags: 0 @@ -2793,10 +2865,10 @@ RectTransform: m_Father: {fileID: 6690087508671267694} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 400, y: -65} + m_SizeDelta: {x: 200, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1027270207564923857 CanvasRenderer: @@ -2984,8 +3056,8 @@ RectTransform: m_Father: {fileID: 3189070628031862432} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.8333333} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -3176,9 +3248,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &3044472279078540142 CanvasRenderer: @@ -3319,6 +3391,7 @@ GameObject: - component: {fileID: 7023481831168829119} - component: {fileID: 5100349277035640383} - component: {fileID: 3037502900970124462} + - component: {fileID: 8951387409254270480} m_Layer: 5 m_Name: DisplayImage m_TagString: Untagged @@ -3382,6 +3455,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8951387409254270480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8865786133691891150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8913114282113217101 GameObject: m_ObjectHideFlags: 0 @@ -3478,7 +3563,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &720036029794788843 RectTransform: m_ObjectHideFlags: 0 @@ -3494,10 +3579,10 @@ RectTransform: m_Father: {fileID: 6690087508671267694} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 200, y: -65} + m_SizeDelta: {x: 200, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7638776121004494762 CanvasRenderer: @@ -3615,753 +3700,3 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &726789905222450022 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4862548972041178554} - m_Modifications: - - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Name - value: Item Trait (3) - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} ---- !u!224 &5845045231528990077 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - m_PrefabInstance: {fileID: 726789905222450022} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1858560829051697942 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4862548972041178554} - m_Modifications: - - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Name - value: Item Trait (2) - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} ---- !u!224 &4810188549295641869 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - m_PrefabInstance: {fileID: 1858560829051697942} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4811689411567321897 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4862548972041178554} - m_Modifications: - - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Name - value: Item Trait (4) - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} ---- !u!224 &1859239239645228338 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - m_PrefabInstance: {fileID: 4811689411567321897} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &6638020961275887632 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4862548972041178554} - m_Modifications: - - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Name - value: Item Trait (1) - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} ---- !u!224 &510361270546705931 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - m_PrefabInstance: {fileID: 6638020961275887632} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &7124647824416527037 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4862548972041178554} - m_Modifications: - - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Name - value: Item Trait - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} ---- !u!224 &4166959166661115046 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - m_PrefabInstance: {fileID: 7124647824416527037} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &7898562425705448157 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4862548972041178554} - m_Modifications: - - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Name - value: Item Trait (5) - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} ---- !u!224 &3933474912191392966 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, - type: 3} - m_PrefabInstance: {fileID: 7898562425705448157} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Inventory System/Prefabs/UI Windows/Storage Window.prefab b/Assets/Inventory System/Prefabs/UI Windows/Storage Window.prefab index 9f2f5329..19b99c17 100644 --- a/Assets/Inventory System/Prefabs/UI Windows/Storage Window.prefab +++ b/Assets/Inventory System/Prefabs/UI Windows/Storage Window.prefab @@ -328,7 +328,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -355,9 +355,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0e9d0435d71802c4387db949c199c1ef, type: 3} m_Name: m_EditorClassIdentifier: - StorageContainer: {fileID: 4417106257405200098} - itemUI: {fileID: 0} dragWindowUI: {fileID: 4417106256859116618} + ItemUI: {fileID: 0} + StorageContainer: {fileID: 4417106257405200098} --- !u!114 &9131793476022473716 MonoBehaviour: m_ObjectHideFlags: 0 @@ -383,6 +383,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MinimumSize: 75 + MinimumSizeX: 0 --- !u!1 &4417106256853968310 GameObject: m_ObjectHideFlags: 0 @@ -470,6 +471,7 @@ GameObject: - component: {fileID: 4417106256859116616} - component: {fileID: 4417106256859116619} - component: {fileID: 4417106256859116618} + - component: {fileID: 8834128785697470302} m_Layer: 5 m_Name: Handle m_TagString: Untagged @@ -548,6 +550,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: title: {fileID: 4936616483716529338} +--- !u!114 &8834128785697470302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4417106256859116620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4417106256897273753 GameObject: m_ObjectHideFlags: 0 @@ -694,6 +708,7 @@ GameObject: - component: {fileID: 4308990909546901523} - component: {fileID: 1651271832990124042} - component: {fileID: 118570070265754670} + - component: {fileID: 8907822599805716267} m_Layer: 5 m_Name: GridContainer m_TagString: Untagged @@ -770,6 +785,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MinimumSize: 75 + MinimumSizeX: 0 --- !u!114 &118570070265754670 MonoBehaviour: m_ObjectHideFlags: 0 @@ -795,3 +811,15 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!114 &8907822599805716267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4417106257405200098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Inventory System/ScriptableObjects.meta b/Assets/Inventory System/ScriptableObjects.meta new file mode 100644 index 00000000..48967bf6 --- /dev/null +++ b/Assets/Inventory System/ScriptableObjects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ac12bf62f88a0f41a63ca39063ba1e7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/ScriptableObjects/Tool Box Loot Container.asset b/Assets/Inventory System/ScriptableObjects/Tool Box Loot Container.asset new file mode 100644 index 00000000..33259068 --- /dev/null +++ b/Assets/Inventory System/ScriptableObjects/Tool Box Loot Container.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: df3eda42573609b479562fe43da4853a, type: 3} + m_Name: Tool Box Loot Container + m_EditorClassIdentifier: + spawnableItemPrefabs: + - {fileID: 8053794548077495502, guid: 67a5c33ceead1f14399d9a78cdcfb734, type: 3} + - {fileID: 8053794548077495502, guid: 4f93d111a901f1a4ba252ba52a6d1a83, type: 3} + - {fileID: 8053794548077495502, guid: 3e5ad4148935cf44f8f502719c58ac30, type: 3} + - {fileID: 8053794548077495502, guid: 3654d804175a12f4c9f2bdeafed7f4c5, type: 3} + - {fileID: 8053794548077495502, guid: d42738c8afec0044e9b95cfd814f6ebb, type: 3} + - {fileID: 8053794548077495502, guid: 09d984ff8b1e9f841938cc645460bc27, type: 3} + - {fileID: 8053794548077495502, guid: 72ee0f19f22b98145ab1c93fd56be6b9, type: 3} + - {fileID: 8053794548077495502, guid: 11549868f6a64e940aa1c8506096694b, type: 3} + - {fileID: 8053794548077495502, guid: 73e989f3b74c653458054ca38f94209e, type: 3} + - {fileID: 8053794548077495502, guid: faf601a2d53e0594f8dcf665100cf28e, type: 3} + - {fileID: 8053794548077495502, guid: 1b7439e6ea87c004594812f94a9fd481, type: 3} + - {fileID: 8053794548077495502, guid: f0fbb4c62750a814c8baa4eeceba5d63, type: 3} + - {fileID: 8053794548077495502, guid: 74ec3d723b6c8f74a90ae2a6839970cb, type: 3} + - {fileID: 8053794548077495502, guid: 18fdbd5cb64964d479fe73d102bff4c2, type: 3} + - {fileID: 8053794548077495502, guid: 3173001f8d1bc624792b41389e0962a3, type: 3} + - {fileID: 8053794548077495502, guid: 73fad84de7be5dc48a36f840386270de, type: 3} + - {fileID: 8053794548077495502, guid: 330fa239832e76849be9c5abe89f0702, type: 3} + spawnRates: + - rarity: 0 + spawnRate: 0.5 + spawnTime: 1800 + minimumSpawnDistance: 100 + minimumContainerSize: + Width: 3 + Height: 3 + maximumContainerSize: + Width: 5 + Height: 5 diff --git a/Assets/Inventory System/ScriptableObjects/Tool Box Loot Container.asset.meta b/Assets/Inventory System/ScriptableObjects/Tool Box Loot Container.asset.meta new file mode 100644 index 00000000..ae0661ec --- /dev/null +++ b/Assets/Inventory System/ScriptableObjects/Tool Box Loot Container.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22d3a241f9db00542aff64217d77dd36 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Scripts/Helpers/DeriveSizeFromChild.cs b/Assets/Inventory System/Scripts/Helpers/DeriveSizeFromChild.cs index 8df7efb7..5e38553c 100644 --- a/Assets/Inventory System/Scripts/Helpers/DeriveSizeFromChild.cs +++ b/Assets/Inventory System/Scripts/Helpers/DeriveSizeFromChild.cs @@ -24,7 +24,7 @@ public class DeriveSizeFromChild : MonoBehaviour } if (childRect != null && rect != null) { - Debug.Log(childRect.rect); + //Debug.Log(childRect.rect); if(childRect.rect.height > MinimumSize) rect.sizeDelta = new Vector3(rect.sizeDelta.x, childRect.sizeDelta.y); else diff --git a/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs b/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs index 52c7cdd4..aba8f02c 100644 --- a/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs +++ b/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs @@ -103,7 +103,7 @@ namespace SimpleInventorySystem public TagSlotGridPairing() { - Debug.Log("this should be called"); + //Debug.Log("this should be called"); SetSlotsOrGrid(); /*if (tagSlotGridPairUI == null && slot == null && tagSlotGridPairUI == null) { @@ -598,8 +598,9 @@ namespace SimpleInventorySystem // TODO: functionality here Inventory response_inventory = hits[i].collider.transform.GetComponent(); + LootContainer response_lootContainer = hits[i].collider.transform.GetComponent(); - if(response_inventory != null && response_inventory == player.inventory) + if (response_inventory != null && response_inventory == player.inventory) { continue; // ignore self } @@ -620,6 +621,22 @@ namespace SimpleInventorySystem CurrentState = States.Loot; } } + else if (response_lootContainer != null && !InventorySystem.instance.IsUsingInventoryMenuUI()) + { + //Debug.Log("Opening Inventory"); + if (interactKeyInput.PressedKey(true)) + { + OpenInventory(); + LootMenuUI.SetActive(true); + StatsMenuUI.SetActive(false); + Loot(response_lootContainer); + CurrentState = States.Undefined; + } + else if (!InventorySystem.instance.IsUsingInventoryMenuUI()) + { + CurrentState = States.Loot; + } + } else if(!InventorySystem.instance.IsUsingInventoryMenuUI()) { CurrentState = States.Undefined; @@ -649,6 +666,15 @@ namespace SimpleInventorySystem StartCoroutine(LootGrid.PopulateItemsWithNewInventory(inventory.itemUIs)); } } + public void Loot(LootContainer lootContainer) + { + if (lootContainer != null && !lootContainer.hasBeenLooted) + { + lootContainer.Loot(); + //Debug.Log($"Looting: {inventory.itemUIs.Count}"); + StartCoroutine(LootGrid.PopulateItemsWithNewInventory(lootContainer.itemUIs)); + } + } /// /// This can be called to check if player is interacting with the Inventory System's UI diff --git a/Assets/Inventory System/Scripts/Inventory/LootContainer.cs b/Assets/Inventory System/Scripts/Inventory/LootContainer.cs new file mode 100644 index 00000000..de5d815f --- /dev/null +++ b/Assets/Inventory System/Scripts/Inventory/LootContainer.cs @@ -0,0 +1,138 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace SimpleInventorySystem +{ + public class LootContainer : MonoBehaviour + { + // Start is called before the first frame update + public bool hasBeenLooted = false; + public bool itemsHaveBeenInstantiated = false; + public bool itemsHaveBeenHidden = false; + [HideInInspector] public List itemUIs; + + /// + /// Instantiates the item prefab first and calls necessary stuff. + /// + public void Loot() + { + if (!hasBeenLooted) + { + itemUIs = new List(); + Size size = GenerateContainerSize(); + PopulateContainer(size); + hasBeenLooted = true; + } + else + { + hasBeenLooted = true; + } + } + + void HideGameObjects() + { + if (hasBeenLooted && itemsHaveBeenInstantiated && !itemsHaveBeenHidden) + { + foreach (ItemUI item in itemUIs) + { + //Debug.Log(item.gameObject.name); + //Debug.Log(item.pickUp.gameObject.name); + item.pickUp.ItemGameObject.SetActive(false); + } + itemsHaveBeenHidden = true; + } + } + + public ScriptableLootContainer data; + + // Start is called before the first frame update + void Start() + { + if (data == null) + { + Debug.LogError("Loot Container should have a Scriptable Loot Container referenced."); + return; + } + } + + public Size GenerateContainerSize() + { + int width = Random.Range(data.minimumContainerSize.Width, data.maximumContainerSize.Width + 1); + int height = Random.Range(data.minimumContainerSize.Height, data.maximumContainerSize.Height + 1); + return new Size(width, height); + } + + public void PopulateContainer(Size size) + { + int cells = size.Width * size.Height; + int limit = 50; + while(limit > 0 && cells > 0) + { + GameObject item = Spawn(); + ItemUI itemUI = item.GetComponentInChildren(); + PickUp pickUp = item.GetComponentInChildren(); + item.SetActive(true); + item.transform.position = Vector3.zero; + item.transform.SetParent(InventorySystem.instance.DefaultItemSpawn, false); + if (item.GetComponent() != null) + item.GetComponent().useGravity = false; + if (itemUI != null) + { + itemUIs.Add(itemUI); + itemUI.gameObject.SetActive(true); + pickUp.gameObject.SetActive(true); + //AddOwnership(item, this); + //item.transform.SetParent(transform, true); + itemUI.InitializeImageSize(); + itemUI.ResetTransform(); + //gObj.transform.SetParent(item.transform, true); + //gObj.SetActive(false); + //item.pickUp = gObj.GetComponentInChildren(); + } + + cells -= itemUI.width * itemUI.height; + limit--; + } + Invoke(nameof(HideGameObjects), .1f); + itemsHaveBeenInstantiated = true; + } + + private GameObject Spawn() + { + // RNG rarity + float rate = Random.Range(0f, 1f); + RarityType rarity = data.GetRandomRarity(rate); + + // RNG item + GameObject prefab = data.GetRandomItem(rarity); + GameObject newItem = Instantiate(prefab); + Debug.Log($"Loot Container: {newItem.name}"); + + return newItem; + } + + // Update is called once per frame + void Update() + { + if (data == null) + { + return; + } + } + + /*public void RemoveOwnership(ItemUI item, Inventory newOwnerInventory) + { + item.Inventory = newOwnerInventory; + //items.Remove(item.pickUp.ItemGameObject); + itemUIs.Remove(item); + newOwnerInventory.AddOwnership(item, this); + } + public void AddOwnership(ItemUI item, Inventory oldOwnerInventory) + { + //items.Add(item.pickUp.ItemGameObject); + itemUIs.Add(item); + //item.Inventory = this; + }*/ + } +} \ No newline at end of file diff --git a/Assets/Inventory System/Scripts/Inventory/LootContainer.cs.meta b/Assets/Inventory System/Scripts/Inventory/LootContainer.cs.meta new file mode 100644 index 00000000..bcd42ea4 --- /dev/null +++ b/Assets/Inventory System/Scripts/Inventory/LootContainer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: db29f8627ad31904eab8cda9ef97002b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Scripts/ScriptableObjects.meta b/Assets/Inventory System/Scripts/ScriptableObjects.meta new file mode 100644 index 00000000..59e2cecf --- /dev/null +++ b/Assets/Inventory System/Scripts/ScriptableObjects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 589ebc9ebcd500c4a986f22b14358d25 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableInventoryDatabase.cs b/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableInventoryDatabase.cs new file mode 100644 index 00000000..a005d66b --- /dev/null +++ b/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableInventoryDatabase.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace SimpleInventorySystem +{ + public class ScriptableInventoryDatabase : MonoBehaviour + { + public GameObject[] AvailableItemPrefabs; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + } +} \ No newline at end of file diff --git a/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableInventoryDatabase.cs.meta b/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableInventoryDatabase.cs.meta new file mode 100644 index 00000000..725db075 --- /dev/null +++ b/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableInventoryDatabase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1792f520ea97a944994aa7f690bd66ec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableLootContainer.cs b/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableLootContainer.cs new file mode 100644 index 00000000..065d82ff --- /dev/null +++ b/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableLootContainer.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace SimpleInventorySystem +{ + [CreateAssetMenu(fileName = "New Scriptable Loot Container", menuName = "Inventory System/Loot Containers")] + public class ScriptableLootContainer : ScriptableObject + { + public GameObject[] spawnableItemPrefabs; + public SpawnRairtyToItemRate[] spawnRates; + public float spawnTime = 1800; // 30 minutes * 60 seconds + public float minimumSpawnDistance = 100; + public Size minimumContainerSize = new Size(3, 3); + public Size maximumContainerSize = new Size(5, 5); + [HideInInspector] public Dictionary> ItemPool = new Dictionary>(); + [HideInInspector] public Dictionary> ItemPoolBySize = new Dictionary>(); + + public void Awake() + { + } + + public void OnEnable() + { + //Debug.Log("Awake"); + if (minimumContainerSize.Width > maximumContainerSize.Width) + { + Debug.LogError("Minimum Container Size's width is greater than Maximum Containzer Size's width. Attempting to resolve."); + minimumContainerSize.Width = 3; + maximumContainerSize.Width = 5; + } + if (minimumContainerSize.Height > maximumContainerSize.Height) + { + Debug.LogError("Maximum Container Size's height is greater than Maximum Containzer Size's height. Attempting to resolve."); + minimumContainerSize.Height = 3; + maximumContainerSize.Height = 5; + } + //Debug.Log(spawnableItemPrefabs.Length); + ItemPool = new Dictionary>(); + foreach (GameObject gameObject in spawnableItemPrefabs) + { + ItemUI item = gameObject.GetComponentInChildren(); + if (item != null) + { + if (!ItemPool.ContainsKey(item.rarity)) + { + ItemPool.Add(item.rarity, new List()); + } + + ItemPool[item.rarity].Add(gameObject); + } + //Debug.Log(gameObject.name); + } + } + + public RarityType GetRandomRarity(float rate) + { + float currentRate = 0; + RarityType fallBackRarity = spawnableItemPrefabs[0].GetComponentInChildren().rarity; + foreach (SpawnRairtyToItemRate sR in spawnRates) + { + if (rate <= currentRate + sR.spawnRate) + { + return sR.rarity; + } + else + { + currentRate = sR.spawnRate; + } + } + return fallBackRarity; + } + + public GameObject GetRandomItem(RarityType rarity) + { + if (!ItemPool.ContainsKey(rarity)) + { + Debug.LogError("Rarity not found in Item Pool."); + return null; + } + + int index = UnityEngine.Random.Range(0, ItemPool[rarity].Count); + return ItemPool[rarity][index]; + } + } + + [Serializable] + public class SpawnRairtyToItemRate + { + public RarityType rarity; + [Range(0, 1)] public float spawnRate; + } +} \ No newline at end of file diff --git a/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableLootContainer.cs.meta b/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableLootContainer.cs.meta new file mode 100644 index 00000000..d9f1846c --- /dev/null +++ b/Assets/Inventory System/Scripts/ScriptableObjects/ScriptableLootContainer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: df3eda42573609b479562fe43da4853a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Scripts/UI/BlockRaycast.cs b/Assets/Inventory System/Scripts/UI/BlockRaycast.cs index 6f026cb6..571a1d81 100644 --- a/Assets/Inventory System/Scripts/UI/BlockRaycast.cs +++ b/Assets/Inventory System/Scripts/UI/BlockRaycast.cs @@ -2,17 +2,20 @@ using System.Collections.Generic; using UnityEngine; -public class BlockRaycast : MonoBehaviour +namespace SimpleInventorySystem { - // Start is called before the first frame update - void Start() + public class BlockRaycast : MonoBehaviour { - - } + // Start is called before the first frame update + void Start() + { - // Update is called once per frame - void Update() - { - + } + + // Update is called once per frame + void Update() + { + + } } } diff --git a/Assets/Inventory System/Scripts/UI/ContextMenuManagerUI.cs b/Assets/Inventory System/Scripts/UI/ContextMenuManagerUI.cs index 7be17bf4..d4d4df8f 100644 --- a/Assets/Inventory System/Scripts/UI/ContextMenuManagerUI.cs +++ b/Assets/Inventory System/Scripts/UI/ContextMenuManagerUI.cs @@ -47,6 +47,13 @@ namespace SimpleInventorySystem { inspectButton.onClick.AddListener(OpenInspectionWindow); } + + Button dropButton = itemInspectMenu.transform.Find("Drop").GetComponent