upgrade to unity 6

TaloDev · Nov 21, 2024 · b9f9725 · b9f9725
1 parent f871962
commit b9f9725
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git 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<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);

diff --git 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<TaloManager>().settings;
+        public static TaloSettings Settings => UnityEngine.Object.FindFirstObjectByType<TaloManager>().settings;
 
         private static LiveConfig _liveConfig;
 
@@ -130,7 +130,7 @@ static Talo()
             }
             else
             {
-                tm = UnityEngine.Object.FindObjectOfType<TaloManager>();
+                tm = UnityEngine.Object.FindFirstObjectByType<TaloManager>();
             }
 
             _crypto = new CryptoManager();

diff --git 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
@@ -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,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,
@@ -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
@@ -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)