gg.easy.airship 0.1.2154 → 0.1.2156

package/Editor/BuildMenu.cs

@@ -1,6 +1,7 @@
 #if UNITY_EDITOR
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Profile;
@@ -186,7 +187,7 @@ namespace Editor {
 #endif
         }
 
-        public static void BuildIOSClient(bool development) {
+        public static void BuildIOSClient(bool development, bool staging) {
 #if UNITY_EDITOR_OSX
             OnBuild();
             CreateAssetBundles.ResetScenes();
@@ -198,6 +199,14 @@ namespace Editor {
             options.scenes = scenes;
             options.locationPathName = "build/client_ios";
             options.target = BuildTarget.iOS;
+
+            var extraDefines = new List<string>();
+            if (staging) {
+                extraDefines.Add("AIRSHIP_STAGING");
+                extraDefines.Add("AIRSHIP_INTERNAL");
+            }
+            options.extraScriptingDefines = extraDefines.ToArray();
+
             if (development == true) {
                 options.options = BuildOptions.Development;
             }
@@ -270,12 +279,26 @@ namespace Editor {
 #if AIRSHIP_PLAYER
         [MenuItem("Airship/Create Binary/Client/iOS", priority = 80)]
         public static void BuildIOSClientMenuItem() {
-            BuildIOSClient(false);
+            PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.Standalone, out var defines);
+            if (defines.Contains("AIRSHIP_STAGING")) {
+                var list = new List<string>(defines);
+                list.Remove("AIRSHIP_STAGING");
+                defines = list.ToArray();
+            }
+            PlayerSettings.SetScriptingDefineSymbols(NamedBuildTarget.Standalone, defines);
+
+            BuildIOSClient(false, false);
         }
 
         [MenuItem("Airship/Create Binary/Client/iOS (Development)", priority = 80)]
         public static void BuildIOSDevelopmentClientMenuItem() {
-            BuildIOSClient(true);
+            BuildIOSClient(true, false);
+        }
+
+        [MenuItem("Airship/Create Binary/Client/iOS (Staging)", priority = 80)]
+        public static void BuildIOSClientStagingMenuItem() {
+            Debug.Log("Building iOS staging client..");
+            BuildIOSClient(false, true);
         }
 
         [MenuItem("Airship/Create Binary/Client/Android", priority = 80)]

package/Editor/NetworkPrefabManager.cs

@@ -12,6 +12,7 @@ using UnityEditor.Search;
 using UnityEngine;
 using UnityEngine.Profiling;
 using Debug = UnityEngine.Debug;
+using Object = UnityEngine.Object;
 
 internal class AssetData {
     /** The asset's _full_ path. */
@@ -186,6 +187,10 @@ public class NetworkPrefabManager : AssetPostprocessor {
             var assetData = GetAssetDataFromPath(assetPath);
             WriteToCollection(nob, assetData, modifiedCollections);
         }
+        
+        // Automatically clean up the _game-specific_ collection.
+        var gameCollection = GetGameCollection();
+        RemoveInvalidEntries(gameCollection);
 
         // Save ALL collections.
         foreach (var collection in modifiedCollections) {
@@ -278,5 +283,30 @@ public class NetworkPrefabManager : AssetPostprocessor {
         AssetDatabase.Refresh();
         return newCollection;
     }
+
+    private static void RemoveInvalidEntries(NetworkPrefabCollection collection) {
+        var entriesToRemove = new List<Object>();
+        foreach (var prefab in collection.networkPrefabs) {
+            // This is checking for "Missing (Object)" and "None (Object)" references
+            // inside the collection.
+            if (prefab == null && !ReferenceEquals(prefab, null)) {
+                entriesToRemove.Add(prefab);
+                continue;
+            }
+            // This is checking for entries that do _not_ have a NetworkIdentity component
+            // attached to them.
+            GameObject pf = prefab as GameObject;
+            if (pf == null) continue;
+            NetworkIdentity ni = pf.GetComponent<NetworkIdentity>();
+            if (ni == null) {
+                entriesToRemove.Add(prefab);
+            }
+        }
+        foreach (var entry in entriesToRemove) {
+            collection.networkPrefabs.Remove(entry);
+        }
+        EditorUtility.SetDirty(collection);
+        AssetDatabase.SaveAssetIfDirty(collection);
+    }
 }
 #endif

package/Editor/Toolbar/EditorToolbar.cs

@@ -184,8 +184,11 @@ namespace Airship.Editor
                 FetchAndUpdateSignedInIcon();
             }
             EditorAuthManager.localUserChanged += (user) => {
+                signedInIcon = null;
+                signedInIconRaw = null;
+                signedInIconBytes = new byte[]{};
+                
                 if (EditorAuthManager.signInStatus != EditorAuthSignInStatus.SIGNED_IN) {
-                    signedInIconBytes = new byte[]{};
                     RepaintToolbar();
                     return;
                 }
@@ -199,8 +202,15 @@ namespace Airship.Editor
         }
         
         private static void FetchAndUpdateSignedInIcon() {
-            EditorAuthManager.DownloadProfilePicture().ContinueWith((t) => {
-                if (t.Result == null) return;
+            var task = EditorAuthManager.DownloadProfilePicture();
+            task.ContinueWith((t) => {
+                if (t.IsFaulted) {
+                    Debug.LogError("Failed to download profile picture: " + t.Exception);
+                    return;
+                }
+                if (t.Result == null) {
+                    return;
+                }
 
                 signedInIconRaw = t.Result;
                 GetSignedInIcon();
@@ -237,11 +247,15 @@ namespace Airship.Editor
         }
         
         private static Texture2D ResizeAndRoundTexture(Texture2D source, int targetWidth, int targetHeight) {
-            if (source == null || !source.isReadable) {
+            if (source == null) {
                 Debug.LogError("Unable to set signed in icon: Source texture is null or unreadable.");
                 return null;
             }
 
+            if (!source.isReadable) {
+                return source;
+            }
+
             // Downsize texture and round on CPU. There are problems when using Graphics.Blit to
             // create this texture (it may not be ready on startup and will cause crashes when not
             // ready).