small changes

gilbertoalexsantos · Nov 26, 2023 · 0e95ce4 · 0e95ce4
1 parent bba15f3
commit 0e95ce4
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 52 deletions.
diff --git a/Assets/Project/Scripts/Builder/Editor/Builder.cs b/Assets/Project/Scripts/Builder/Editor/Builder.cs
@@ -30,11 +30,11 @@ private static void ExportPackageWithArgs(List<string> args)
     string outputPath = CommandLineUtils.GetArg("output_path", args);
     List<string> packagePaths = new()
     {
-      "Assets/com.bludea.BluToolbox",
+      "Assets/com.bludea.blutoolbox",
     };
 
     Log("BluToolbox Builder: Exporting package...");
-    string fileName = "build.unitypackage";
+    string fileName = "blutoolbox.unitypackage";
     AssetDatabase.ExportPackage(
       packagePaths.ToArray(), 
       fileName,

diff --git a/Assets/com.bludea.blutoolbox/Runtime/Either/Either.cs b/Assets/com.bludea.blutoolbox/Runtime/Either/Either.cs
@@ -36,20 +36,16 @@ public R Right
       }
     }
 
-    internal Either(Maybe<L> left, Maybe<R> right)
+    internal Either(L left)
     {
-      if (!left.HasValue && !right.HasValue)
-      {
-        throw new ArgumentException("Either left or right should have a valid value");
-      }
-
-      if (left.HasValue && right.HasValue)
-      {
-        throw new ArgumentException("Only left or only right should have a valid value");
-      }
+      _left = Maybe.Some(left);
+      _right = Maybe.None<R>();
+    }
 
-      _left = left;
-      _right = right;
+    internal Either(R right)
+    {
+      _left = Maybe.None<L>();
+      _right = Maybe.Some(right);
     }
   }
 }
diff --git a/Assets/com.bludea.blutoolbox/Runtime/Either/EitherExtensions.cs b/Assets/com.bludea.blutoolbox/Runtime/Either/EitherExtensions.cs
@@ -4,12 +4,12 @@ public static class EitherExtensions
   {
     public static Either<L, R> AsLeft<L, R>(this L value)
     {
-      return new Either<L, R>(value.Some(), Maybe.None<R>());
+      return new Either<L, R>(value);
     }
 
     public static Either<L, R> AsRight<L, R>(this R value)
     {
-      return new Either<L, R>(Maybe.None<L>(), value.Some());
+      return new Either<L, R>(value);
     }
   }
 }
diff --git a/Assets/com.bludea.blutoolbox/Runtime/Scheduler/IScheduler.cs b/Assets/com.bludea.blutoolbox/Runtime/Scheduler/IScheduler.cs
@@ -5,7 +5,7 @@ namespace BluToolbox
   public interface IScheduler
   {
     IDisposable Schedule(float seconds, Action callback);
-    IDisposable ScheduleOnce(float seconds, Action callback);
+    IDisposable ScheduleOnce(float delay, Action callback);
     IDisposable ScheduleEveryFrame(Action callback);
   }
 }
diff --git a/Assets/com.bludea.blutoolbox/Runtime/Scheduler/Impls/Scheduler/Scheduler.cs b/Assets/com.bludea.blutoolbox/Runtime/Scheduler/Impls/Scheduler/Scheduler.cs
@@ -51,9 +51,9 @@ public IDisposable Schedule(float seconds, Action callback)
       return scheduleSeconds;
     }
 
-    public IDisposable ScheduleOnce(float seconds, Action callback)
+    public IDisposable ScheduleOnce(float delay, Action callback)
     {
-      ScheduleSeconds scheduleSeconds = new ScheduleSeconds(seconds, false, _clock.SecondsSinceStartup, callback);
+      ScheduleSeconds scheduleSeconds = new ScheduleSeconds(delay, false, _clock.SecondsSinceStartup, callback);
       _schedules.Add(scheduleSeconds);
       return scheduleSeconds;
     }

diff --git a/Assets/com.bludea.blutoolbox/Tests/Runtime/com.bludea.blutoolbox.Tests.asmdef b/Assets/com.bludea.blutoolbox/Tests/Runtime/com.bludea.blutoolbox.Tests.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "com.bludea.blutoolbox.Runtime.te",
+    "name": "com.bludea.blutoolbox.Runtime.Tests",
     "rootNamespace": "",
     "references": [
         "GUID:91767d6d0600e4a599ee68d42ad0634e",

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,13 +1,14 @@
 {
   "dependencies": {
-    "com.unity.ai.navigation": "1.1.4",
-    "com.unity.collab-proxy": "2.0.5",
+    "com.unity.ai.navigation": "2.0.0",
+    "com.unity.collab-proxy": "2.2.0",
     "com.unity.feature.2d": "2.0.0",
-    "com.unity.ide.rider": "3.0.24",
-    "com.unity.test-framework": "1.3.7",
-    "com.unity.timeline": "1.8.2",
-    "com.unity.ugui": "1.0.0",
+    "com.unity.ide.rider": "3.0.26",
+    "com.unity.test-framework": "1.3.9",
+    "com.unity.timeline": "1.8.6",
+    "com.unity.ugui": "2.0.0",
     "com.unity.visualscripting": "1.8.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
@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "com.unity.2d.animation": {
-      "version": "10.0.2",
+      "version": "10.0.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.2d.common": "9.0.1",
+        "com.unity.2d.common": "9.0.2",
         "com.unity.2d.sprite": "1.0.0",
         "com.unity.collections": "1.2.4",
         "com.unity.modules.animation": "1.0.0",
@@ -14,7 +14,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.2d.aseprite": {
-      "version": "1.0.0",
+      "version": "1.0.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -26,15 +26,15 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.2d.common": {
-      "version": "9.0.1",
+      "version": "9.0.2",
       "depth": 2,
       "source": "registry",
       "dependencies": {
         "com.unity.2d.sprite": "1.0.0",
         "com.unity.mathematics": "1.1.0",
         "com.unity.modules.uielements": "1.0.0",
         "com.unity.modules.animation": "1.0.0",
-        "com.unity.burst": "1.8.3"
+        "com.unity.burst": "1.8.4"
       },
       "url": "https://packages.unity.com"
     },
@@ -46,11 +46,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.2d.psdimporter": {
-      "version": "9.0.0",
+      "version": "9.0.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.2d.common": "9.0.0",
+        "com.unity.2d.common": "9.0.2",
         "com.unity.2d.sprite": "1.0.0"
       },
       "url": "https://packages.unity.com"
@@ -62,12 +62,12 @@
       "dependencies": {}
     },
     "com.unity.2d.spriteshape": {
-      "version": "10.0.1",
+      "version": "10.0.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.mathematics": "1.1.0",
-        "com.unity.2d.common": "9.0.1",
+        "com.unity.2d.common": "9.0.2",
         "com.unity.modules.physics2d": "1.0.0"
       },
       "url": "https://packages.unity.com"
@@ -82,7 +82,7 @@
       }
     },
     "com.unity.2d.tilemap.extras": {
-      "version": "4.0.1",
+      "version": "4.0.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -94,7 +94,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ai.navigation": {
-      "version": "1.1.4",
+      "version": "2.0.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -103,7 +103,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.8.7",
+      "version": "1.8.10",
       "depth": 3,
       "source": "registry",
       "dependencies": {
@@ -112,7 +112,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
-      "version": "2.0.5",
+      "version": "2.2.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -129,7 +129,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "2.0.3",
+      "version": "2.0.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -140,18 +140,18 @@
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.2d.animation": "10.0.2",
+        "com.unity.2d.animation": "10.0.3",
         "com.unity.2d.pixel-perfect": "5.0.3",
-        "com.unity.2d.psdimporter": "9.0.0",
+        "com.unity.2d.psdimporter": "9.0.1",
         "com.unity.2d.sprite": "1.0.0",
-        "com.unity.2d.spriteshape": "10.0.1",
+        "com.unity.2d.spriteshape": "10.0.2",
         "com.unity.2d.tilemap": "1.0.0",
-        "com.unity.2d.tilemap.extras": "4.0.1",
-        "com.unity.2d.aseprite": "1.0.0"
+        "com.unity.2d.tilemap.extras": "4.0.2",
+        "com.unity.2d.aseprite": "1.0.1"
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.24",
+      "version": "3.0.26",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -167,7 +167,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.3.7",
+      "version": "1.3.9",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -178,7 +178,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.8.2",
+      "version": "1.8.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -190,7 +190,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
-      "version": "1.0.0",
+      "version": "2.0.0",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
@@ -208,6 +208,12 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.modules.accessibility": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,
@@ -255,6 +261,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,
@@ -343,7 +355,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/MultiplayerManager.asset b/ProjectSettings/MultiplayerManager.asset
@@ -0,0 +1,7 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!655991488 &1
+MultiplayerManager:
+  m_ObjectHideFlags: 0
+  m_EnableMultiplayerRoles: 0
+  m_ActiveMultiplayerRole: 0
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2023.1.6f1
-m_EditorVersionWithRevision: 2023.1.6f1 (964b2488c462)
+m_EditorVersion: 2023.2.1f1
+m_EditorVersionWithRevision: 2023.2.1f1 (a6dd9a634651)