Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions Assets/Samples/SavesDemo/Scripts/MenuUIController.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using UnityEngine;
using TaloGameServices;
using UnityEngine.UIElements;
using System;

namespace TaloSavesDemo
{
Expand Down Expand Up @@ -49,12 +50,13 @@ public void SetContinueButtonVisibility(DisplayStyle style)

private async void OnNewGameClick()
{
foreach (var cube in FindObjectsOfType<LoadableCube>())
foreach (var cube in FindObjectsByType<LoadableCube>(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);
Expand Down
4 changes: 2 additions & 2 deletions Packages/com.trytalo.talo/Runtime/Talo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static Player CurrentPlayer
private static ContinuityManager _continuity;
public static ContinuityManager Continuity => _continuity;

public static TaloSettings Settings => UnityEngine.Object.FindObjectOfType<TaloManager>().settings;
public static TaloSettings Settings => UnityEngine.Object.FindFirstObjectByType<TaloManager>().settings;

private static LiveConfig _liveConfig;

Expand Down Expand Up @@ -130,7 +130,7 @@ static Talo()
}
else
{
tm = UnityEngine.Object.FindObjectOfType<TaloManager>();
tm = UnityEngine.Object.FindFirstObjectByType<TaloManager>();
}

_crypto = new CryptoManager();
Expand Down
5 changes: 3 additions & 2 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
21 changes: 17 additions & 4 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
},
"com.unity.ext.nunit": {
"version": "2.0.3",
"version": "2.0.5",
"depth": 1,
"source": "registry",
"dependencies": {},
Expand All @@ -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": {
Expand All @@ -36,14 +36,20 @@
"url": "https://packages.unity.com"
},
"com.unity.ugui": {
"version": "1.0.0",
"version": "2.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -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)