From 71de4357ab7621d86c087f9f8fd9b0482afb871d Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:49:25 +0100
Subject: [PATCH 1/2] add leaderboard entry caching + update sample

---
 .../Scenes/LeaderboardsDemo.unity             | 26 ++++++--
 .../Scripts/LeaderboardUIController.cs        | 15 +----
 .../Runtime/LeaderboardsAPI.cs                | 23 +++++++
 .../Utils/LeaderboardEntriesManager.cs        | 37 +++++++++++
 .../Utils/LeaderboardEntriesManager.cs.meta   | 11 ++++
 UserSettings/EditorUserSettings.asset         |  6 +-
 UserSettings/Layouts/default-2022.dwlt        | 61 +++++++++++--------
 7 files changed, 134 insertions(+), 45 deletions(-)
 create mode 100644 Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs
 create mode 100644 Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs.meta

diff --git a/Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity b/Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity
index 9c57707..d3e9996 100644
--- a/Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity
+++ b/Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity
@@ -104,7 +104,7 @@ NavMeshSettings:
   serializedVersion: 2
   m_ObjectHideFlags: 0
   m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
     agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
@@ -117,7 +117,7 @@ NavMeshSettings:
     cellSize: 0.16666667
     manualTileSize: 0
     tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
     maxJobWorkers: 0
     preserveTilesOutsideBounds: 0
     debug:
@@ -164,13 +164,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 373737617}
+  serializedVersion: 2
   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: 0}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &373737620
 MonoBehaviour:
@@ -184,7 +184,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5d32f5ae2f5f7495cb77f079a21c54b0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  leaderboardName: uniq
+  leaderboardName: test-leaderboard
 --- !u!1 &497470367
 GameObject:
   m_ObjectHideFlags: 0
@@ -225,9 +225,17 @@ Camera:
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -261,11 +269,17 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 497470367}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 497470370}
+  - {fileID: 373737619}
diff --git a/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs b/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
index 631111b..b6a01ff 100644
--- a/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
+++ b/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
@@ -12,7 +12,6 @@ public class LeaderboardUIController : MonoBehaviour
     private VisualElement root;
     private ListView entriesList;
     private Label infoLabel;
-    private List<LeaderboardEntry> entries = new ();
 
     private async void Start()
     {
@@ -38,14 +37,6 @@ private async void OnPostClick()
         var score = Random.Range(0, 100);
         (LeaderboardEntry entry, bool updated) = await Talo.Leaderboards.AddEntry(leaderboardName, score);
 
-        var idx = entries.FindIndex((existingEntry) => existingEntry.playerAlias.id == entry.playerAlias.id);
-        if (idx != -1)
-        {
-            entries.RemoveAt(idx);
-        }
-
-        entries.Insert(entry.position, entry);
-
         infoLabel.text = $"You scored {score}.";
         if (updated) infoLabel.text += " Your highscore was updated!";
 
@@ -54,7 +45,7 @@ private async void OnPostClick()
 
     private void HandleListVisibility()
     {
-        if (entries.Count == 0)
+        if (Talo.Leaderboards.GetCachedEntries(leaderboardName).Count == 0)
         {
             infoLabel.text = "There are currently no entries";
         }
@@ -72,8 +63,6 @@ private async Task LoadEntries()
         do
         {
             var res = await Talo.Leaderboards.GetEntries(leaderboardName, page);
-            entries.AddRange(res.entries);
-
             page++;
             done = res.isLastPage;
         } while (!done);
@@ -89,6 +78,8 @@ private async Task LoadEntries()
             return label;
         };
 
+        var entries = Talo.Leaderboards.GetCachedEntries(leaderboardName);
+
         entriesList.bindItem = (e, i) =>
         {
             e.Q<Label>().text = $"{i+1}. {entries[i].playerAlias.identifier} - {entries[i].score}";
diff --git a/Packages/com.trytalo.talo/Runtime/LeaderboardsAPI.cs b/Packages/com.trytalo.talo/Runtime/LeaderboardsAPI.cs
index cadb89a..66ecb31 100644
--- a/Packages/com.trytalo.talo/Runtime/LeaderboardsAPI.cs
+++ b/Packages/com.trytalo.talo/Runtime/LeaderboardsAPI.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using UnityEngine;
 
@@ -6,14 +7,34 @@ namespace TaloGameServices
 {
     public class LeaderboardsAPI : BaseAPI
     {
+        private LeaderboardEntriesManager _entriesManager = new();
+
         public LeaderboardsAPI(TaloManager manager) : base(manager, "v1/leaderboards") { }
 
+        public List<LeaderboardEntry> GetCachedEntries(string internalName)
+        {
+            return _entriesManager.GetEntries(internalName);
+        }
+
+        public List<LeaderboardEntry> GetCachedEntriesForCurrentPlayer(string internalName)
+        {
+            Talo.IdentityCheck();
+
+            return _entriesManager.GetEntries(internalName).FindAll(e => e.playerAlias.id == Talo.CurrentAlias.id);
+        }
+
         public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, int page)
         {
             var uri = new Uri(baseUrl + $"/{internalName}/entries?page={page}");
 
             var json = await Call(uri, "GET");
             var res = JsonUtility.FromJson<LeaderboardEntriesResponse>(json);
+
+            foreach (var entry in res.entries)
+            {
+                _entriesManager.UpsertEntry(internalName, entry);
+            }
+
             return res;
         }
 
@@ -38,6 +59,8 @@ public async Task<LeaderboardEntriesResponse> GetEntriesForCurrentPlayer(string
             var json = await Call(uri, "POST", content);
             var res = JsonUtility.FromJson<LeaderboardEntryResponse>(json);
 
+            _entriesManager.UpsertEntry(internalName, res.entry);
+
             return (res.entry, res.updated);
         }
     }
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs b/Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs
new file mode 100644
index 0000000..a4aaca0
--- /dev/null
+++ b/Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+
+namespace TaloGameServices
+{
+    public class LeaderboardEntriesManager
+    {
+        private Dictionary<string, List<LeaderboardEntry>> _currentEntries = new Dictionary<string, List<LeaderboardEntry>>();
+
+        public List<LeaderboardEntry> GetEntries(string internalName)
+        {
+            if (_currentEntries.ContainsKey(internalName))
+            {
+                return _currentEntries[internalName];
+            }
+            return new List<LeaderboardEntry>();
+        }
+
+        public void UpsertEntry(string internalName, LeaderboardEntry entry)
+        {
+            if (!_currentEntries.ContainsKey(internalName))
+            {
+                _currentEntries[internalName] = new List<LeaderboardEntry>();
+            }
+            else
+            {
+                _currentEntries[internalName].RemoveAll(e => e.id == entry.id);
+            }
+
+            _currentEntries[internalName].Insert(entry.position, entry);
+
+            for (int idx = entry.position; idx < _currentEntries[internalName].Count; idx++)
+            {
+                _currentEntries[internalName][idx].position = idx;
+            }
+        }
+    }
+}
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs.meta b/Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs.meta
new file mode 100644
index 0000000..bab3420
--- /dev/null
+++ b/Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c6a8b3583da754157b34da615353a71f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 59551c3..cc655b5 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -9,13 +9,13 @@ EditorUserSettings:
       value: 5103525351515d5d0c560820477707471715407a787c76352c7b4a6bb3e2646b
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
+      value: 5a00005e56575e5a540c5b714377094914151a7c282b22662b2b4963e7b6643c
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5a00005e56575e5a540c5b714377094914151a7c282b22662b2b4963e7b6643c
+      value: 5657050456070d020e58592748775d1510154f2c792c7e657b7a4962e3b5663e
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5657050456070d020e58592748775d1510154f2c792c7e657b7a4962e3b5663e
+      value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt
index 2525d24..d5686a2 100644
--- a/UserSettings/Layouts/default-2022.dwlt
+++ b/UserSettings/Layouts/default-2022.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1800
     height: 1097
   m_ShowMode: 4
-  m_Title: Game
+  m_Title: Project
   m_RootView: {fileID: 6}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -48,7 +48,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 40
+  controlID: 89
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -94,8 +94,8 @@ MonoBehaviour:
     y: 0
     width: 338.5
     height: 621.5
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
@@ -111,7 +111,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: ProjectBrowser
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -120,14 +120,14 @@ MonoBehaviour:
     y: 621.5
     width: 1375
     height: 425.5
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
+  m_ActualView: {fileID: 12}
   m_Panes:
   - {fileID: 12}
   - {fileID: 17}
-  m_Selected: 1
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -223,7 +223,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 41
+  controlID: 90
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -248,7 +248,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 42
+  controlID: 37
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -321,7 +321,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Samples
+    - Assets/Samples/Playground/Scenes
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -329,16 +329,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Samples/AuthenticationDemo/UI
+  - Assets/Samples/Playground/Scenes
   m_LastFoldersGridSize: -1
   m_LastProjectPath: /Users/tudor/Documents/unity
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 10470000
-    m_LastClickedID: 18192
-    m_ExpandedIDs: 000000000e47000010470000124700001447000016470000184700001a4700001c4700001e47000020470000224700002447000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 63.00354}
+    m_SelectedIDs: 9a460000
+    m_LastClickedID: 18074
+    m_ExpandedIDs: 000000006c4600006e46000070460000724600007446000076460000784600007a4600007c4600007e460000804600008246000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -366,7 +366,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000000e47000010470000124700001447000016470000184700001a4700001c4700001e470000204700002247000024470000
+    m_ExpandedIDs: 000000006c4600006e46000070460000724600007446000076460000784600007a4600007c4600007e4600008046000082460000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -391,8 +391,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 50460000
-    m_LastClickedInstanceID: 18000
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c6230000
     m_RenameOverlay:
@@ -506,9 +506,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 50460000
-      m_LastClickedID: 18000
-      m_ExpandedIDs: 50faffff50460000
+      m_SelectedIDs: c4460000
+      m_LastClickedID: 0
+      m_ExpandedIDs: 2afaffff32fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -799,6 +799,19 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: UnityEditor.SceneViewCameraOverlay
+      index: 8
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
   m_Gizmos: 1

From 3ae47ebef9c4adc6e7cfe1ff4032173e45feda8b Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:58:01 +0100
Subject: [PATCH 2/2] 0.21.0

---
 Packages/com.trytalo.talo/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/com.trytalo.talo/package.json b/Packages/com.trytalo.talo/package.json
index 98ee4aa..f524038 100644
--- a/Packages/com.trytalo.talo/package.json
+++ b/Packages/com.trytalo.talo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.trytalo.talo",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "displayName": "Talo Game Services",
   "description": "Talo (https://trytalo.com) is an open-source game backend with services designed to help you build games faster. You can currently:\n\n- Identify and authenticate players\n- Store persistent data across players\n- Track events (levelling up, finding loot, etc)\n- Display high scores with leaderboards\n- Store and load player saves\n- Load game config options and flags from the cloud\n- Get feedback directly from your players",
   "unity": "2022.3",