diff --git a/Assets/Inventory System/Prefabs/Inventory System.prefab b/Assets/Inventory System/Prefabs/Inventory System.prefab index 20d98013..a3293422 100644 --- a/Assets/Inventory System/Prefabs/Inventory System.prefab +++ b/Assets/Inventory System/Prefabs/Inventory System.prefab @@ -802,6 +802,272 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1507953463612279878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4155102199267378163} + - component: {fileID: 9099673059685349340} + - component: {fileID: 8104384756496929368} + m_Layer: 2 + m_Name: StackCount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4155102199267378163 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507953463612279878} + 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: 2770326605938994044} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -15, y: 10} + m_SizeDelta: {x: -15, y: 30} + m_Pivot: {x: 1, y: 0} +--- !u!222 &9099673059685349340 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507953463612279878} + m_CullTransparentMesh: 0 +--- !u!114 &8104384756496929368 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507953463612279878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26.85 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1553740193475468406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1145099833026062750} + - component: {fileID: 4753240090674658121} + - component: {fileID: 7977379646435471508} + m_Layer: 2 + m_Name: StackCount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1145099833026062750 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553740193475468406} + 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: 2770326606481375053} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -15, y: 10.0000305} + m_SizeDelta: {x: -15, y: 30} + m_Pivot: {x: 1, y: 0} +--- !u!222 &4753240090674658121 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553740193475468406} + m_CullTransparentMesh: 0 +--- !u!114 &7977379646435471508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553740193475468406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26.85 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1709790406123224671 GameObject: m_ObjectHideFlags: 0 @@ -1196,7 +1462,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -1204,139 +1470,6 @@ MonoBehaviour: CellInUse: 0 imageScale: 1 StackItemsOnSlot: 0 ---- !u!1 &2770326604715695280 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2770326604715695281} - - component: {fileID: 2770326604715695283} - - component: {fileID: 2770326604715695282} - m_Layer: 2 - m_Name: PouchTypeDescription - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2770326604715695281 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2770326604715695280} - 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: 2770326605938994044} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -15, y: -30} - m_SizeDelta: {x: -15, y: 30} - m_Pivot: {x: 1, y: 0} ---- !u!222 &2770326604715695283 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2770326604715695280} - m_CullTransparentMesh: 0 ---- !u!114 &2770326604715695282 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2770326604715695280} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 2/1 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 26.85 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 4 - m_VerticalAlignment: 1024 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2770326604719467868 GameObject: m_ObjectHideFlags: 0 @@ -1773,7 +1906,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -2019,7 +2152,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2770326604842289205 RectTransform: m_ObjectHideFlags: 0 @@ -2031,7 +2164,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3970108535984647846} + - {fileID: 5428738457003561206} + - {fileID: 7647674725412797943} m_Father: {fileID: 2770326604779306284} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2273,7 +2407,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -3172,7 +3306,6 @@ GameObject: - component: {fileID: 2770326605039798016} - component: {fileID: 2770326605039798047} - component: {fileID: 2770326605039798046} - - component: {fileID: 2770326605039798045} - component: {fileID: 7754770287730055227} m_Layer: 5 m_Name: Pouch 1x1 Slot @@ -3180,7 +3313,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2770326605039798044 RectTransform: m_ObjectHideFlags: 0 @@ -3233,7 +3366,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -3283,8 +3416,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Slot: {fileID: 0} - Weight: 1 - limitStackSlotCapacities: {fileID: 0} + limitStackItemManager: {fileID: 0} + Count: 0 + CountText: {fileID: 2650341092914362336} --- !u!114 &2770326605039798046 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3300,20 +3434,6 @@ MonoBehaviour: AttachToTransform: {fileID: 2770326605600926436} FindAttachToScriptInAttachToTransform: 1 StackAppend: 1 ---- !u!114 &2770326605039798045 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2770326605039798043} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ec4b16f08baaf5648a7e5ebe9e562069, type: 3} - m_Name: - m_EditorClassIdentifier: - textMeshProUGUI: {fileID: 0} - value: --- !u!114 &7754770287730055227 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3333,7 +3453,7 @@ MonoBehaviour: showGameObjects: [] incompatibleSlots: [] hideGameObjects: - - {fileID: 2770326606523342257} + - {fileID: 8936547280853702693} AllowedItemTags: --- !u!1 &2770326605069652606 GameObject: @@ -3347,7 +3467,6 @@ GameObject: - component: {fileID: 2770326605069652581} - component: {fileID: 2770326605069652580} - component: {fileID: 2770326605069652579} - - component: {fileID: 2770326605069652578} - component: {fileID: 2770326605069652577} - component: {fileID: 2770326605069652576} - component: {fileID: 6117797356281549426} @@ -3357,7 +3476,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2770326605069652607 RectTransform: m_ObjectHideFlags: 0 @@ -3410,7 +3529,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -3433,20 +3552,6 @@ MonoBehaviour: AttachToTransform: {fileID: 2770326605600926436} FindAttachToScriptInAttachToTransform: 1 StackAppend: 1 ---- !u!114 &2770326605069652578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2770326605069652606} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ec4b16f08baaf5648a7e5ebe9e562069, type: 3} - m_Name: - m_EditorClassIdentifier: - textMeshProUGUI: {fileID: 0} - value: --- !u!114 &2770326605069652577 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3460,8 +3565,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Slot: {fileID: 0} - Weight: 2 - limitStackSlotCapacities: {fileID: 0} + limitStackItemManager: {fileID: 0} + Count: 0 + CountText: {fileID: 8104384756496929368} --- !u!114 &2770326605069652576 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3510,7 +3616,7 @@ MonoBehaviour: showGameObjects: [] incompatibleSlots: [] hideGameObjects: - - {fileID: 2770326604715695280} + - {fileID: 8946085121933949706} AllowedItemTags: --- !u!1 &2770326605092142851 GameObject: @@ -4055,7 +4161,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -4570,7 +4676,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -4930,7 +5036,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -5568,7 +5674,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -5753,7 +5859,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2770326605466981878 RectTransform: m_ObjectHideFlags: 0 @@ -5765,7 +5871,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4724815868778350104} + - {fileID: 2770326605234795828} + - {fileID: 2770326606744545578} m_Father: {fileID: 2770326606713975610} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5921,7 +6028,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -6803,7 +6910,6 @@ GameObject: - component: {fileID: 2770326605604029971} - component: {fileID: 2770326605604029970} - component: {fileID: 2770326605604029969} - - component: {fileID: 2770326605604029968} - component: {fileID: 8388184461304422039} m_Layer: 5 m_Name: Pouch 1x3 Slot @@ -6811,7 +6917,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2770326605604030063 RectTransform: m_ObjectHideFlags: 0 @@ -6864,7 +6970,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -6914,8 +7020,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Slot: {fileID: 0} - Weight: 3 - limitStackSlotCapacities: {fileID: 0} + limitStackItemManager: {fileID: 0} + Count: 0 + CountText: {fileID: 7977379646435471508} --- !u!114 &2770326605604029969 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6931,20 +7038,6 @@ MonoBehaviour: AttachToTransform: {fileID: 2770326605600926436} FindAttachToScriptInAttachToTransform: 1 StackAppend: 1 ---- !u!114 &2770326605604029968 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2770326605604030062} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ec4b16f08baaf5648a7e5ebe9e562069, type: 3} - m_Name: - m_EditorClassIdentifier: - textMeshProUGUI: {fileID: 0} - value: --- !u!114 &8388184461304422039 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6964,7 +7057,7 @@ MonoBehaviour: showGameObjects: [] incompatibleSlots: [] hideGameObjects: - - {fileID: 2770326605586937000} + - {fileID: 3891925578548331659} AllowedItemTags: --- !u!1 &2770326605614257426 GameObject: @@ -8497,7 +8590,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -8898,7 +8991,7 @@ GameObject: m_Component: - component: {fileID: 2770326605851189361} - component: {fileID: 2770326605851189364} - - component: {fileID: 2770326605851189363} + - component: {fileID: 2805822561179475849} m_Layer: 5 m_Name: Plate Carrier Group Slot Manager m_TagString: Untagged @@ -8954,26 +9047,25 @@ MonoBehaviour: hideGameObjects: - {fileID: 2770326605258052311} AllowedItemTags: 12000000 ---- !u!114 &2770326605851189363 +--- !u!114 &2805822561179475849 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2770326605851189360} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6349c95e0055a64db6010b6bfaa9971, type: 3} + m_Script: {fileID: 11500000, guid: 886d4d53fb341454aa56488c1768c081, type: 3} m_Name: m_EditorClassIdentifier: - StackSlotLimit: 12 limitStackSlots: - {fileID: 2770326605039798047} - {fileID: 2770326605069652577} - {fileID: 2770326605604029970} - {fileID: 2770326606725301637} combinedLimit: 1 - capacityText: {fileID: 2770326604711117547} + itemUI: {fileID: 0} slot: {fileID: 2770326606194450705} --- !u!1 &2770326605875927869 GameObject: @@ -9208,7 +9300,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -9608,7 +9700,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2770326605938994044 RectTransform: m_ObjectHideFlags: 0 @@ -9620,7 +9712,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2556660007702076646} + - {fileID: 4155102199267378163} + - {fileID: 3133592109622727566} m_Father: {fileID: 2770326606773731710} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9907,7 +10000,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -10015,7 +10108,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -10475,7 +10568,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -10662,7 +10755,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -10792,7 +10885,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -10882,7 +10975,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -0.00048828125, y: -0.0010553089} + m_AnchoredPosition: {x: -0.00048828125, y: -0.00034455254} m_SizeDelta: {x: 582.99915, y: 1200} m_Pivot: {x: 0, y: 1} --- !u!114 &2770326606141421693 @@ -10943,7 +11036,6 @@ RectTransform: - {fileID: 2770326605851189361} - {fileID: 2770326606332454989} - {fileID: 2770326606194450799} - - {fileID: 2770326605232467539} m_Father: {fileID: 2770326605267516331} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11440,7 +11532,7 @@ MonoBehaviour: - {fileID: 2770326606094932650} stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -11603,7 +11695,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -12276,7 +12368,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -12594,7 +12686,7 @@ GameObject: m_Component: - component: {fileID: 2770326606332454989} - component: {fileID: 2770326606332454990} - - component: {fileID: 2109804768} + - component: {fileID: 634964390482256711} m_Layer: 5 m_Name: Tactical Rig Group Slot Manager m_TagString: Untagged @@ -12650,26 +12742,25 @@ MonoBehaviour: incompatibleSlots: [] hideGameObjects: [] AllowedItemTags: 09000000 ---- !u!114 &2109804768 +--- !u!114 &634964390482256711 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2770326606332454988} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6349c95e0055a64db6010b6bfaa9971, type: 3} + m_Script: {fileID: 11500000, guid: 886d4d53fb341454aa56488c1768c081, type: 3} m_Name: m_EditorClassIdentifier: - StackSlotLimit: 12 limitStackSlots: - {fileID: 2770326605039798047} - {fileID: 2770326605069652577} - {fileID: 2770326605604029970} - {fileID: 2770326606725301637} combinedLimit: 1 - capacityText: {fileID: 2770326604711117547} + itemUI: {fileID: 0} slot: {fileID: 2770326606194450705} --- !u!1 &2770326606343437209 GameObject: @@ -13526,7 +13617,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -13708,7 +13799,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2770326606481375053 RectTransform: m_ObjectHideFlags: 0 @@ -13720,7 +13811,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5927964360488934838} + - {fileID: 1145099833026062750} + - {fileID: 5013726064579112572} m_Father: {fileID: 2770326604705105987} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13931,7 +14023,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -14414,7 +14506,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -14962,7 +15054,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -15288,7 +15380,6 @@ GameObject: - component: {fileID: 2770326606725301638} - component: {fileID: 2770326606725301637} - component: {fileID: 2770326606725301636} - - component: {fileID: 2770326606725301635} - component: {fileID: 6848676664768521651} m_Layer: 5 m_Name: Pouch 2x2 Slot @@ -15296,7 +15387,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2770326606725301640 RectTransform: m_ObjectHideFlags: 0 @@ -15349,7 +15440,7 @@ MonoBehaviour: HasSlotsBelongingToItem: [] stackSlotCountText: {fileID: 0} limitStackSlot: {fileID: 0} - limitStackSlotManager: {fileID: 0} + limitStackItemManager: {fileID: 0} DroppedOnFrame: 0 groupSlots: [] grid: {fileID: 0} @@ -15399,8 +15490,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Slot: {fileID: 0} - Weight: 4 - limitStackSlotCapacities: {fileID: 0} + limitStackItemManager: {fileID: 0} + Count: 0 + CountText: {fileID: 2770326605234795826} --- !u!114 &2770326606725301636 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15416,20 +15508,6 @@ MonoBehaviour: AttachToTransform: {fileID: 2770326605600926436} FindAttachToScriptInAttachToTransform: 1 StackAppend: 1 ---- !u!114 &2770326606725301635 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2770326606725301633} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ec4b16f08baaf5648a7e5ebe9e562069, type: 3} - m_Name: - m_EditorClassIdentifier: - textMeshProUGUI: {fileID: 0} - value: --- !u!114 &6848676664768521651 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15515,7 +15593,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 2/1 + m_text: 2/2 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -15926,7 +16004,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2770326606276845106} m_HandleRect: {fileID: 2770326606276845105} m_Direction: 2 - m_Value: 1.0000001 + m_Value: 1.0000002 m_Size: 0.29797193 m_NumberOfSteps: 0 m_OnValueChanged: @@ -16430,6 +16508,276 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 +--- !u!1 &3891925578548331659 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5013726064579112572} + - component: {fileID: 1825290092413595926} + - component: {fileID: 8431591801210872256} + m_Layer: 2 + m_Name: PouchTypeDescription + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5013726064579112572 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3891925578548331659} + 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: 2770326606481375053} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15, y: -30} + m_SizeDelta: {x: -15, y: 30} + m_Pivot: {x: 1, y: 0} +--- !u!222 &1825290092413595926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3891925578548331659} + m_CullTransparentMesh: 0 +--- !u!114 &8431591801210872256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3891925578548331659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: '1/3 + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26.85 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4346382008458102185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5428738457003561206} + - component: {fileID: 2003798557301834998} + - component: {fileID: 2650341092914362336} + m_Layer: 2 + m_Name: StackCount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5428738457003561206 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4346382008458102185} + 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: 2770326604842289205} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -15, y: 10} + m_SizeDelta: {x: -15, y: 30} + m_Pivot: {x: 1, y: 0} +--- !u!222 &2003798557301834998 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4346382008458102185} + m_CullTransparentMesh: 0 +--- !u!114 &2650341092914362336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4346382008458102185} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: '0 + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26.85 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7934284283912460567 GameObject: m_ObjectHideFlags: 0 @@ -16658,154 +17006,278 @@ MonoBehaviour: m_TargetGraphic: {fileID: 8873855520739210168} m_HandleRect: {fileID: 52681282418728116} m_Direction: 2 - m_Value: 1.0000024 - m_Size: 0.6525 + m_Value: 1.0000008 + m_Size: 0.6525001 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1001 &620213215257673551 -PrefabInstance: +--- !u!1 &8936547280853702693 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2770326606150301029} - m_Modifications: - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_SizeDelta.x - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_SizeDelta.y - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096029, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_Name - value: Total Pouches Text Container - objectReference: {fileID: 0} - - target: {fileID: 3380336335400096029, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 400c1a9d4e5603f428c15bd946331a4b, type: 3} ---- !u!224 &2770326605232467539 stripped + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7647674725412797943} + - component: {fileID: 2223182722737300134} + - component: {fileID: 3329260376471384408} + m_Layer: 2 + m_Name: PouchTypeDescription + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7647674725412797943 RectTransform: - m_CorrespondingSourceObject: {fileID: 3380336335400096028, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - m_PrefabInstance: {fileID: 620213215257673551} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!114 &2770326604711117547 stripped + m_GameObject: {fileID: 8936547280853702693} + 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: 2770326604842289205} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15, y: -30} + m_SizeDelta: {x: -15, y: 30} + m_Pivot: {x: 1, y: 0} +--- !u!222 &2223182722737300134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8936547280853702693} + m_CullTransparentMesh: 0 +--- !u!114 &3329260376471384408 MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3380336334881258916, guid: 400c1a9d4e5603f428c15bd946331a4b, - type: 3} - m_PrefabInstance: {fileID: 620213215257673551} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 8936547280853702693} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 1/1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26.85 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8946085121933949706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3133592109622727566} + - component: {fileID: 2189434288965880271} + - component: {fileID: 8171201697240549095} + m_Layer: 2 + m_Name: PouchTypeDescription + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3133592109622727566 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8946085121933949706} + 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: 2770326605938994044} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15, y: -30} + m_SizeDelta: {x: -15, y: 30} + m_Pivot: {x: 1, y: 0} +--- !u!222 &2189434288965880271 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8946085121933949706} + m_CullTransparentMesh: 0 +--- !u!114 &8171201697240549095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8946085121933949706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 1/2 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26.85 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1001 &661619027224530564 PrefabInstance: m_ObjectHideFlags: 0 @@ -17970,12 +18442,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: efda854dc0407334a870a7d0db700c6d, type: 3} ---- !u!224 &7394345909396860500 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3308353764518990372, guid: efda854dc0407334a870a7d0db700c6d, - type: 3} - m_PrefabInstance: {fileID: 5437072170663378032} - m_PrefabAsset: {fileID: 0} --- !u!114 &7394345907320378009 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3308353763063672553, guid: efda854dc0407334a870a7d0db700c6d, @@ -17988,6 +18454,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &7394345909396860500 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3308353764518990372, guid: efda854dc0407334a870a7d0db700c6d, + type: 3} + m_PrefabInstance: {fileID: 5437072170663378032} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6690270967246225769 PrefabInstance: m_ObjectHideFlags: 0 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/Scripts/UI/ItemUI.cs b/Assets/Inventory System/Scripts/UI/ItemUI.cs index ae1da516..6d246a0e 100644 --- a/Assets/Inventory System/Scripts/UI/ItemUI.cs +++ b/Assets/Inventory System/Scripts/UI/ItemUI.cs @@ -219,11 +219,11 @@ namespace SimpleInventorySystem return -1; }*/ - public bool WillExceedMaximumCapacity(int weight) + public bool WillExceedMaximumCapacity(int weight = 0) { return NestCapacityCount >= NestCapacity || NestCapacityCount + weight > NestCapacity; } - public bool WillExceedZeroCapacity(int weight) + public bool WillExceedZeroCapacity(int weight = 0) { return NestCapacityCount <= 0 || NestCapacityCount - weight < 0; } diff --git a/Assets/Inventory System/Scripts/UI/LimitStackSlot.cs b/Assets/Inventory System/Scripts/UI/LimitStackSlot.cs index 3c32f638..b44c1629 100644 --- a/Assets/Inventory System/Scripts/UI/LimitStackSlot.cs +++ b/Assets/Inventory System/Scripts/UI/LimitStackSlot.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using TMPro; namespace SimpleInventorySystem { @@ -10,16 +11,25 @@ namespace SimpleInventorySystem //public int Weight; //[HideInInspector] public LimitStackSlotManager limitStackSlotCapacities; [HideInInspector] public LimitStackItemManager limitStackItemManager; + [HideInInspector] public int Count; + public TextMeshProUGUI CountText; + public void SetCount() + { + Count = Slot.stackedItems.Count; + CountText.text = Count.ToString(); + } public void Increment(ItemUI itemUI) { limitStackItemManager.Increment(itemUI); + SetCount(); } public void Decrement(ItemUI itemUI) { limitStackItemManager.Decrement(itemUI); + SetCount(); } public bool HasReachedLimit(ItemUI itemUI) diff --git a/Assets/Inventory System/Scripts/UI/SlotUI.cs b/Assets/Inventory System/Scripts/UI/SlotUI.cs index 107e935e..c3c21c16 100644 --- a/Assets/Inventory System/Scripts/UI/SlotUI.cs +++ b/Assets/Inventory System/Scripts/UI/SlotUI.cs @@ -101,8 +101,9 @@ namespace SimpleInventorySystem /// STACKING /// This section concerns item stacks, not slot stacking - if (itemDrop.Stackable && ((HasStack() && itemUI != null /*&& itemUI.itemPrefab == itemDrop.itemPrefab*/ && itemUI.itemName == GetItemUI().itemName) || !dropStack)) + if (itemDrop.Stackable && ((HasStack() && itemDrop.itemName == GetItemUI().itemName) || !dropStack)) { + Debug.Log("DropStack" + dropStack); // Debug.Log("Handling Stack"); int maxStackDrop = 1; if (dropStack) @@ -236,6 +237,7 @@ namespace SimpleInventorySystem if (limitStackSlot != null) { + limitStackSlot.SetCount(); limitStackSlot.Increment(itemUI); } @@ -326,11 +328,6 @@ namespace SimpleInventorySystem { HideImage(); - /*if (limitStackSlot != null) - { - limitStackSlot.Increment(itemUI); - }*/ - //DropOntoSlot(item.gameObject); stackedItems.Push(item); @@ -359,6 +356,11 @@ namespace SimpleInventorySystem gs.OnItemDropped(); } } + + if (limitStackSlot != null) + { + limitStackSlot.SetCount(); + } } public void RemoveContainedItemsFromSlot() { @@ -384,6 +386,11 @@ namespace SimpleInventorySystem oldItem.SetSlot(this); } + if (limitStackSlot != null) + { + limitStackSlot.SetCount(); + } + if (groupSlots != null) { foreach (GroupSlotUI gs in groupSlots) @@ -438,6 +445,11 @@ namespace SimpleInventorySystem groupSlot.OnItemRemoved(); } + if (limitStackSlot != null) + { + limitStackSlot.SetCount(); + } + UnsetCell(); SetRenderItemUIPropertyValue(); 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 e2af520b..db450073 100644 --- a/Assets/Scenes/Test Scene Tony.unity +++ b/Assets/Scenes/Test Scene Tony.unity @@ -46408,20 +46408,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1793588189} m_PrefabAsset: {fileID: 0} ---- !u!1 &1796317325 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6546923916990955624, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - m_PrefabInstance: {fileID: 2770326605231792848} - m_PrefabAsset: {fileID: 0} ---- !u!222 &1796317327 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1796317325} - m_CullTransparentMesh: 0 --- !u!1 &1799529557 GameObject: m_ObjectHideFlags: 0 @@ -56623,7 +56609,7 @@ PrefabInstance: - target: {fileID: 2770326604978625765, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000061035156 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2770326604978625765, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} @@ -57173,12 +57159,12 @@ PrefabInstance: - target: {fileID: 2770326606141421692, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -0.00024414062 objectReference: {fileID: 0} - target: {fileID: 2770326606141421692, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00024414062 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2770326606150301029, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} 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: