From 6d616e7b235446c1cab1d3404de08df0c4a380cf Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Wed, 11 Feb 2026 13:34:59 -0700 Subject: [PATCH] Add golden berry to profile/stats menu, modify XP calculation and switch to new Profile endpoint --- Assets/Prefabs/ProfilePrefab.prefab | 338 +++++++++++++++++++++++++-- Assets/Scenes/StatsMenu.unity | 342 ++++++++++++++++++++++++++-- Assets/Scripts/LeaderboardsMenu.cs | 5 +- Assets/Scripts/Other/Endpoints.cs | 3 +- Assets/Scripts/ProfileMenu.cs | 44 ++-- Assets/Scripts/StatsMenu.cs | 2 + Assets/Scripts/Tools.cs | 10 +- Assets/Scripts/Types/Stats.cs | 4 + 8 files changed, 693 insertions(+), 55 deletions(-) diff --git a/Assets/Prefabs/ProfilePrefab.prefab b/Assets/Prefabs/ProfilePrefab.prefab index 169b12f..105a9e0 100644 --- a/Assets/Prefabs/ProfilePrefab.prefab +++ b/Assets/Prefabs/ProfilePrefab.prefab @@ -508,7 +508,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: 400, y: -50} + m_AnchoredPosition: {x: 309.14, y: -50} m_SizeDelta: {x: 74.86, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3216656956114003280 @@ -931,7 +931,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: 445.43, y: -50} + m_AnchoredPosition: {x: 400, y: -50} m_SizeDelta: {x: 74.86, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7464502830719977775 @@ -1222,6 +1222,158 @@ MonoBehaviour: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ContentSizeFitter m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &1610631970043459239 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1514837893154822219} + - component: {fileID: 8592323423517091375} + - component: {fileID: 1582997021820056722} + - component: {fileID: 8766635908993530285} + m_Layer: 5 + m_Name: Stat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1514837893154822219 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1610631970043459239} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4156511545220030910} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10.93, y: -50} + m_SizeDelta: {x: 21.86, y: 48} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8592323423517091375 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1610631970043459239} + m_CullTransparentMesh: 1 +--- !u!114 &1582997021820056722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1610631970043459239} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + 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: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4fd546dd0900395408d2de20f5025882, type: 2} + m_sharedMaterial: {fileID: -1476194838487357290, guid: 4fd546dd0900395408d2de20f5025882, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278250239 + m_fontColor: {r: 1, g: 0.91764706, b: 0, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 1 + m_fontSizeMax: 36 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_characterHorizontalScale: 1 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!114 &8766635908993530285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1610631970043459239} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ContentSizeFitter + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &1611794425295073584 GameObject: m_ObjectHideFlags: 0 @@ -3002,7 +3154,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: 263.71, y: -50} + m_AnchoredPosition: {x: 218.28, y: -50} m_SizeDelta: {x: 74.86, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5866934815358843387 @@ -3244,8 +3396,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281788927 - m_fontColor: {r: 1, g: 0.91204894, b: 0.21226418, a: 1} + rgba: 4278232004 + m_fontColor: {r: 0.76862746, g: 0.6392157, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3535,6 +3687,7 @@ MonoBehaviour: coinBerryStat: {fileID: 2734776843943180579} randomBerryStat: {fileID: 9107717758660923662} antiBerryStat: {fileID: 8063228603135536750} + goldenBerryStat: {fileID: 1582997021820056722} coinStat: {fileID: 8759674510683834313} playerNameText: {fileID: 5696062110796969975} playerIconImage: {fileID: 2070021138355354554} @@ -3885,7 +4038,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: 490.86, y: -50} + m_AnchoredPosition: {x: 400, y: -50} m_SizeDelta: {x: 74.86, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &693513044993370702 @@ -4701,6 +4854,7 @@ RectTransform: - {fileID: 5864059313227222951} - {fileID: 242819324179435233} - {fileID: 2697650154544868562} + - {fileID: 92044167806702842} m_Father: {fileID: 8368811176025763002} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -5330,8 +5484,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281788927 - m_fontColor: {r: 1, g: 0.9137255, b: 0.21176471, a: 1} + rgba: 4278232004 + m_fontColor: {r: 0.76862746, g: 0.6392157, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -6169,18 +6323,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5647846836955172929} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3816533673435248578} - {fileID: 4103024581459419519} - m_Father: {fileID: 1084337344187778159} + m_Father: {fileID: 6450616990089933850} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 218.28, y: -50} + m_AnchoredPosition: {x: 581.72, y: -50} m_SizeDelta: {x: 74.86, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1338632982439594321 @@ -6730,7 +6884,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: 354.57, y: -50} + m_AnchoredPosition: {x: 309.14, y: -50} m_SizeDelta: {x: 74.86, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5256104948640294782 @@ -8183,7 +8337,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: 536.29, y: -50} + m_AnchoredPosition: {x: 490.86, y: -50} m_SizeDelta: {x: 74.86, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6725324373913253934 @@ -8380,6 +8534,85 @@ MonoBehaviour: invert: 0 addMore: {r: 0.28235295, g: 0.28235295, b: 0.28235295, a: 0} reverseAdd: 0 +--- !u!1 &7828251048311221071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4156511545220030910} + - component: {fileID: 2104255833047740530} + - component: {fileID: 5445699492926337419} + m_Layer: 5 + m_Name: Stat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4156511545220030910 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7828251048311221071} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1514837893154822219} + - {fileID: 1595920139184367825} + m_Father: {fileID: 1084337344187778159} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 490.86, y: -50} + m_SizeDelta: {x: 74.86, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2104255833047740530 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7828251048311221071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.HorizontalLayoutGroup + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &5445699492926337419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7828251048311221071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ContentSizeFitter + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &8029112014749138681 GameObject: m_ObjectHideFlags: 0 @@ -8746,6 +8979,81 @@ MonoBehaviour: invert: 0 addMore: {r: 0, g: 0, b: 0, a: 0} reverseAdd: 0 +--- !u!1 &8365552626921157311 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1595920139184367825} + - component: {fileID: 1015702582017209899} + - component: {fileID: 6255316816424766696} + m_Layer: 5 + m_Name: Texture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1595920139184367825 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8365552626921157311} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4156511545220030910} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50.86, y: -50} + m_SizeDelta: {x: 48, y: 48} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1015702582017209899 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8365552626921157311} + m_CullTransparentMesh: 1 +--- !u!114 &6255316816424766696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8365552626921157311} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 21300000, guid: 4ab5bc43be230d64cabe2df932334461, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8499456073430390688 GameObject: m_ObjectHideFlags: 0 @@ -8994,7 +9302,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: 309.14, y: -50} + m_AnchoredPosition: {x: 218.28, y: -50} m_SizeDelta: {x: 74.86, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9010909478692428603 @@ -9311,10 +9619,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 92044167806702842} - {fileID: 8682910651610782189} - {fileID: 1925913610293912827} - {fileID: 5805357487255755339} + - {fileID: 4156511545220030910} - {fileID: 7678266279227986216} m_Father: {fileID: 8368811176025763002} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/StatsMenu.unity b/Assets/Scenes/StatsMenu.unity index e493bc2..b1129cd 100644 --- a/Assets/Scenes/StatsMenu.unity +++ b/Assets/Scenes/StatsMenu.unity @@ -382,7 +382,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: 511.28998, y: -50} + m_AnchoredPosition: {x: 465.86, y: -50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &113986351 @@ -615,7 +615,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: 375, y: -50} + m_AnchoredPosition: {x: 284.14, y: -50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &153846165 @@ -683,18 +683,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 360161882} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 112147154} - {fileID: 1612019693} - m_Father: {fileID: 442574386} + m_Father: {fileID: 471131656} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 193.28, y: -50} + m_AnchoredPosition: {x: 556.72, y: -50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &360161884 @@ -841,10 +841,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 360161883} - {fileID: 895967179} - {fileID: 153846164} - {fileID: 1021304901} + - {fileID: 557117876} - {fileID: 1520056480} m_Father: {fileID: 947116173} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -912,6 +912,7 @@ RectTransform: - {fileID: 1522280916} - {fileID: 1556998852} - {fileID: 113986350} + - {fileID: 360161883} m_Father: {fileID: 947116173} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -983,6 +984,7 @@ MonoBehaviour: coinBerryStat: {fileID: 781695888} randomBerryStat: {fileID: 1090220579} antiBerryStat: {fileID: 1053747956} + goldenBerryStat: {fileID: 974758892} coinStat: {fileID: 585371381} playerIcon: {fileID: 721797927} playerOverlay: {fileID: 1494895754} @@ -1005,6 +1007,85 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &557117875 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 557117876} + - component: {fileID: 557117878} + - component: {fileID: 557117877} + m_Layer: 5 + m_Name: Stat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &557117876 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557117875} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 974758890} + - {fileID: 1832385730} + m_Father: {fileID: 442574386} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 465.86, y: -50} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &557117877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557117875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ContentSizeFitter + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &557117878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557117875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.HorizontalLayoutGroup + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &585371378 GameObject: m_ObjectHideFlags: 0 @@ -1086,8 +1167,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281788927 - m_fontColor: {r: 1, g: 0.9137255, b: 0.21176471, a: 1} + rgba: 4278232004 + m_fontColor: {r: 0.76862746, g: 0.6392157, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1345,7 +1426,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: 238.70999, y: -50} + m_AnchoredPosition: {x: 193.28, y: -50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &668836256 @@ -1544,7 +1625,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 10.93, y: -50} - m_SizeDelta: {x: 21.86, y: 48} + m_SizeDelta: {x: 0, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &780556759 MonoBehaviour: @@ -1741,8 +1822,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281788927 - m_fontColor: {r: 1, g: 0.91204894, b: 0.21226418, a: 1} + rgba: 4278232004 + m_fontColor: {r: 0.76862746, g: 0.6392157, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2202,7 +2283,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: 284.14, y: -50} + m_AnchoredPosition: {x: 193.28, y: -50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &895967180 @@ -2524,6 +2605,158 @@ MonoBehaviour: invert: 0 addMore: {r: 0.3764706, g: 0.3764706, b: 0.3764706, a: 0} reverseAdd: 0 +--- !u!1 &974758889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 974758890} + - component: {fileID: 974758893} + - component: {fileID: 974758892} + - component: {fileID: 974758891} + m_Layer: 5 + m_Name: Stat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &974758890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 974758889} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 557117876} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10.93, y: -50} + m_SizeDelta: {x: 21.86, y: 48} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &974758891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 974758889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ContentSizeFitter + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &974758892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 974758889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + 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: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4fd546dd0900395408d2de20f5025882, type: 2} + m_sharedMaterial: {fileID: -1476194838487357290, guid: 4fd546dd0900395408d2de20f5025882, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278250239 + m_fontColor: {r: 1, g: 0.91764706, b: 0, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 1 + m_fontSizeMax: 36 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_characterHorizontalScale: 1 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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 &974758893 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 974758889} + m_CullTransparentMesh: 1 --- !u!1 &974762981 GameObject: m_ObjectHideFlags: 0 @@ -2635,7 +2868,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: 465.86, y: -50} + m_AnchoredPosition: {x: 375, y: -50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1021304902 @@ -4194,7 +4427,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: 329.57, y: -50} + m_AnchoredPosition: {x: 284.14, y: -50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1522280917 @@ -4273,7 +4506,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: 420.43, y: -50} + m_AnchoredPosition: {x: 375, y: -50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1556998853 @@ -4613,6 +4846,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762941877} m_CullTransparentMesh: 1 +--- !u!1 &1832385729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1832385730} + - component: {fileID: 1832385732} + - component: {fileID: 1832385731} + m_Layer: 5 + m_Name: Texture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1832385730 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1832385729} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 557117876} + 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: 48, y: 48} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1832385731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1832385729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 21300000, guid: 4ab5bc43be230d64cabe2df932334461, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1832385732 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1832385729} + m_CullTransparentMesh: 1 --- !u!1 &1894282576 GameObject: m_ObjectHideFlags: 0 @@ -4818,7 +5126,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 10.93, y: -50} - m_SizeDelta: {x: 21.86, y: 48} + m_SizeDelta: {x: 0, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1938765621 MonoBehaviour: diff --git a/Assets/Scripts/LeaderboardsMenu.cs b/Assets/Scripts/LeaderboardsMenu.cs index 801a1bc..14d0da0 100644 --- a/Assets/Scripts/LeaderboardsMenu.cs +++ b/Assets/Scripts/LeaderboardsMenu.cs @@ -186,7 +186,10 @@ public class LeaderboardsMenu : MonoBehaviour entry.Stats.TotalSlowBerries, entry.Stats.TotalUltraBerries, entry.Stats.TotalSpeedyBerries, - entry.Stats.TotalCoinBerries + entry.Stats.TotalCoinBerries, + entry.Stats.TotalRandomBerries, + entry.Stats.TotalAntiBerries, + entry.Stats.TotalGoldenBerries ); return new diff --git a/Assets/Scripts/Other/Endpoints.cs b/Assets/Scripts/Other/Endpoints.cs index d2398c8..90ed693 100644 --- a/Assets/Scripts/Other/Endpoints.cs +++ b/Assets/Scripts/Other/Endpoints.cs @@ -13,8 +13,7 @@ public class Endpoints public const string LEADERBOARDS_COIN_ENDPOINT = LEADERBOARDS_ENDPOINT + "/coin"; public const string LEADERBOARDS_LEGACY_ENDPOINT = LEADERBOARDS_ENDPOINT + "/legacy"; public const string LEADERBOARDS_TOTAL_ENDPOINT = LEADERBOARDS_ENDPOINT + "/total"; - public const string PROFILE_ENDPOINT = BERRYDASH_ENDPOINT + "/profile"; - public const string PROFILE_POSTS_ENDPOINT = PROFILE_ENDPOINT + "/posts"; + public const string PROFILE_POSTS_ENDPOINT = BERRYDASH_ENDPOINT + "/profile/posts"; public const string ICON_MARKETPLACE_ENDPOINT = BERRYDASH_ENDPOINT + "/icon-marketplace"; public const string ICON_MARKETPLACE_UPLOAD_ENDPOINT = ICON_MARKETPLACE_ENDPOINT + "/upload"; public const string ICON_MARKETPLACE_ICON_ENDPOINT = ICON_MARKETPLACE_ENDPOINT + "/icon"; diff --git a/Assets/Scripts/ProfileMenu.cs b/Assets/Scripts/ProfileMenu.cs index 618f52d..a5276e8 100644 --- a/Assets/Scripts/ProfileMenu.cs +++ b/Assets/Scripts/ProfileMenu.cs @@ -28,6 +28,7 @@ public class ProfileMenu : MonoBehaviour [SerializeField] private TMP_Text coinBerryStat; [SerializeField] private TMP_Text randomBerryStat; [SerializeField] private TMP_Text antiBerryStat; + [SerializeField] private TMP_Text goldenBerryStat; [SerializeField] private TMP_Text coinStat; [SerializeField] private TMP_Text playerNameText; [SerializeField] private Image playerIconImage; @@ -53,6 +54,7 @@ public class ProfileMenu : MonoBehaviour string coinBerries, string randomBerries, string antiBerries, + string goldenBerries, string coins, string playerName, BigInteger playerID, @@ -71,6 +73,7 @@ public class ProfileMenu : MonoBehaviour coinBerryStat.text = Tools.FormatWithCommas(coinBerries); randomBerryStat.text = Tools.FormatWithCommas(randomBerries); antiBerryStat.text = Tools.FormatWithCommas(antiBerries); + goldenBerryStat.text = Tools.FormatWithCommas(goldenBerries); coinStat.text = Tools.FormatWithCommas(coins); playerNameText.text = playerName; @@ -109,7 +112,7 @@ public class ProfileMenu : MonoBehaviour public async Task Init(BigInteger playerID) { if (BazookaManager.Instance.GetAccountID() == playerID) { await Init(); return; } - using UnityWebRequest request = UnityWebRequest.Get(Endpoints.PROFILE_ENDPOINT + "?userId=" + playerID.ToString()); + using UnityWebRequest request = UnityWebRequest.Get(Endpoints.BD_ACCOUNT_ENDPOINT + "?id=" + playerID.ToString() + "&exact=true"); request.SetRequestHeader("Requester", "BerryDashClient"); request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); @@ -125,27 +128,31 @@ public class ProfileMenu : MonoBehaviour var jsonResponse = JObject.Parse(response); if ((bool)jsonResponse["success"]) { - var iconColorArray = jsonResponse["data"]["iconColor"].Type == JTokenType.Null ? new JArray(255, 255, 255) : (JArray)jsonResponse["data"]["iconColor"]; - var overlayColorArray = jsonResponse["data"]["overlayColor"].Type == JTokenType.Null ? new JArray(255, 255, 255) : (JArray)jsonResponse["data"]["overlayColor"]; - var iconColor = new Color((int)iconColorArray[0] / 255f, (int)iconColorArray[1] / 255f, (int)iconColorArray[2] / 255f); - var overlayColor = new Color((int)overlayColorArray[0] / 255f, (int)overlayColorArray[1] / 255f, (int)overlayColorArray[2] / 255f); + + var data = jsonResponse["data"].ToObject(); + + var iconColorArray = data.BirdColor; + var overlayColorArray = data.OverlayColor; + var iconColor = new Color(iconColorArray[0] / 255f, iconColorArray[1] / 255f, iconColorArray[2] / 255f); + var overlayColor = new Color(overlayColorArray[0] / 255f, overlayColorArray[1] / 255f, overlayColorArray[2] / 255f); await Init( - (string)jsonResponse["data"]["stats"]["totalNormalBerries"], - (string)jsonResponse["data"]["stats"]["totalPoisonBerries"], - (string)jsonResponse["data"]["stats"]["totalSlowBerries"], - (string)jsonResponse["data"]["stats"]["totalUltraBerries"], - (string)jsonResponse["data"]["stats"]["totalSpeedyBerries"], - (string)jsonResponse["data"]["stats"]["totalCoinBerries"], - (string)jsonResponse["data"]["stats"]["totalRandomBerries"], - (string)jsonResponse["data"]["stats"]["totalAntiBerries"], - (string)jsonResponse["data"]["stats"]["coins"], - (string)jsonResponse["data"]["username"], + data.Stats.TotalNormalBerries.ToString(), + data.Stats.TotalPoisonBerries.ToString(), + data.Stats.TotalSlowBerries.ToString(), + data.Stats.TotalUltraBerries.ToString(), + data.Stats.TotalSpeedyBerries.ToString(), + data.Stats.TotalCoinBerries.ToString(), + data.Stats.TotalRandomBerries.ToString(), + data.Stats.TotalAntiBerries.ToString(), + data.Stats.TotalGoldenBerries.ToString(), + data.Stats.Coins.ToString(), + data.Username, playerID, - int.Parse(jsonResponse["data"]["icon"].Type == JTokenType.Null ? "1" : jsonResponse["data"]["icon"].ToString()), - int.Parse(jsonResponse["data"]["overlay"].Type == JTokenType.Null ? "0" : jsonResponse["data"]["overlay"].ToString()), + data.Icon, + data.Overlay, iconColor, overlayColor, - (string)jsonResponse["data"]["customIcon"] + data.CustomIcon ); } else @@ -173,6 +180,7 @@ public class ProfileMenu : MonoBehaviour BazookaManager.Instance.GetGameStoreTotalCoinBerries().ToString(), BazookaManager.Instance.GetGameStoreTotalRandomBerries().ToString(), BazookaManager.Instance.GetGameStoreTotalAntiBerries().ToString(), + BazookaManager.Instance.GetGameStoreTotalGoldenBerries().ToString(), customIconData.Balance.ToString(), BazookaManager.Instance.GetAccountName().ToString(), BazookaManager.Instance.GetAccountID() ?? 0, diff --git a/Assets/Scripts/StatsMenu.cs b/Assets/Scripts/StatsMenu.cs index 92caf0f..e41d64f 100644 --- a/Assets/Scripts/StatsMenu.cs +++ b/Assets/Scripts/StatsMenu.cs @@ -17,6 +17,7 @@ public class StatsMenu : MonoBehaviour [SerializeField] private TMP_Text coinBerryStat; [SerializeField] private TMP_Text randomBerryStat; [SerializeField] private TMP_Text antiBerryStat; + [SerializeField] private TMP_Text goldenBerryStat; [SerializeField] private TMP_Text coinStat; [SerializeField] private Image playerIcon; @@ -38,6 +39,7 @@ public class StatsMenu : MonoBehaviour coinBerryStat.text = Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalCoinBerries()); randomBerryStat.text = Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalRandomBerries()); antiBerryStat.text = Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalAntiBerries()); + goldenBerryStat.text = Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalGoldenBerries()); coinStat.text = Tools.FormatWithCommas(BazookaManager.Instance.GetCustomBirdIconData().Balance); var customIcon = BazookaManager.Instance.GetCustomBirdIconData().Selected; diff --git a/Assets/Scripts/Tools.cs b/Assets/Scripts/Tools.cs index 1059762..99954c4 100644 --- a/Assets/Scripts/Tools.cs +++ b/Assets/Scripts/Tools.cs @@ -78,7 +78,7 @@ public static class Tools return sb.ToString(); } - public static BigInteger CalculateXP(BigInteger normalBerries, BigInteger poisonBerries, BigInteger slowBerries, BigInteger ultraBerries, BigInteger speedyBerries, BigInteger coinBerries) + public static BigInteger CalculateXP(BigInteger normalBerries, BigInteger poisonBerries, BigInteger slowBerries, BigInteger ultraBerries, BigInteger speedyBerries, BigInteger coinBerries, BigInteger randomBerries, BigInteger antiBerries, BigInteger goldenBerries) { BigInteger totalXp = 0; totalXp += normalBerries; @@ -87,6 +87,9 @@ public static class Tools totalXp += ultraBerries * 5; totalXp += speedyBerries * 10; totalXp += coinBerries * 10; + totalXp += randomBerries; + totalXp -= antiBerries; + totalXp += goldenBerries * 4; if (totalXp < 0) totalXp = 0; return totalXp; } @@ -99,7 +102,10 @@ public static class Tools BazookaManager.Instance.GetGameStoreTotalSlowBerries(), BazookaManager.Instance.GetGameStoreTotalUltraBerries(), BazookaManager.Instance.GetGameStoreTotalSpeedyBerries(), - BazookaManager.Instance.GetGameStoreTotalCoinBerries() + BazookaManager.Instance.GetGameStoreTotalCoinBerries(), + BazookaManager.Instance.GetGameStoreTotalRandomBerries(), + BazookaManager.Instance.GetGameStoreTotalAntiBerries(), + BazookaManager.Instance.GetGameStoreTotalGoldenBerries() ); } diff --git a/Assets/Scripts/Types/Stats.cs b/Assets/Scripts/Types/Stats.cs index 86c3e65..dee96b9 100644 --- a/Assets/Scripts/Types/Stats.cs +++ b/Assets/Scripts/Types/Stats.cs @@ -41,6 +41,10 @@ public class Stats [JsonProperty("totalAntiBerries")] public BigInteger TotalAntiBerries { get; set; } + [Preserve] + [JsonProperty("totalGoldenBerries")] + public BigInteger TotalGoldenBerries { get; set; } + [Preserve] [JsonProperty("coins")] public BigInteger Coins { get; set; }