Skip to content

Add flag to control retrieving archived leaderboard entries #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2025
Merged

Add flag to control retrieving archived leaderboard entries #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -185,6 +184,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leaderboardName: team-scores
includeArchived: 0
--- !u!1 &497470367
GameObject:
m_ObjectHideFlags: 0
Expand Down
7 changes: 5 additions & 2 deletions Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
public class LeaderboardUIController : MonoBehaviour
{
public string leaderboardName;
public bool includeArchived;

private VisualElement root;
private ListView entriesList;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions Packages/com.trytalo.talo/Runtime/APIs/LeaderboardsAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions Packages/com.trytalo.talo/Runtime/Entities/LeaderboardEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class LeaderboardEntry: EntityWithProps
public float score;
public PlayerAlias playerAlias;
public string updatedAt;
public string deletedAt;

public override string ToString()
{
Expand Down