gg.easy.airship 0.1.2191 → 0.1.2192

package/Editor/AirshipComponentEditor.cs

@@ -942,7 +942,7 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                 var value = objectRefs.GetArrayElementAtIndex(index);
                 
                 var objOld = objectRefs.arraySize > index ? value.objectReferenceValue as AirshipComponent : null;
-                var objNew = AirshipScriptGUI.AirshipBehaviourField(rect, new GUIContent(label), script, objOld, value);
+                var objNew = AirshipScriptGUI.AirshipBehaviourField(rect, new GUIContent(label), arraySerializedProperty.serializedObject.targetObject, script, objOld, value);
                 if (objOld != objNew) {
                     value.objectReferenceValue = objNew;
                     arrayModified.boolValue = true;
@@ -1357,7 +1357,7 @@ public class ScriptBindingEditor : UnityEditor.Editor {
             return;
         }
         
-        var binding = AirshipScriptGUI.AirshipBehaviourField(guiContent, script, obj);
+        var binding = AirshipScriptGUI.AirshipBehaviourField(guiContent, obj.serializedObject.targetObject, script, obj);
         
         
         if (binding != null && target is AirshipComponent parentBinding && binding == parentBinding) {

package/Editor/AirshipEditors/AirshipCustomEditors.cs

@@ -235,7 +235,7 @@ public static class AirshipCustomEditors {
 
 
     internal static AirshipEditor GetComponentEditorForType(AirshipType airshipType, AirshipComponent component, AirshipSerializedObject serializedObject) {
-        if (!airshipType.AirshipBehaviour) return null;
+        if (airshipType.DeclarationType != AirshipDeclarationType.AirshipBehaviour) return null;
         var editorType = AirshipCustomEditors.GetEditorTypeForTypeName(airshipType.Name);
         var editor = AirshipCustomEditors.GetEditorForComponent(component, editorType, serializedObject);
         return editor;

package/Editor/AirshipEditors/AirshipSerializedObject.cs

@@ -35,7 +35,28 @@ public class AirshipSerializedObject {
 
     public AirshipType airshipType => AirshipBuildInfo.Instance.GetTypeByName(serializedName.stringValue);
     public AirshipComponent airshipComponent => (AirshipComponent)serializedObject.targetObject;
-
+    public UnityEngine.Object targetObject => serializedObject.targetObject;
+    
+    internal AirshipSerializedObject() {}
+    public AirshipSerializedObject(AirshipComponent component) => Update(null, new SerializedObject(component), component.metadata);
+    
+    [CanBeNull]
+    internal AirshipSerializedObject prefabAsset {
+        get {
+            if (PrefabUtility.IsPartOfPrefabInstance(serializedObject.targetObject)) {
+                var obj = new AirshipSerializedObject();
+                var original = (AirshipComponent) PrefabUtility.GetCorrespondingObjectFromOriginalSource(serializedObject.targetObject);
+                var serObj =
+                    new SerializedObject(original);
+                
+                obj.Update(this.editor, serObj, original.metadata);
+                return obj;
+            } else {
+                return null;
+            }
+        }
+    }
+    
     internal void Update(AirshipEditor currentEditor, SerializedObject currentSerializedObject, LuauMetadata currentMetadata) {
         _propertyCache.Clear();
         serializedObject = currentSerializedObject;
@@ -59,7 +80,7 @@ public class AirshipSerializedObject {
             if (propertyName == targetPropertyName) {
                 var propertyMetadata = metadata.FindProperty(targetPropertyName);
                
-                var airshipProperty = new AirshipSerializedProperty(property, propertyMetadata, this.editor);
+                var airshipProperty = new AirshipSerializedProperty(this, property, propertyMetadata, this.editor);
                 // _propertyCache.Add(targetPropertyName, airshipProperty);
                 return airshipProperty;
             }
@@ -80,7 +101,7 @@ public class AirshipSerializedObject {
             if (bindingPropertyIndex == -1) continue;
             var bindingProperty = metadata.properties[bindingPropertyIndex];
             
-            propertyList.Add(new AirshipSerializedProperty(property, bindingProperty, editor));
+            propertyList.Add(new AirshipSerializedProperty(this, property, bindingProperty, editor));
             indexDictionary.Add(bindingProperty.name, bindingPropertyIndex);
         }
 

package/Editor/AirshipEditors/Properties/{AirshipPropertyExtensions.cs → AirshipEditorExtensions.cs}

@@ -7,7 +7,7 @@ using Mono.WebBrowser;
 using UnityEditor;
 using UnityEngine;
 
-public static class AirshipPropertyExtensions {
+public static class AirshipEditorExtensions {
     public static UnityEngine.Object GetObject(this AirshipSerializedValue value) {
         if (value.type is AirshipSerializedType.AirshipBehaviour or AirshipSerializedType.Object) return value.objectReferenceValue;
         return null;
@@ -27,6 +27,40 @@ public static class AirshipPropertyExtensions {
         if (component.script.m_metadata == null) return null;
         return AirshipBuildInfo.Instance.GetTypeByName(component.script.m_metadata.name);
     }
+
+    private static IEnumerable<string> GetPathParts(Transform transform) {
+        var parent = transform;
+        while (parent != null) {
+            yield return parent.name;
+            parent = parent.transform.parent;
+        }
+    }
+
+    internal static string GetFullName(this GameObject gameObject) {
+        var parts = new List<string>();
+        parts.AddRange(GetPathParts(gameObject.transform));
+        parts.Reverse();
+        return "/" + string.Join("/", parts);
+    }
+
+    public static string NicifyName(this AirshipType type) {
+        return ObjectNames.NicifyVariableName(type.Name);
+    }
+    
+    /// <summary>
+    /// Grab the type of component of the given airship script, or null if no component attached to the script
+    /// </summary>
+    /// <param name="script"></param>
+    /// <returns></returns>
+    [CanBeNull]
+    public static AirshipType GetComponentType(this AirshipScript script) {
+        // TODO: Get types by path
+        if (script.m_metadata != null) {
+            return AirshipBuildInfo.Instance.GetTypeByPathAndName(script.assetPath, script.m_metadata.name);
+        }
+        
+        return null;
+    }
     
     /// <summary>
     /// Add the given AirshipBehaviour to the GameObject
@@ -40,7 +74,7 @@ public static class AirshipPropertyExtensions {
             throw new InvalidCastException("Cannot add invalid type");
         }
         
-        if (!type.AirshipBehaviour) return null;
+        if (type.DeclarationType != AirshipDeclarationType.AirshipBehaviour) return null;
         
         var airshipScript = type.Script;
         if (airshipScript == null) throw new InvalidCastException($"Found type without script - {type.UniqueId}");
@@ -60,7 +94,7 @@ public static class AirshipPropertyExtensions {
     [CanBeNull]
     public static AirshipComponent GetAirshipComponent(this GameObject gameObject, AirshipType type) {
         if (type == null) return null;
-        if (!type.AirshipBehaviour) return null;
+        if (type.DeclarationType != AirshipDeclarationType.AirshipBehaviour) return null;
         
         foreach (var airshipComponent in gameObject.GetComponents<AirshipComponent>()) {
             var componentType = airshipComponent.GetAirshipType();
@@ -80,7 +114,7 @@ public static class AirshipPropertyExtensions {
     /// <param name="type">The component type</param>
     /// <returns></returns>
     public static AirshipComponent[] GetAirshipComponents(this GameObject gameObject, AirshipType type) {
-        List<AirshipComponent> components = new List<AirshipComponent>();
+        var components = new List<AirshipComponent>();
         
         if (type == null) return null;
         foreach (var airshipComponent in gameObject.GetComponents<AirshipComponent>()) {
@@ -94,4 +128,34 @@ public static class AirshipPropertyExtensions {
 
         return components.ToArray();
     }
+    
+    public static AirshipComponent GetAirshipComponentInChildren(this GameObject gameObject, AirshipType type) {
+        if (type == null) return null;
+        foreach (var airshipComponent in gameObject.GetComponentsInChildren<AirshipComponent>()) {
+            var componentType = airshipComponent.GetAirshipType();
+            if (componentType == null) continue; 
+            
+            if (airshipComponent.GetAirshipType() == type) {
+                return airshipComponent;
+            }
+        }
+
+        return null;
+    }
+    
+    public static AirshipComponent[] GetAirshipComponentsInChildren(this GameObject gameObject, AirshipType type) {
+        var components = new List<AirshipComponent>();
+        
+        if (type == null) return null;
+        foreach (var airshipComponent in gameObject.GetComponentsInChildren<AirshipComponent>()) {
+            var componentType = airshipComponent.GetAirshipType();
+            if (componentType == null) continue; 
+            
+            if (airshipComponent.GetAirshipType() == type) {
+                components.Add(airshipComponent);
+            }
+        }
+
+        return components.ToArray();
+    }
 }

package/Editor/AirshipEditors/Properties/AirshipSerializedArrayValue.cs

@@ -1,6 +1,8 @@
 using UnityEditor;
 
 public class AirshipSerializedArrayValue : AirshipSerializedValue {
+    
+    
     public AirshipSerializedArrayValue(AirshipSerializedProperty parentSerializedProperty, int index, SerializedProperty valueProperty, SerializedProperty objectValueProperty) {
         serializedModified = parentSerializedProperty.serializedModified;
 
@@ -17,5 +19,7 @@ public class AirshipSerializedArrayValue : AirshipSerializedValue {
         decorators = parentSerializedProperty.propertyMetadata.GetDecorators();
 
         this.editor = parentSerializedProperty.editor;
+
+        serializedObject = parentSerializedProperty.serializedObject;
     }
 }

package/Editor/AirshipEditors/Properties/AirshipSerializedProperty.cs

@@ -49,12 +49,13 @@ public class AirshipSerializedProperty : AirshipSerializedValue {
         }
     }
     
-    public AirshipSerializedProperty(SerializedProperty property, LuauMetadataProperty metadata, AirshipEditor editor) {
+    public AirshipSerializedProperty(AirshipSerializedObject serializedObject, SerializedProperty property, LuauMetadataProperty metadata, AirshipEditor editor) {
         serializedProperty = property;
         UpdateProperty();
         propertyMetadata = metadata;
         decorators = metadata.GetDecorators();
         this.editor = editor;
+        this.serializedObject = serializedObject;
     }
     
     internal void UpdateProperty() {

package/Editor/AirshipEditors/Properties/AirshipSerializedValue.cs

@@ -71,7 +71,8 @@ public abstract class AirshipSerializedValue {
     internal SerializedProperty serializedObjectType { get; set; }
     internal SerializedProperty serializedObjectValue { get; set; }
     internal LuauMetadataProperty propertyMetadata { get; set; }
-    
+    public AirshipSerializedObject serializedObject { get; protected set; }
+
     internal AirshipEditor editor { get; set; }
     
     public string name => serializedName.stringValue;

package/Editor/AirshipScriptGUI.cs

@@ -4,6 +4,7 @@ using Editor.EditorInternal;
 using JetBrains.Annotations;
 using Luau;
 using UnityEditor;
+using UnityEditor.SceneManagement;
 using UnityEditor.Search;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -44,6 +45,7 @@ namespace Code.Luau {
             Rect dropRect, 
             int id, 
             AirshipScript script, 
+            UnityEngine.Object objectBeingEdited,
             [CanBeNull] AirshipComponent airshipComponent, 
             SerializedProperty property,
             bool allowSceneObjects,
@@ -116,29 +118,11 @@ namespace Code.Luau {
                         if (GUI.enabled) {
                             GUIUtility.keyboardControl = id;
 
-                            var searchContext = SearchService.CreateContext(string.Empty);
-                            var view = SearchService.ShowPicker(
-                                searchContext,
-                                (item, b) => {
-                                    var obj = item.ToObject<AirshipComponent>();
-                                    if (obj != null) {
-                                        onObjectSelected?.Invoke(obj);
-                                    }
-
-                                    GUI.changed = true;
-                                },
-                                item => {
-                                    var obj = item.ToObject<AirshipComponent>();
-                                    if (obj != null) {
-                                        EditorGUIUtility.PingObject(obj);
-                                    }
-                                },
-                                item => {
-                                    var itemScriptBinding = item.ToObject<AirshipComponent>();
-                                    return itemScriptBinding != null && IsBindableAsComponent(itemScriptBinding, script);
-                                }, null, script.m_metadata?.displayName ?? "AirshipBehaviour");
-                            view.SetSearchText($"h:t:AirshipComponent airshipcomponent.script=\"{script.assetPath}\""); // #m_fileFullPath={script.m_path}
-
+                            var componentType = script.GetComponentType();
+                            if (componentType != null) {
+                                var context = new AirshipComponentSelectionContext(objectBeingEdited, componentType, obj as AirshipComponent);
+                                AirshipComponentSelectorWindow.Show(context, null, onObjectSelected);
+                            }
                             evt.Use();
                             GUIUtility.ExitGUI();
                         }
@@ -215,37 +199,39 @@ namespace Code.Luau {
             return (AirshipComponent) obj;
         }
         
-        internal static AirshipComponent AirshipBehaviourField(Rect rect, GUIContent content, AirshipScript script, AirshipComponent airshipComponent, SerializedProperty property) {
+        internal static AirshipComponent AirshipBehaviourField(
+            Rect rect, GUIContent content, UnityEngine.Object objectBeingEdited, AirshipScript script, AirshipComponent airshipComponent, SerializedProperty property) {
             int id = GUIUtility.GetControlID("_airshipBehaviourFieldHash".GetHashCode(), FocusType.Keyboard, rect);
             
             rect = EditorGUI.PrefixLabel(rect, id, content);
             var value = DoAirshipBehaviourField(
-                rect, rect, id, script, airshipComponent, property, true,
+                rect, rect, id, script, objectBeingEdited, airshipComponent, property, true,
                 binding => {
                     if (property != null) {
                         property.objectReferenceValue = binding;
+                        property.serializedObject.ApplyModifiedProperties();
                     }
                 },
                 () => {
-                    Debug.Log("Remove object " + property.objectReferenceValue);
                     property.objectReferenceValue = null;
+                    property.serializedObject.ApplyModifiedProperties();
                 });
             
             return value;
         }
         
-        public static AirshipComponent AirshipBehaviourField(Rect r, GUIContent content, AirshipScript script, AirshipComponent airshipComponent) {
-            return AirshipBehaviourField(r, content, script, airshipComponent, null);
+        public static AirshipComponent AirshipBehaviourField(Rect r, GUIContent content, UnityEngine.Object objectBeingEdited, AirshipScript script, AirshipComponent airshipComponent) {
+            return AirshipBehaviourField(r, content,objectBeingEdited, script, airshipComponent,  null);
         }
 
-        internal static AirshipComponent AirshipBehaviourField(GUIContent content, AirshipScript script, SerializedProperty property) {
+        internal static AirshipComponent AirshipBehaviourField(GUIContent content, UnityEngine.Object objectBeingEdited, AirshipScript script, SerializedProperty property) {
             var r = EditorGUILayout.GetControlRect(false, ObjectField.singleLineHeight);
-            return AirshipBehaviourField(r, content, script, (AirshipComponent) property.objectReferenceValue, property);
+            return AirshipBehaviourField(r, content,objectBeingEdited, script, (AirshipComponent) property.objectReferenceValue, property);
         }
         
-        public static AirshipComponent AirshipBehaviourField(GUIContent content, AirshipScript script, AirshipComponent airshipComponent) {
+        public static AirshipComponent AirshipBehaviourField(GUIContent content, UnityEngine.Object objectBeingEdited, AirshipScript script, AirshipComponent airshipComponent) {
             var r = EditorGUILayout.GetControlRect(false, ObjectField.singleLineHeight);
-            return AirshipBehaviourField(r, content, script, airshipComponent, null);
+            return AirshipBehaviourField(r, content,objectBeingEdited, script, airshipComponent, null);
         }
 
         internal static Sprite AirshipSpriteField(Rect position, GUIContent content, Sprite sprite) {

package/Editor/EditorInternal/AirshipEditorInternals.cs

@@ -1,7 +1,10 @@
 using System;
+using System.Collections.Generic;
 using UnityEditor;
+using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.SceneManagement;
 
 namespace Editor.EditorInternal {
     public class AirshipEditorInternals {
@@ -15,8 +18,23 @@ namespace Editor.EditorInternal {
             return EditorGUIUtility.GetBoldDefaultFont();
         }
 
-        internal static void ShowObjectSelector(UnityEngine.Object obj, Type objectTypes, UnityEngine.Object objBeingEdited, bool allowSceneObjects) {
-            ObjectSelector.get.Show(obj, objectTypes,objBeingEdited, allowSceneObjects);
+        // internal static void ShowObjectSelector(UnityEngine.Object obj, Type objectTypes, UnityEngine.Object objBeingEdited, bool allowSceneObjects) {
+        //     ObjectSelector.get.Show(obj, objectTypes,objBeingEdited, allowSceneObjects);
+        // }
+
+        internal static void ShowObjectSelector(UnityEngine.Object obj,
+            System.Type requiredType,
+            UnityEngine.Object objectBeingEdited,
+            bool allowSceneObjects,
+            List<int> allowedInstanceIDs = null,
+            Action<UnityEngine.Object> onObjectSelectorClosed = null,
+            Action<UnityEngine.Object> onObjectSelectedUpdated = null,
+            bool showNoneItem = true) {
+            ObjectSelector.get.Show(obj, requiredType, objectBeingEdited, allowSceneObjects, allowedInstanceIDs, onObjectSelectorClosed, onObjectSelectedUpdated);
+        }
+
+        internal static Scene GetObjectScene() {
+            return default;
         }
 
         internal static UnityEngine.Object DoCustomObjectField(Rect position, GUIContent label,

package/Editor/Publish/Deploy.cs

@@ -33,6 +33,12 @@ public class UploadInfo {
 }
 
 public class Deploy {
+	enum DeployAuthType {
+		None,
+		DeployKey,
+		EditorAuthToken,
+	}
+	
 	private static Dictionary<string, UploadInfo> uploadProgress = new();
 	private static GameDto activeDeployTarget;
 	public const ulong MAX_UPLOAD_KB = 500_000;
@@ -88,8 +94,20 @@ public class Deploy {
 		EditorCoroutines.Execute((BuildAndDeploy(AirshipPlatformUtil.livePlatforms, false, false)));
 	}
 
+	private static string GetDeployKey(DeployAuthType authType) {
+		switch (authType) {
+			case DeployAuthType.DeployKey:
+				return AuthConfig.instance.deployKey;
+			case DeployAuthType.EditorAuthToken:
+				return InternalHttpManager.editorAuthToken;
+			case DeployAuthType.None:
+				return null;
+		}
+		throw new Exception($"[Airship] Unknown auth type: {authType}");
+	}
+
 	private static IEnumerator BuildAndDeploy(AirshipPlatform[] platforms, bool skipBuild = false, bool useCache = true, bool dontUpload = false) {
-		var possibleKeys = new List<string>() { AuthConfig.instance.deployKey, InternalHttpManager.editorAuthToken };
+		var possibleKeys = new List<string> { GetDeployKey(DeployAuthType.DeployKey), GetDeployKey(DeployAuthType.EditorAuthToken) };
 		possibleKeys.RemoveAll(string.IsNullOrEmpty);
 		if (possibleKeys.Count == 0) {
 			Debug.LogError("[Airship]: You aren't signed in. You can sign in by going to Airship->Sign in");
@@ -171,7 +189,7 @@ public class Deploy {
 		} else if (useSplitCodeBundle) {
 			var compileFlags = TypeScriptCompileFlags.Publishing 
 			                   | TypeScriptCompileFlags.DisplayProgressBar 
-			                   | TypeScriptCompileFlags.SkipPackages 
+			                   | TypeScriptCompileFlags.CodeOnlyPublish 
 			                   | TypeScriptCompileFlags.SkipReimportQueue; // skipping packages in the bg
 			
 			TypescriptCompilationService.BuildTypescript(compileFlags);
@@ -185,7 +203,7 @@ public class Deploy {
 
 		// Create deployment
 		DeploymentDto deploymentDto = null;
-		string devKey = null;
+		var deployAuthType = DeployAuthType.None;
 		{
 			List<string> platformStrings = new();
 			platformStrings.Add("Mac");
@@ -195,8 +213,12 @@ public class Deploy {
 				platformStrings.Add("Android");
 			}
 			var packageSlugs = gameConfig.packages.Select((p) => p.id);
-			for (int i = 0; i < possibleKeys.Count; i++) {
-				devKey = possibleKeys[i];
+			var authTypes = Enum.GetValues(typeof(DeployAuthType)).Cast<DeployAuthType>().ToList();
+			for (var i = 0; i < authTypes.Count; i++) {
+				deployAuthType = authTypes[i];
+				var key = GetDeployKey(deployAuthType);
+				if (string.IsNullOrEmpty(key)) continue;
+				
 				using UnityWebRequest req = UnityWebRequest.Post(
 					$"{AirshipPlatformUrl.deploymentService}/game-versions/create-deployment", JsonUtility.ToJson(
 						new CreateGameDeploymentDto() {
@@ -208,7 +230,7 @@ public class Deploy {
 							packageSlugs = packageSlugs.ToArray(),
 							platforms = platformStrings.ToArray(),
 						}), "application/json");
-				req.SetRequestHeader("Authorization", "Bearer " + devKey);
+				req.SetRequestHeader("Authorization", "Bearer " + key);
 				yield return req.SendWebRequest();
 				while (!req.isDone) {
 					yield return null;
@@ -230,7 +252,7 @@ public class Deploy {
 		}
 		
 		// We shouldn't get here. It will fail above.
-		if (deploymentDto == null || devKey == null) {
+		if (deploymentDto == null || deployAuthType == DeployAuthType.None) {
 			Debug.LogError("No valid authorization.");
 			yield break;
 		}
@@ -250,21 +272,21 @@ public class Deploy {
 				paths.Add(path);
 			}
 			
-			var airshipBuildInfoGuids = AssetDatabase.FindAssets("t:" + nameof(AirshipBuildInfo));
-			foreach (var guid in airshipBuildInfoGuids) {
-				var path = AssetDatabase.GUIDToAssetPath(guid).ToLower();
-				paths.Add(path);
-			}
+			// var airshipBuildInfoGuids = AssetDatabase.FindAssets("t:" + nameof(AirshipBuildInfo));
+			// foreach (var guid in airshipBuildInfoGuids) {
+			// 	var path = AssetDatabase.GUIDToAssetPath(guid).ToLower();
+			// 	paths.Add(path);
+			// }
 
 			if (File.Exists(codeZipPath)) {
 				File.Delete(codeZipPath);
 			}
 			var codeZip = new ZipFile();
 			foreach (var path in paths) {
-				if (path.EndsWith(".asbuildinfo")) {
-					codeZip.AddEntry(path, File.ReadAllBytes(path));
-					continue;
-				}
+				// if (path.EndsWith(".asbuildinfo")) {
+				// 	codeZip.AddEntry(path, File.ReadAllBytes(path));
+				// 	continue;
+				// }
 
 				// GetOutputPath is case sensitive so hacky workaround is to make our path start with capital "A"
 				var luaOutPath = TypescriptProjectsService.Project.GetOutputPath(path.Replace("assets/", "Assets/"));
@@ -455,60 +477,7 @@ public class Deploy {
 		Debug.Log($"Completed upload{sizeSnippet}. Finalizing publish...");
 
 		// Complete deployment
-		{
-			List<string> uploadedFileIds = new();
-			uploadedFileIds.Add("Mac_shared_resources");
-			uploadedFileIds.Add("Mac_shared_scenes");
-			uploadedFileIds.Add("Windows_shared_resources");
-			uploadedFileIds.Add("Windows_shared_scenes");
-			if (gameConfig.supportsMobile) {
-				uploadedFileIds.Add("iOS_shared_resources");
-				uploadedFileIds.Add("iOS_shared_scenes");
-				uploadedFileIds.Add("Android_shared_resources");
-				uploadedFileIds.Add("Android_shared_scenes");
-			}
-
-			int attemptNum = 0;
-			while (attemptNum < 5) {
-				// Debug.Log("Complete. GameId: " + gameConfig.gameId + ", assetVersionId: " + deploymentDto.version.assetVersionNumber);
-				UnityWebRequest req = UnityWebRequest.Post(
-					$"{AirshipPlatformUrl.deploymentService}/game-versions/complete-deployment", JsonUtility.ToJson(
-						new CompleteGameDeploymentDto() {
-							gameId = gameConfig.gameId,
-							gameVersionId = deploymentDto.version.gameVersionId,
-							uploadedFileIds = uploadedFileIds.ToArray(),
-						}), "application/json");
-				req.SetRequestHeader("Authorization", "Bearer " + devKey);
-				yield return req.SendWebRequest();
-				while (!req.isDone) {
-					yield return null;
-				}
-
-				if (req.result == UnityWebRequest.Result.Success) {
-					break;
-				} else {
-					Debug.LogError("Failed to complete deployment: " + req.error + " " + req.downloadHandler.text);
-					if (req.responseCode == 400) {
-						// don't retry on 400
-						yield break;
-					}
-
-                    if (attemptNum == 4) {
-	                    // Out of retry attempts so we end it here.
-                    	yield break;
-                    }
-
-                    // Wait one second and try again.
-                    int waitTime = 1;
-                    if (attemptNum >= 3) {
-	                    waitTime = 3;
-                    }
-                    Debug.Log($"Retrying in {waitTime}s...");
-                    attemptNum++;
-                    yield return new WaitForSeconds(waitTime);
-				}
-			}
-		}
+		yield return CompleteDeployment(gameConfig, deploymentDto.version.gameVersionId, GetDeployKey(deployAuthType));
 
 		// Switch back to starting build target
 		EditorUserBuildSettings.SwitchActiveBuildTarget(startingBuildGroup, startingBuildTarget);
@@ -647,6 +616,63 @@ public class Deploy {
 		}
 	}
 
+	private static IEnumerator CompleteDeployment(GameConfig gameConfig, string gameVersionId, string devKey) {
+		{
+			List<string> uploadedFileIds = new();
+			uploadedFileIds.Add("Mac_shared_resources");
+			uploadedFileIds.Add("Mac_shared_scenes");
+			uploadedFileIds.Add("Windows_shared_resources");
+			uploadedFileIds.Add("Windows_shared_scenes");
+			if (gameConfig.supportsMobile) {
+				uploadedFileIds.Add("iOS_shared_resources");
+				uploadedFileIds.Add("iOS_shared_scenes");
+				uploadedFileIds.Add("Android_shared_resources");
+				uploadedFileIds.Add("Android_shared_scenes");
+			}
+
+			int attemptNum = 0;
+			while (attemptNum < 5) {
+				// Debug.Log("Complete. GameId: " + gameConfig.gameId + ", assetVersionId: " + deploymentDto.version.assetVersionNumber);
+				UnityWebRequest req = UnityWebRequest.Post(
+					$"{AirshipPlatformUrl.deploymentService}/game-versions/complete-deployment", JsonUtility.ToJson(
+						new CompleteGameDeploymentDto() {
+							gameId = gameConfig.gameId,
+							gameVersionId = gameVersionId,
+							uploadedFileIds = uploadedFileIds.ToArray(),
+						}), "application/json");
+				req.SetRequestHeader("Authorization", "Bearer " + devKey);
+				yield return req.SendWebRequest();
+				while (!req.isDone) {
+					yield return null;
+				}
+
+				if (req.result == UnityWebRequest.Result.Success) {
+					break;
+				} else {
+					Debug.LogError("Failed to complete deployment: " + req.error + " " + req.downloadHandler.text);
+					if (req.responseCode == 400) {
+						// don't retry on 400
+						yield break;
+					}
+
+					if (attemptNum == 4) {
+						// Out of retry attempts so we end it here.
+						yield break;
+					}
+
+					// Wait one second and try again.
+					int waitTime = 1;
+					if (attemptNum >= 3) {
+						waitTime = 3;
+					}
+					Debug.Log($"Retrying in {waitTime}s...");
+					attemptNum++;
+					yield return new WaitForSeconds(waitTime);
+				}
+			}
+		}
+	}
+
 	private static bool IsDirectoryEmpty(string path)
 	{
 		IEnumerable<string> items = Directory.EnumerateFileSystemEntries(path);

package/Editor/StyleSheets/AirshipSelectorWindow.dark.uss

@@ -0,0 +1,15 @@
+.unity-collection-view__item--selected {
+    background-color: #2C5D87;
+    color: #fff;
+}
+
+.unity-tab-view {
+    background-color: #333333;
+}
+
+.details-pane {
+    background-color: #282828;
+    flex-direction: row;
+    align-items: center;
+}
+

package/Editor/StyleSheets/AirshipSelectorWindow.dark.uss.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 354ed37fb1debc54a83686ffc7c92020
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0

package/Editor/StyleSheets/AirshipSelectorWindow.uss

@@ -0,0 +1,17 @@
+.asset-details-icon {
+    width: 64px;
+    height: 64px;
+    align-self: center;
+}
+
+.asset-details-inner {
+    margin-left: 10px;
+}
+
+.asset-details-path {
+    color: #aeaeae;
+}
+
+.component-search-field {
+    margin-right: 50px;
+}

package/Editor/StyleSheets/AirshipSelectorWindow.uss.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f6146659f21b72b4bb3c3d1ff43c1ae3
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0