chore: remove manual protobuf and compilerservices.unsafe in favor of…

… importing from nuget
topfreegames · Sep 30, 2023 · 76133d2 · 76133d2
1 parent 445725e
commit 76133d2
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 70 deletions.
diff --git a/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/Google.Protobuf.3.24.3.dll b/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/Google.Protobuf.3.24.3.dll
diff --git a/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/Google.Protobuf.3.24.3.dll.meta b/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/Google.Protobuf.3.24.3.dll.meta
diff --git a/...sharp/NPitaya/Runtime/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.4.5.3.dll b/...sharp/NPitaya/Runtime/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.4.5.3.dll
diff --git a/.../NPitaya/Runtime/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.4.5.3.dll.meta b/.../NPitaya/Runtime/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.4.5.3.dll.meta
diff --git a/pitaya-sharp/NPitaya/package.json b/pitaya-sharp/NPitaya/package.json
@@ -1,10 +1,12 @@
 {
 	"name": "com.wildlifestudios.npitaya",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"unity": "2021.3",
 	"description": "Native pitaya server module",
 	"keywords": ["pitaya", "pomelo", "cluster", "server", "package", "search"],
 	"category": "Server",
 	"dependencies": {
+		"org.nuget.google.protobuf": "3.24.3",
+		"org.nuget.system.runtime.compilerservices.unsafe": "4.5.3"
 	}
 }
diff --git a/unity/Assets/LibPitayaExample.cs b/unity/Assets/LibPitayaExample.cs
@@ -126,8 +126,7 @@ private void SendRpcButtonClicked()
 		var msg = new Protos.RPCMsg {Msg = inputRPC.text};
 		try
         {
-            // var res = PitayaCluster.Rpc<Protos.RPCRes>(Route.FromString("csharp.testremote.remote"), msg);
-            var res = PitayaCluster.Rpc<Protos.RPCRes>(Route.FromString("room.room.test"), msg).Result;
+            var res = PitayaCluster.Rpc<Protos.RPCRes>(Route.FromString("room.room.message"), msg).Result;
             Debug.Log($"received rpc res: {res.Msg}");
         }
 		catch (Exception e)

diff --git a/unity/Packages/packages-lock.json b/unity/Packages/packages-lock.json
@@ -101,7 +101,52 @@
       "version": "file:../../pitaya-sharp/NPitaya",
       "depth": 0,
       "source": "local",
-      "dependencies": {}
+      "dependencies": {
+        "org.nuget.google.protobuf": "3.24.3",
+        "org.nuget.system.runtime.compilerservices.unsafe": "4.5.3"
+      }
+    },
+    "org.nuget.google.protobuf": {
+      "version": "3.24.3",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "org.nuget.system.memory": "4.5.3",
+        "org.nuget.system.runtime.compilerservices.unsafe": "4.5.2"
+      },
+      "url": "https://unitynuget-registry.azurewebsites.net"
+    },
+    "org.nuget.system.buffers": {
+      "version": "4.4.0",
+      "depth": 3,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://unitynuget-registry.azurewebsites.net"
+    },
+    "org.nuget.system.memory": {
+      "version": "4.5.3",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {
+        "org.nuget.system.buffers": "4.4.0",
+        "org.nuget.system.numerics.vectors": "4.4.0",
+        "org.nuget.system.runtime.compilerservices.unsafe": "4.5.2"
+      },
+      "url": "https://unitynuget-registry.azurewebsites.net"
+    },
+    "org.nuget.system.numerics.vectors": {
+      "version": "4.4.0",
+      "depth": 3,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://unitynuget-registry.azurewebsites.net"
+    },
+    "org.nuget.system.runtime.compilerservices.unsafe": {
+      "version": "4.5.3",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://unitynuget-registry.azurewebsites.net"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",