From 2851cd2bcef85c083f46cc9f8945474bb0e09156 Mon Sep 17 00:00:00 2001 From: Oliver Balaam Date: Fri, 25 May 2018 13:38:08 +0100 Subject: [PATCH] Upgrade to use Unity SDK 1.0.1 --- .../Improbable.WorkerSdkCsharp.Framework.dll | Bin 14848 -> 14336 bytes ...robable.WorkerSdkCsharp.Framework.dll.meta | 4 ++-- .../Improbable.WorkerSdkCsharp.Framework.xml | 3 --- ...robable.WorkerSdkCsharp.Framework.xml.meta | 4 ++-- .../Dll/Improbable.WorkerSdkCsharp.dll.meta | 4 ++-- .../Dll/Improbable.WorkerSdkCsharp.xml.meta | 4 ++-- .../Sdk/Src/Unity/Core/ConnectionLifecycle.cs | 5 +++-- .../Sdk/Src/Unity/Core/SpatialOS.cs | 15 +++++++++++++-- .../Improbable/bin/UnityCodeGenerator.exe | Bin 140288 -> 140288 bytes 9 files changed, 24 insertions(+), 15 deletions(-) diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll index dba0954ebc05443ba62062e113fb718cfd239e68..6dc447e22908e4e7f673d3415945c8c46c47935b 100644 GIT binary patch delta 456 zcmX}pO(=tL90&04@7eQs*34d#ylZcgur0~L)}jfSkVdVABexxPROTYNu>KbmS1C?^ zIVdkD4uq>jT$~-eALM7Y{p#1h&$s{g@PD3kDxF;2Gz7BX51K#Ze&eTB^2z@qKNfN1t0u@>Ul~bD>$j#jLelPk Fr(Y^_W*z_l delta 610 zcmZ9JJ!n%=6vzMPd7m%Dk|yZG<^xF+H4maOYO$KOYW1lV5n7}OL20TfQj{hn(Lu$= z!4Bfka2>QDxQSRqxLDA^!9fQ_I|gkvg49iM5$hnH_ly}la6W$Lo zc-Yx~*X|$pJvs^;aVQ7$idyGt*-0Z_k>XC2JuR z20&N<$*o(u)u5KuHqL36f`B&@;*ruDpg6w@2wRL^E6kxB;c!tt5JeTyBbs)NWX6~Z zEf5eNJ_Zp3{49+h8a`}uUK3OAj5dSn@{6x~@;k2rQyp*h5wVMh99p7^_Zejna_Q5G zt4uwJH|Z%;FE+X4=w71_d;bz%t{fMAm~GN4rakCb|8Ivb>PM$Vvfw|E{M_m_#0hNYC*v!4mJO-p(9 De-register a user-defined callback for responding to an incoming command request. - - If no response is registered. - diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml.meta b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml.meta index a2c05a2..93b66cc 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml.meta +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 4abc765c01cbd4d3a9d44dfa4d32a22e -timeCreated: 1525947639 +guid: 8afb126da30e84bc58795da5a9707494 +timeCreated: 1527179057 licenseType: Pro TextScriptImporter: externalObjects: {} diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll.meta b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll.meta index 75ff248..bea2ba8 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll.meta +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 75459aafa1dd9482c88d918a1b2ecac0 -timeCreated: 1525947627 +guid: f50f3aee2e72440c190d326f6bbc58b0 +timeCreated: 1527179045 licenseType: Pro PluginImporter: externalObjects: {} diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml.meta b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml.meta index 95061bf..2f179dd 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml.meta +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 246630db4b1384339bc2ea8c1003b825 -timeCreated: 1525947639 +guid: 316c715d468cf44e6be0a43c27cfe5f5 +timeCreated: 1527179057 licenseType: Pro TextScriptImporter: externalObjects: {} diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Core/ConnectionLifecycle.cs b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Core/ConnectionLifecycle.cs index 69d56d4..9beba76 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Core/ConnectionLifecycle.cs +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Core/ConnectionLifecycle.cs @@ -149,8 +149,8 @@ private IEnumerator Connect() var connect = WorkerConnection.ConnectAsync(parameters, Deployment, AttachConnection); yield return connect; - SpatialOS.ConnectionWasSuccesful = Connection.IsConnected; - if (SpatialOS.ConnectionWasSuccesful) + SpatialOS.ConnectionWasSuccessful = Connection.IsConnected; + if (SpatialOS.ConnectionWasSuccessful) { logger = new LogSender(() => SpatialOS.IsConnected, Connection.SendLogMessage, SpatialOS.Configuration, SpatialOS.LogFilter); SetupComponents(); @@ -200,6 +200,7 @@ private void Update() // before calling the first OnDestroy). private void OnApplicationQuit() { + SpatialOS.SignalApplicationQuit(); Dispose(); } diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Core/SpatialOS.cs b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Core/SpatialOS.cs index 92aed84..bdb05ff 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Core/SpatialOS.cs +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Core/SpatialOS.cs @@ -50,7 +50,7 @@ static SpatialOS() }; } - internal static bool ConnectionWasSuccesful { get; set; } + internal static bool ConnectionWasSuccessful { get; set; } /// /// A callback that will be invoked when the deployment list has been retrieved from the Locator. @@ -691,10 +691,21 @@ internal static void Disconnected(DisconnectOp disconnectOp) receivedDisconnectOp = disconnectOp; Disconnecting = true; } + + internal static void SignalApplicationQuit() + { + if (!ConnectionWasSuccessful) + { + receivedDisconnectOp = new DisconnectOp + { + Reason = "An application quit signal was received." + }; + } + } internal static void SignalDisconnection() { - if (!ConnectionWasSuccesful) + if (!ConnectionWasSuccessful) { OnConnectionFailedInternal(); OnConnectionFailedWithReasonInternal(); diff --git a/workers/unity/Improbable/bin/UnityCodeGenerator.exe b/workers/unity/Improbable/bin/UnityCodeGenerator.exe index 838ded68714a07d47a82bda9845d58d02d719abd..32b38be177c7b897593d019d98efd01a4b8a5bcc 100644 GIT binary patch delta 2155 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 Cd*kQ;