upgraded to SpatialOS 11.1.0

Author: johnprobable

.gitignore

@@ -2,3 +2,4 @@ spatial.log
 spatialos_worker_packages.json
 build/
 logs/
+workers/unity/external-default-unityclient.log

README.md

@@ -4,7 +4,7 @@
 
 ---
 
-*Copyright Improbable Worlds Ltd, 2017*
+*Copyright (C) 2017 Improbable Worlds Limited. All rights reserved.*
 
 - *Accompanying tutorial*: [https://spatialos.improbable.io/docs/reference/latest/tutorials/pirates/lesson1](https://spatialos.improbable.io/docs/reference/latest/tutorials/pirates/lesson1)
 

snapshots/default.snapshot

@@ -1,8 +1,8 @@
 {
     "name": "your_project_name_here",
     "project_version": "1.0.0",
-    "sdk_version": "11.0.0",
+    "sdk_version": "11.1.0",
     "dependencies": [
-    	{"name": "standard_library", "version": "11.0.0"}
+    	{"name": "standard_library", "version": "11.1.0"}
     ]
 }

spatialos.json

@@ -1,14 +1,14 @@
-using System; // Used in lesson 8
-using Assets.Gamelogic.Core;
+using Assets.Gamelogic.Core;
 using Improbable.Core;
 using Improbable.Player;
 using Improbable.Ship;
 using Improbable.Unity.Core.Acls;
 using Improbable.Worker;
 using Improbable;
 using Improbable.Unity.Entity;
+using Random = UnityEngine.Random; // Used in lesson 2
+using System; // Used in lesson 2
 using UnityEngine;
-using Random = UnityEngine.Random; // Used in lesson 8
 
 namespace Assets.Gamelogic.EntityTemplates
 {

workers/unity/Assets/Gamelogic/EntityTemplates/EntityTemplateFactory.cs

@@ -25,7 +25,6 @@ public class PlayerInputController : MonoBehaviour
         void OnEnable()
         {
             cannonFirer = GetComponent<CannonFirer>();
-            SceneManager.UnloadSceneAsync(BuildSettings.SplashScreenScene);
         }
 
         void Update()

workers/unity/Assets/Gamelogic/Pirates/Behaviours/PlayerInputController.cs

@@ -0,0 +1,22 @@
+using UnityEngine;
+
+namespace Assets.Gamelogic.UI
+{
+    public class Spinner : MonoBehaviour
+    {
+        [SerializeField] private float rotationAmount = 270.0f;
+
+        // Update is called once per frame
+        void Update()
+        {
+            Vector3 rot = transform.rotation.eulerAngles;
+            rot.z = rot.z + rotationAmount * Time.deltaTime;
+            if (rot.z > 360)
+                rot.z -= 360;
+            else if (rot.z < 360)
+                rot.z += 360;
+
+            transform.eulerAngles = rot;
+        }
+    }
+}

workers/unity/Assets/Gamelogic/UI/CursorHoverEffect.cs

@@ -13,18 +13,22 @@ public class SplashScreenController : MonoBehaviour
         private GameObject NotReadyWarning;
         [SerializeField]
         private Button ConnectButton;
+        [SerializeField]
+        private GameObject Spinner;
 
 
         public void AttemptToConnect()
         {
-            DisableConnectButton();
-            AttemptConnection();
-        }
-
-        private void DisableConnectButton()
-        {
+            // Disable connect button
             ConnectButton.interactable = false;
-            ConnectButton.GetComponent<CursorHoverEffect>().ShowDefaultCursor();
+
+            // Hide warning if already shown
+            NotReadyWarning.SetActive(false);
+
+            // Start loading spinner
+            Spinner.SetActive(true);
+
+            AttemptConnection();
         }
 
         private void AttemptConnection()
@@ -35,6 +39,9 @@ private void AttemptConnection()
                 throw new Exception("Couldn't find Bootstrap script on GameEntry in UnityScene");
             }
             bootstrap.ConnectToClient();
+
+            // In case the client connection is successful this coroutine is destroyed as part of unloading
+            // the splash screen so ConnectionTimeout won't be called
             StartCoroutine(TimerUtils.WaitAndPerform(SimulationSettings.ClientConnectionTimeoutSecs, ConnectionTimeout));
         }
 
@@ -44,6 +51,8 @@ private void ConnectionTimeout()
             {
                 SpatialOS.Disconnect();
             }
+
+            Spinner.SetActive(false);
             NotReadyWarning.SetActive(true);
             ConnectButton.interactable = true;
         }