From a83c7bcf91314729ac7ae5f0cfec15139124980e Mon Sep 17 00:00:00 2001 From: Sewmina Dilshan Date: Thu, 19 May 2022 20:41:21 +0530 Subject: [PATCH] Sell menu finished --- .gitignore | 3 +- Assets/Game/Scenes/GameScene/GameScene.unity | 956 ++++++++++++++++--- Assets/Game/Scripts/DBmanager.cs | 20 + Assets/Game/Scripts/SellMenu.cs | 97 +- 4 files changed, 959 insertions(+), 117 deletions(-) diff --git a/.gitignore b/.gitignore index 0a05c0d69..89b229264 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ /Logs/* /UserSettings/* /.vscode/* -*.csproj \ No newline at end of file +*.csproj +*.sln diff --git a/Assets/Game/Scenes/GameScene/GameScene.unity b/Assets/Game/Scenes/GameScene/GameScene.unity index 76cf1c28c..5ced4e0c3 100644 --- a/Assets/Game/Scenes/GameScene/GameScene.unity +++ b/Assets/Game/Scenes/GameScene/GameScene.unity @@ -28937,7 +28937,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Username + m_text: Set... m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 5094b715585444e90b7306721788dae5, type: 2} m_sharedMaterial: {fileID: 2393364598115949451, guid: 5094b715585444e90b7306721788dae5, type: 2} @@ -38585,6 +38585,140 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 790eff77ed84cfd49bc3ba124a1e6b6d, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b225b6c4fbbf1f5419c8b635c434c1c4, type: 3} +--- !u!1 &308532672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 308532673} + - component: {fileID: 308532675} + - component: {fileID: 308532674} + m_Layer: 5 + m_Name: amount (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &308532673 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 308532672} + 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: 7548028370002474470} + 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: 200, y: 33.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &308532674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 308532672} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5094b715585444e90b7306721788dae5, type: 2} + m_sharedMaterial: {fileID: 2393364598115949451, guid: 5094b715585444e90b7306721788dae5, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4282335039 + m_fontColor: {r: 0.24528301, g: 0.24528301, b: 0.24528301, 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: 33.3 + m_fontSizeBase: 27.8 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 33.3 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: 0 + 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!222 &308532675 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 308532672} + m_CullTransparentMesh: 1 --- !u!1 &308927017 GameObject: m_ObjectHideFlags: 0 @@ -46652,16 +46786,24 @@ MonoBehaviour: gemsTxt: {fileID: 7548028370765915785} inventoryParent: {fileID: 7548028370540024263} emptySlotImage: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + selectedItemImg: {fileID: 7548028371090386198} + selectedItem: + sellBtn: {fileID: 7548028369747377803} yourReqPopup: {fileID: 540058088} - coinsInput: {fileID: 0} - gemsInput: {fileID: 0} - oxygenInput: {fileID: 0} - metalInput: {fileID: 0} + coinsInput: {fileID: 1382136567483586681} + gemsInput: {fileID: 191231531} + oxygenInput: {fileID: 1040412953} + metalInput: {fileID: 1527769655} coinsAmount: 0 gemsAmount: 0 oxygenAmount: 0 metalAmount: 0 - selectedItemImg: {fileID: 0} + coinsIcon: {fileID: 21300000, guid: 6c47e2c7bf07746efa81b086462515fc, type: 3} + gemsIcon: {fileID: 21300000, guid: 0163074565f2945b5a7a658558dc3761, type: 3} + metalsIcon: {fileID: 21300000, guid: 2fac5c79c1cac421bb92c9f7ab533bb3, type: 3} + oxygenIcon: {fileID: 21300000, guid: c37041a58020a45fa97381052436de69, type: 3} + addIcon: {fileID: 21300000, guid: d465a17b237394657aba886aaf89ee73, type: 3} + resourceIconsParent: {fileID: 7548028369761688995} --- !u!4 &375084964 stripped Transform: m_CorrespondingSourceObject: {fileID: 4627310524903758, guid: d194838adb73ce841a9e1626c9d51744, type: 3} @@ -61527,7 +61669,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1000514584} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 540058088} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &498029873 MonoBehaviour: m_ObjectHideFlags: 0 @@ -96965,21 +97119,9 @@ MonoBehaviour: OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 7548028369596807703} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - m_Target: {fileID: 374839933} m_TargetAssemblyTypeName: SellMenu, Assembly-CSharp - m_MethodName: Refresh + m_MethodName: OpenSellMenu m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -149413,6 +149555,140 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aa075532eab0ee34d895222ead71d185, type: 3} +--- !u!1 &1253754301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1253754302} + - component: {fileID: 1253754304} + - component: {fileID: 1253754303} + m_Layer: 5 + m_Name: amount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1253754302 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253754301} + 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: 7548028370464226928} + 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: 200, y: 33.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1253754303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253754301} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5094b715585444e90b7306721788dae5, type: 2} + m_sharedMaterial: {fileID: 2393364598115949451, guid: 5094b715585444e90b7306721788dae5, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4282335039 + m_fontColor: {r: 0.24528301, g: 0.24528301, b: 0.24528301, 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: 33.3 + m_fontSizeBase: 27.8 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 33.3 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: 0 + 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!222 &1253754304 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253754301} + m_CullTransparentMesh: 1 --- !u!1001 &1254222857 PrefabInstance: m_ObjectHideFlags: 0 @@ -152336,7 +152612,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Username + m_text: Set... m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 5094b715585444e90b7306721788dae5, type: 2} m_sharedMaterial: {fileID: 2393364598115949451, guid: 5094b715585444e90b7306721788dae5, type: 2} @@ -173782,6 +174058,140 @@ Transform: m_CorrespondingSourceObject: {fileID: 4891239297171410, guid: 3efdcca98ea201f4c8951203c47746dc, type: 3} m_PrefabInstance: {fileID: 464308446} m_PrefabAsset: {fileID: 0} +--- !u!1 &1495584245 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1495584246} + - component: {fileID: 1495584248} + - component: {fileID: 1495584247} + m_Layer: 5 + m_Name: amount (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1495584246 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495584245} + 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: 7548028370799589681} + 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: 200, y: 33.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1495584247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495584245} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5094b715585444e90b7306721788dae5, type: 2} + m_sharedMaterial: {fileID: 2393364598115949451, guid: 5094b715585444e90b7306721788dae5, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4282335039 + m_fontColor: {r: 0.24528301, g: 0.24528301, b: 0.24528301, 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: 33.3 + m_fontSizeBase: 27.8 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 33.3 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: 0 + 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!222 &1495584248 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495584245} + m_CullTransparentMesh: 1 --- !u!4 &1495768080 stripped Transform: m_CorrespondingSourceObject: {fileID: 4283879130532548, guid: ea9786e91463fdc4aa3eaaeaa48c45e8, type: 3} @@ -176905,8 +177315,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c37041a58020a45fa97381052436de69, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 2fac5c79c1cac421bb92c9f7ab533bb3, type: 3} + m_Type: 1 m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -218358,7 +218768,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1868929596} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 374839933} + m_TargetAssemblyTypeName: SellMenu, Assembly-CSharp + m_MethodName: OnSetClicked + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1868929596 MonoBehaviour: m_ObjectHideFlags: 0 @@ -234881,7 +235303,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Username + m_text: Set... m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 5094b715585444e90b7306721788dae5, type: 2} m_sharedMaterial: {fileID: 2393364598115949451, guid: 5094b715585444e90b7306721788dae5, type: 2} @@ -247832,6 +248254,140 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 9bcc6a377b6f6be42861b11a3a94bf93, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5f9778f740335b248967fbaa111f011e, type: 3} +--- !u!1 &2124194100 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2124194101} + - component: {fileID: 2124194103} + - component: {fileID: 2124194102} + m_Layer: 5 + m_Name: amount (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2124194101 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124194100} + 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: 7548028370862993511} + 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: 200, y: 33.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2124194102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124194100} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5094b715585444e90b7306721788dae5, type: 2} + m_sharedMaterial: {fileID: 2393364598115949451, guid: 5094b715585444e90b7306721788dae5, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4282335039 + m_fontColor: {r: 0.24528301, g: 0.24528301, b: 0.24528301, 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: 33.3 + m_fontSizeBase: 27.8 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 33.3 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: 0 + 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!222 &2124194103 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124194100} + m_CullTransparentMesh: 1 --- !u!4 &2125235248 stripped Transform: m_CorrespondingSourceObject: {fileID: 4651772382767206, guid: a3329c5f245afff4d875efdb6e8fd28a, type: 3} @@ -250062,7 +250618,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Username + m_text: Set... m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 5094b715585444e90b7306721788dae5, type: 2} m_sharedMaterial: {fileID: 2393364598115949451, guid: 5094b715585444e90b7306721788dae5, type: 2} @@ -251102,9 +251658,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 90e6f55a8253f4215836b4857b72225e, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -251129,7 +251685,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -0.000017166} - m_SizeDelta: {x: 90, y: 94.943} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028369207727959 CanvasRenderer: @@ -251152,7 +251708,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -251387,7 +251943,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -251494,9 +252050,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -251521,7 +252077,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028369466399567 CanvasRenderer: @@ -251797,7 +252353,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028369609139425 GameObject: @@ -251845,9 +252401,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -252023,14 +252579,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d448b4e73c3b9444d8559eca40029dfd, type: 3} + m_Sprite: {fileID: 21300000, guid: 3219b4ecaa97f44898f3804d963b932d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -252281,7 +252837,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7548028369747377802} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 374839933} + m_TargetAssemblyTypeName: SellMenu, Assembly-CSharp + m_MethodName: Clear + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!222 &7548028369747377813 CanvasRenderer: m_ObjectHideFlags: 0 @@ -252527,7 +253095,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: 5c601765e711949ab90711bc2d7e363e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -252551,10 +253119,10 @@ RectTransform: m_Father: {fileID: 7548028370002474470} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028369804255619 CanvasRenderer: @@ -252731,7 +253299,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: 5c601765e711949ab90711bc2d7e363e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -252755,10 +253323,10 @@ RectTransform: m_Father: {fileID: 7548028370799589681} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028369878513255 GameObject: @@ -252858,7 +253426,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028369935521301 GameObject: @@ -252906,9 +253474,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -253015,8 +253583,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -89, y: -112.99999} - m_SizeDelta: {x: 454.643, y: 307.083} + m_AnchoredPosition: {x: -104.99, y: -112.99999} + m_SizeDelta: {x: 300, y: 307.083} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028369996226535 GameObject: @@ -253111,7 +253679,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7548028370002474464} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 374839933} + m_TargetAssemblyTypeName: SellMenu, Assembly-CSharp + m_MethodName: ShowMaterialAmountSetter + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!222 &7548028370002474467 CanvasRenderer: m_ObjectHideFlags: 0 @@ -253132,6 +253712,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7548028369804255617} + - {fileID: 308532673} m_Father: {fileID: 7548028369761688995} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -253152,6 +253733,7 @@ GameObject: - component: {fileID: 7548028370002474467} - component: {fileID: 7548028370002474464} - component: {fileID: 7548028370002474465} + - component: {fileID: 7548028370002474472} m_Layer: 5 m_Name: Button_Item_Add (1) m_TagString: Untagged @@ -253159,6 +253741,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &7548028370002474472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7548028370002474471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!224 &7548028370036477040 RectTransform: m_ObjectHideFlags: 0 @@ -253211,7 +253819,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -253443,10 +254051,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 7548028369596807703} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 374839933} + m_TargetAssemblyTypeName: SellMenu, Assembly-CSharp + m_MethodName: CloseSellMenu + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -253688,7 +254296,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &7548028370104140002 MonoBehaviour: m_ObjectHideFlags: 0 @@ -253748,10 +254356,10 @@ RectTransform: m_Father: {fileID: 7548028369761688995} 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: 227.3215, y: -215} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028370104140012 CanvasRenderer: @@ -253824,7 +254432,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 16, y: 52.87} + m_AnchoredPosition: {x: 80.3, y: 52.87} m_SizeDelta: {x: 454.643, y: 371.68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028370160062033 @@ -254021,7 +254629,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -254120,9 +254728,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ab1340e03d37e4b4a8415ab1de2dd49c, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -254329,7 +254937,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -254410,6 +255018,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7548028370889035479} + - {fileID: 1253754302} m_Father: {fileID: 7548028369761688995} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -254430,6 +255039,7 @@ GameObject: - component: {fileID: 7548028370464226941} - component: {fileID: 7548028370464226930} - component: {fileID: 7548028370464226931} + - component: {fileID: 7548028370464226932} m_Layer: 5 m_Name: Button_Item_Add m_TagString: Untagged @@ -254510,7 +255120,45 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7548028370464226930} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 374839933} + m_TargetAssemblyTypeName: SellMenu, Assembly-CSharp + m_MethodName: ShowMaterialAmountSetter + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &7548028370464226932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7548028370464226929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!222 &7548028370464226941 CanvasRenderer: m_ObjectHideFlags: 0 @@ -254622,9 +255270,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -254649,7 +255297,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370521430471 GameObject: @@ -254689,9 +255337,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -254716,7 +255364,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028370533975299 CanvasRenderer: @@ -255003,7 +255651,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370603806089 GameObject: @@ -255051,9 +255699,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -255165,7 +255813,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -255238,7 +255886,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &7548028370622688182 MonoBehaviour: m_ObjectHideFlags: 0 @@ -255298,10 +255946,10 @@ RectTransform: m_Father: {fileID: 7548028369761688995} 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: 375.3215, y: -215} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028370635824481 CanvasRenderer: @@ -255349,9 +255997,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -255376,7 +256024,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &7548028370667485164 RectTransform: @@ -255395,7 +256043,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370667485165 GameObject: @@ -255443,9 +256091,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -255670,14 +256318,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 000a3c204a6224394a9327d3b30a448f, type: 3} + m_Sprite: {fileID: 21300000, guid: 3219b4ecaa97f44898f3804d963b932d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -256100,7 +256748,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7548028370799589683} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 374839933} + m_TargetAssemblyTypeName: SellMenu, Assembly-CSharp + m_MethodName: ShowMaterialAmountSetter + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!224 &7548028370799589681 RectTransform: m_ObjectHideFlags: 0 @@ -256113,6 +256773,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7548028369878513254} + - {fileID: 1495584246} m_Father: {fileID: 7548028369761688995} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -256171,6 +256832,7 @@ GameObject: - component: {fileID: 7548028370799589682} - component: {fileID: 7548028370799589683} - component: {fileID: 7548028370799589680} + - component: {fileID: 7548028370799589687} m_Layer: 5 m_Name: Button_Item_Add (11) m_TagString: Untagged @@ -256178,6 +256840,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &7548028370799589687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7548028370799589686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &7548028370846516208 MonoBehaviour: m_ObjectHideFlags: 0 @@ -256191,7 +256879,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -256349,6 +257037,7 @@ GameObject: - component: {fileID: 7548028370862993504} - component: {fileID: 7548028370862993505} - component: {fileID: 7548028370862993510} + - component: {fileID: 7548028370862993509} m_Layer: 5 m_Name: Button_Item_Add (10) m_TagString: Untagged @@ -256356,6 +257045,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &7548028370862993509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7548028370862993508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &7548028370862993510 MonoBehaviour: m_ObjectHideFlags: 0 @@ -256399,7 +257114,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7548028370862993505} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 374839933} + m_TargetAssemblyTypeName: SellMenu, Assembly-CSharp + m_MethodName: ShowMaterialAmountSetter + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!224 &7548028370862993511 RectTransform: m_ObjectHideFlags: 0 @@ -256412,6 +257139,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7548028371223728489} + - {fileID: 2124194101} m_Father: {fileID: 7548028369761688995} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -256466,9 +257194,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: 5c601765e711949ab90711bc2d7e363e, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -256490,10 +257218,10 @@ RectTransform: m_Father: {fileID: 7548028370464226928} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &7548028370915096916 RectTransform: @@ -256978,7 +257706,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -257067,9 +257795,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -257094,7 +257822,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028371050104479 GameObject: @@ -257210,7 +257938,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -257414,7 +258142,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -257524,7 +258252,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028371195535989 GameObject: @@ -257572,9 +258300,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: ab548893e9feb40e2b204bce3af3d421, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -257678,7 +258406,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09c10e1b81fe7479ea127968246db8e4, type: 3} + m_Sprite: {fileID: 21300000, guid: 5c601765e711949ab90711bc2d7e363e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -257702,10 +258430,10 @@ RectTransform: m_Father: {fileID: 7548028370862993511} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028371223728491 CanvasRenderer: diff --git a/Assets/Game/Scripts/DBmanager.cs b/Assets/Game/Scripts/DBmanager.cs index aa30f75f8..d3b54f51d 100644 --- a/Assets/Game/Scripts/DBmanager.cs +++ b/Assets/Game/Scripts/DBmanager.cs @@ -513,6 +513,26 @@ public class DBmanager : MonoBehaviour OnStateChanged.Invoke(); } + public async static void RemoveInventoryItem(string item) + { + InventoryEntry itemToRemove = null; + + foreach(InventoryEntry entry in inventory){ + if(entry.Item == item){ + itemToRemove = entry; + break; + } + } + if(itemToRemove!=null){ + inventory.Remove(itemToRemove); + }else{ + Debug.LogError("No entry to remove from inventory"); + } + + await UpdateInventoryToServer(); + OnStateChanged.Invoke(); + } + public async static Task UpdateInventoryToServer() { diff --git a/Assets/Game/Scripts/SellMenu.cs b/Assets/Game/Scripts/SellMenu.cs index 36cdf9ac9..db83ffd7f 100644 --- a/Assets/Game/Scripts/SellMenu.cs +++ b/Assets/Game/Scripts/SellMenu.cs @@ -14,6 +14,10 @@ public class SellMenu : MonoBehaviour public Transform inventoryParent; public Sprite emptySlotImage; + public Image selectedItemImg; + public string selectedItem; + + public Button sellBtn; [Header("Your Request Material Setter")] public GameObject yourReqPopup; public TMP_InputField coinsInput; @@ -24,7 +28,13 @@ public class SellMenu : MonoBehaviour public int gemsAmount; public int oxygenAmount; public int metalAmount; - public Image selectedItemImg; + public Sprite coinsIcon; + public Sprite gemsIcon; + public Sprite metalsIcon; + public Sprite oxygenIcon; + public Sprite addIcon; + public Transform resourceIconsParent; + void Start() { Refresh(); @@ -64,24 +74,107 @@ public class SellMenu : MonoBehaviour inventorySlots[i].interactable=false; } } + + if(resourceIconsParent.childCount < 4){ + Debug.LogError("Not enough buttons for your req section!"); + return; + } + int btnIndex = 0; + if(coinsAmount > 0){ + SetResourceSlot(btnIndex, coinsIcon, coinsAmount.ToString()); + btnIndex++; + }else{ + SetResourceSlot(btnIndex, addIcon, ""); + } + if(gemsAmount > 0){ + SetResourceSlot(btnIndex, gemsIcon, gemsAmount.ToString()); + btnIndex++; + }else{ + SetResourceSlot(btnIndex, addIcon, ""); + } + if(metalAmount > 0){ + SetResourceSlot(btnIndex, metalsIcon, metalAmount.ToString()); + btnIndex++; + }else{ + SetResourceSlot(btnIndex, addIcon, ""); + } + if(oxygenAmount > 0){ + SetResourceSlot(btnIndex, oxygenIcon, oxygenAmount.ToString()); + btnIndex++; + }else{ + SetResourceSlot(btnIndex, addIcon, ""); + } + + + for(int i = btnIndex; i < 4; i++){ + SetResourceSlot(i, addIcon, ""); + } + + sellBtn.interactable = (btnIndex > 0 && selectedItemImg.sprite != addIcon); + } + + void SetResourceSlot(int btnIndex,Sprite icon, string text){ + + resourceIconsParent.GetChild(btnIndex).GetChild(0).GetComponent().sprite = icon; + resourceIconsParent.GetChild(btnIndex).GetComponentInChildren(true).text = text; + + resourceIconsParent.GetChild(btnIndex).GetComponentInChildren(true).gameObject.SetActive((text.Length > 0)); + } public void ShowMaterialAmountSetter(){ + // Clear(); + + metalInput.text = metalAmount.ToString(); + oxygenInput.text = oxygenAmount.ToString(); + coinsInput.text = coinsAmount.ToString(); + gemsInput.text = gemsAmount.ToString(); + + yourReqPopup.gameObject.SetActive(true); + } + + public void OnSetClicked(){ + try{ + metalAmount = int.Parse(metalInput.text); + oxygenAmount= int.Parse(oxygenInput.text); + coinsAmount = int.Parse(coinsInput.text); + gemsAmount = int.Parse(gemsInput.text); + }catch{ + + } + + yourReqPopup.gameObject.SetActive(false); + Refresh(); + } + + public void OpenSellMenu(){ + Clear(); + gameObject.SetActive(true); } public void CloseSellMenu(){ gameObject.SetActive(false); - + Clear(); } public void Clear(){ metalAmount = coinsAmount = oxygenAmount = gemsAmount = 0; + selectedItemImg.sprite = addIcon; + selectedItem = ""; // selected Refresh(); } public void selectInventoryItem(InventoryItem item){ selectedItemImg.sprite = item.image; + selectedItem = item.itemName; + Refresh(); + } + + + public void Sell(){ + DBmanager.RemoveInventoryItem(selectedItem); + Clear(); } }