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 deleted file mode 100644 index 8c65d786..00000000 Binary files a/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/Google.Protobuf.3.24.3.dll and /dev/null differ 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 deleted file mode 100644 index ba7cbc88..00000000 --- a/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/Google.Protobuf.3.24.3.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 962e4cf9d3baa4478864e9e00bff0f61 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.4.5.3.dll b/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.4.5.3.dll deleted file mode 100644 index e7175109..00000000 Binary files a/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.4.5.3.dll and /dev/null differ diff --git a/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.4.5.3.dll.meta b/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.4.5.3.dll.meta deleted file mode 100644 index e1cca713..00000000 --- a/pitaya-sharp/NPitaya/Runtime/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.4.5.3.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 2badbd4ccafc14578ab1e81b431c1416 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 1 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/pitaya-sharp/NPitaya/package.json b/pitaya-sharp/NPitaya/package.json index 27b072e2..664943b6 100644 --- 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 index 6888a911..5b0d7f66 100644 --- 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(Route.FromString("csharp.testremote.remote"), msg); - var res = PitayaCluster.Rpc(Route.FromString("room.room.test"), msg).Result; + var res = PitayaCluster.Rpc(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 index ec1efd47..c0e410ef 100644 --- 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",