From 8617a6a911e434868bd77439827e9faf04ce1341 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Tue, 18 Feb 2025 23:02:50 +0000
Subject: [PATCH] add flag to control retrieving archived leaderboard entries

---
 .../LeaderboardsDemo/Scenes/LeaderboardsDemo.unity | 14 +++++++-------
 .../Scripts/LeaderboardUIController.cs             |  7 +++++--
 .../Runtime/APIs/LeaderboardsAPI.cs                |  8 ++++----
 .../Runtime/Entities/LeaderboardEntry.cs           |  1 +
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity b/Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity
index 88114d4..7c8d4e2 100644
--- a/Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity
+++ b/Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 10
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -38,13 +38,12 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
-  m_GIWorkflowMode: 1
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -67,9 +66,6 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
     m_MixedBakeMode: 2
     m_BakeBackend: 1
@@ -157,6 +153,9 @@ MonoBehaviour:
   m_ParentUI: {fileID: 0}
   sourceAsset: {fileID: 9197481963319205126, guid: d1e06d9c0c11f42c18694163e9a5c4e5, type: 3}
   m_SortingOrder: 0
+  m_WorldSpaceSizeMode: 1
+  m_WorldSpaceWidth: 1920
+  m_WorldSpaceHeight: 1080
 --- !u!4 &373737619
 Transform:
   m_ObjectHideFlags: 0
@@ -185,6 +184,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leaderboardName: team-scores
+  includeArchived: 0
 --- !u!1 &497470367
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs b/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
index ffbf8b5..74140e2 100644
--- a/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
+++ b/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
@@ -8,6 +8,7 @@
 public class LeaderboardUIController : MonoBehaviour
 {
     public string leaderboardName;
+    public bool includeArchived;
 
     private VisualElement root;
     private ListView entriesList;
@@ -73,7 +74,7 @@ private async Task LoadEntries()
         {
             try
             {
-                var res = await Talo.Leaderboards.GetEntries(leaderboardName, page);
+                var res = await Talo.Leaderboards.GetEntries(leaderboardName, page, includeArchived: includeArchived);
                 page++;
                 done = res.isLastPage;
             }
@@ -107,7 +108,9 @@ private async Task LoadEntries()
         entriesList.bindItem = (e, i) =>
         {
             LeaderboardEntry entry = entriesList.itemsSource[i] as LeaderboardEntry;
-            e.Q<Label>().text = $"{i+1}. {entry.playerAlias.identifier} - {entry.score} ({entry.GetProp("team", "No")} team)";
+            var teamText = entry.GetProp("team", "No");
+            var archivedText = !string.IsNullOrEmpty(entry.deletedAt) ? " (archived)" : "";
+            e.Q<Label>().text = $"{i+1}. {entry.playerAlias.identifier} - {entry.score} ({teamText} team){archivedText}";
         };
 
         entriesList.itemsSource = Talo.Leaderboards.GetCachedEntries(leaderboardName);
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/LeaderboardsAPI.cs b/Packages/com.trytalo.talo/Runtime/APIs/LeaderboardsAPI.cs
index 071a66e..eb4c792 100644
--- a/Packages/com.trytalo.talo/Runtime/APIs/LeaderboardsAPI.cs
+++ b/Packages/com.trytalo.talo/Runtime/APIs/LeaderboardsAPI.cs
@@ -24,9 +24,9 @@ public List<LeaderboardEntry> GetCachedEntriesForCurrentPlayer(string internalNa
             return _entriesManager.GetEntries(internalName).FindAll(e => e.playerAlias.id == Talo.CurrentAlias.id);
         }
 
-        public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, int page, int aliasId = -1)
+        public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, int page, int aliasId = -1, bool includeArchived = false)
         {
-            var uri = new Uri($"{baseUrl}/{internalName}/entries?page={page}" + (aliasId != -1 ? $"&aliasId={aliasId}" : ""));
+            var uri = new Uri($"{baseUrl}/{internalName}/entries?page={page}" + (aliasId != -1 ? $"&aliasId={aliasId}" : "") + (includeArchived ? "&withDeleted=1" : ""));
             var json = await Call(uri, "GET");
 
             var res = JsonUtility.FromJson<LeaderboardEntriesResponse>(json);
@@ -39,10 +39,10 @@ public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, in
             return res;
         }
 
-        public async Task<LeaderboardEntriesResponse> GetEntriesForCurrentPlayer(string internalName, int page)
+        public async Task<LeaderboardEntriesResponse> GetEntriesForCurrentPlayer(string internalName, int page, bool includeArchived = false)
         {
             Talo.IdentityCheck();
-            return await GetEntries(internalName, page, Talo.CurrentAlias.id);
+            return await GetEntries(internalName, page, Talo.CurrentAlias.id, includeArchived);
         }
 
         public async Task<(LeaderboardEntry, bool)> AddEntry(string internalName, float score, params (string, string)[] propTuples)
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/LeaderboardEntry.cs b/Packages/com.trytalo.talo/Runtime/Entities/LeaderboardEntry.cs
index 24e12f6..d79f69e 100644
--- a/Packages/com.trytalo.talo/Runtime/Entities/LeaderboardEntry.cs
+++ b/Packages/com.trytalo.talo/Runtime/Entities/LeaderboardEntry.cs
@@ -10,6 +10,7 @@ public class LeaderboardEntry: EntityWithProps
         public float score;
         public PlayerAlias playerAlias;
         public string updatedAt;
+        public string deletedAt;
 
         public override string ToString()
         {