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 dba0954..6dc447e 100644 Binary files a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll and b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll differ diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll.meta b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll.meta index 18b2fec..cf343ad 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll.meta +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 56399360de91a451fb7faa63a0b5ad85 -timeCreated: 1526371276 +guid: 38634bd06f0d74b9fbb7b77b2a08b5d0 +timeCreated: 1527179045 licenseType: Pro PluginImporter: externalObjects: {} diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml index 58847e6..649a636 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml @@ -251,9 +251,6 @@ 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 abdfe8a..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: 5880e3a60622c43af92002156133abe8 -timeCreated: 1526371288 +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 05999ff..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: 753343e24982a4629979a569f313facd -timeCreated: 1526371276 +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 29e0771..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: 9abd6f18e22e54407b76452e6614370f -timeCreated: 1526371288 +guid: 316c715d468cf44e6be0a43c27cfe5f5 +timeCreated: 1527179057 licenseType: Pro TextScriptImporter: externalObjects: {} diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/EditorAddons.meta b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/EditorAddons.meta new file mode 100644 index 0000000..c9027b6 --- /dev/null +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/EditorAddons.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 39ec62496ded7374ea8721d0ccaf2165 +folderAsset: yes +timeCreated: 1515168837 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: 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/Assets/Plugins/Improbable/Sdk/Src/Unity/Unity.meta b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Unity.meta new file mode 100644 index 0000000..52f1faf --- /dev/null +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Unity.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 62c2d3638a93f0d48a69124481b9e216 +folderAsset: yes +timeCreated: 1471954949 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/workers/unity/Improbable/bin/UnityCodeGenerator.exe b/workers/unity/Improbable/bin/UnityCodeGenerator.exe index 838ded6..32b38be 100644 Binary files a/workers/unity/Improbable/bin/UnityCodeGenerator.exe and b/workers/unity/Improbable/bin/UnityCodeGenerator.exe differ