diff --git a/Assets/Samples/SavesDemo/Scripts/MenuUIController.cs b/Assets/Samples/SavesDemo/Scripts/MenuUIController.cs index 5a31fbf..bfcd430 100644 --- a/Assets/Samples/SavesDemo/Scripts/MenuUIController.cs +++ b/Assets/Samples/SavesDemo/Scripts/MenuUIController.cs @@ -1,6 +1,7 @@ using UnityEngine; using TaloGameServices; using UnityEngine.UIElements; +using System; namespace TaloSavesDemo { @@ -49,12 +50,13 @@ public void SetContinueButtonVisibility(DisplayStyle style) private async void OnNewGameClick() { - foreach (var cube in FindObjectsOfType()) + foreach (var cube in FindObjectsByType(FindObjectsSortMode.None)) { cube.MoveToOriginalPos(); } - var save = await Talo.Saves.CreateSave($"Save {(Talo.Saves.Latest?.id ?? 0) + 1}"); + var date = DateTime.Now.ToString("ddd dd MMM HH:mm:ss"); + var save = await Talo.Saves.CreateSave($"Save created {date}"); Talo.Saves.ChooseSave(save.id); SendMessageUpwards("AddNewSaveToList", SendMessageOptions.RequireReceiver); diff --git a/Assets/Samples/SavesDemo/Settings/Panel Settings.asset b/Assets/Samples/SavesDemo/Settings/Panel Settings.asset index a70e1be..99c7987 100644 --- a/Assets/Samples/SavesDemo/Settings/Panel Settings.asset +++ b/Assets/Samples/SavesDemo/Settings/Panel Settings.asset @@ -13,9 +13,13 @@ MonoBehaviour: m_Name: Panel Settings m_EditorClassIdentifier: themeUss: {fileID: -4733365628477956816, guid: e0377916dba174af38fd1be6e27c9cca, type: 3} + m_DisableNoThemeWarning: 0 m_TargetTexture: {fileID: 0} + m_RenderMode: 0 + m_WorldSpaceLayer: 0 m_ScaleMode: 2 m_ReferenceSpritePixelsPerUnit: 100 + m_PixelsPerUnit: 100 m_Scale: 1 m_ReferenceDpi: 96 m_FallbackDpi: 96 @@ -24,9 +28,11 @@ MonoBehaviour: m_Match: 0 m_SortingOrder: 0 m_TargetDisplay: 0 + m_BindingLogLevel: 0 m_ClearDepthStencil: 1 m_ClearColor: 0 m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0} + m_VertexBudget: 0 m_DynamicAtlasSettings: m_MinAtlasSize: 64 m_MaxAtlasSize: 4096 @@ -35,4 +41,6 @@ MonoBehaviour: m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0} + m_ICUDataAsset: {fileID: 0} + forceGammaRendering: 0 textSettings: {fileID: 0} diff --git a/Packages/com.trytalo.talo/Runtime/APIs/SavesAPI.cs b/Packages/com.trytalo.talo/Runtime/APIs/SavesAPI.cs index 52de9cd..2388725 100644 --- a/Packages/com.trytalo.talo/Runtime/APIs/SavesAPI.cs +++ b/Packages/com.trytalo.talo/Runtime/APIs/SavesAPI.cs @@ -206,7 +206,10 @@ private GameSave UpdateOfflineSaves(GameSave incomingSave) else { // first entry into the saves file - offlineIncomingSave.id = -1; + if (offlineIncomingSave.id == 0) + { + offlineIncomingSave.id = -1; + } offlineContent = new OfflineSavesContent(new GameSave[] { offlineIncomingSave }); } diff --git a/Packages/com.trytalo.talo/Runtime/Talo.cs b/Packages/com.trytalo.talo/Runtime/Talo.cs index 2da7c15..0336f21 100644 --- a/Packages/com.trytalo.talo/Runtime/Talo.cs +++ b/Packages/com.trytalo.talo/Runtime/Talo.cs @@ -46,7 +46,7 @@ public static Player CurrentPlayer private static ContinuityManager _continuity; public static ContinuityManager Continuity => _continuity; - public static TaloSettings Settings => UnityEngine.Object.FindObjectOfType().settings; + public static TaloSettings Settings => UnityEngine.Object.FindFirstObjectByType().settings; private static LiveConfig _liveConfig; @@ -130,7 +130,7 @@ static Talo() } else { - tm = UnityEngine.Object.FindObjectOfType(); + tm = UnityEngine.Object.FindFirstObjectByType(); } _crypto = new CryptoManager(); diff --git a/Packages/com.trytalo.talo/package.json b/Packages/com.trytalo.talo/package.json index 21063df..5b10f63 100644 --- a/Packages/com.trytalo.talo/package.json +++ b/Packages/com.trytalo.talo/package.json @@ -1,9 +1,9 @@ { "name": "com.trytalo.talo", - "version": "0.28.0", + "version": "0.29.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", + "unity": "6000.0", "keywords": [], "author": { "name": "Talo", diff --git a/Packages/manifest.json b/Packages/manifest.json index e9bfc1d..70a3b6f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,8 +1,9 @@ { "dependencies": { "com.unity.ide.visualstudio": "2.0.22", - "com.unity.test-framework": "1.3.0", - "com.unity.ugui": "1.0.0", + "com.unity.test-framework": "1.4.5", + "com.unity.ugui": "2.0.0", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index dd74001..6149a48 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -9,7 +9,7 @@ } }, "com.unity.ext.nunit": { - "version": "2.0.3", + "version": "2.0.5", "depth": 1, "source": "registry", "dependencies": {}, @@ -25,7 +25,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.3.0", + "version": "1.4.5", "depth": 0, "source": "registry", "dependencies": { @@ -36,7 +36,7 @@ "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -44,6 +44,12 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -91,6 +97,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -179,7 +191,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d971767..76dad2c 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.28f1 -m_EditorVersionWithRevision: 2022.3.28f1 (6bae5ce6b222) +m_EditorVersion: 6000.0.28f1 +m_EditorVersionWithRevision: 6000.0.28f1 (f336aca0cab5)