gg.easy.airship 0.1.2190 → 0.1.2192

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs

@@ -236,6 +236,7 @@ namespace Editor.Accessories.Clothing {
                 await updateReq.SendWebRequest();
                 if (updateReq.result != UnityWebRequest.Result.Success) {
                     Debug.LogError("Failed to update air asset: " + updateReq.downloadHandler.text);
+                    EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows);
                     return;
                 }
                 var updateData = JsonUtility.FromJson<AirAssetCreateResponse>(updateReq.downloadHandler.text);
@@ -256,6 +257,7 @@ namespace Editor.Accessories.Clothing {
                     if (putReq.result != UnityWebRequest.Result.Success) {
                         Debug.LogError(putReq.error);
                         Debug.LogError(putReq.downloadHandler.text);
+                        EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows);
                         return;
                     }
                 }
@@ -280,10 +282,13 @@ namespace Editor.Accessories.Clothing {
                 await req.SendWebRequest();
                 if (req.result != UnityWebRequest.Result.Success) {
                     Debug.LogError($"patch classId. url: {url}, response: {req.downloadHandler.text}, authToken: {InternalHttpManager.editorAuthToken}");
+                    EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows);
                     return;
                 }
             }
 
+            EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows);
+
             Debug.Log($"<color=green>Finished building {bundlePaths.Count} asset bundles for all platforms in {st.Elapsed.Seconds} seconds.</color> File size: " + AirshipEditorUtil.GetFileSizeText(bytesCount));
         }
 

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/BuildMenu.cs

@@ -9,7 +9,7 @@ using UnityEditor.Build;
 using UnityEditor.Build.Profile;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
-#if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
+#if UNITY_EDITOR_OSX
 using UnityEditor.OSXStandalone;
 #endif
 
@@ -212,13 +212,12 @@ namespace Editor {
         }
 
         public static void BuildIOSClient(bool development, bool staging) {
-#if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
+#if AIRSHIP_PLAYER
             OnBuild();
             CreateAssetBundles.ResetScenes();
 
             CreateAssetBundles.SwapToQualityLevel("Low");
 
-            UserBuildSettings.architecture = OSArchitecture.x64ARM64;
             PlayerSettings.SplashScreen.show = false;
             PlayerSettings.SetScriptingBackend(NamedBuildTarget.iOS, ScriptingImplementation.IL2CPP);
             var options = new BuildPlayerOptions();
@@ -296,6 +295,23 @@ namespace Editor {
                 AndroidEnvironment.Staging => "airship-staging",
                 _ => throw new ArgumentOutOfRangeException(nameof(environment), environment, null)
             };
+
+            Dictionary<string, string> envOptions = GetValidatedOptions();
+            if (envOptions.TryGetValue("androidKeystoreName", out string keystoreName) &&
+                !string.IsNullOrEmpty(keystoreName))
+            {
+                PlayerSettings.Android.useCustomKeystore = true;
+                PlayerSettings.Android.keystoreName = keystoreName;
+            }
+            if (envOptions.TryGetValue("androidKeystorePass", out string keystorePass) &&
+                !string.IsNullOrEmpty(keystorePass))
+                PlayerSettings.Android.keystorePass = keystorePass;
+            if (envOptions.TryGetValue("androidKeyaliasName", out string keyaliasName) &&
+                !string.IsNullOrEmpty(keyaliasName))
+                PlayerSettings.Android.keyaliasName = keyaliasName;
+            if (envOptions.TryGetValue("androidKeyaliasPass", out string keyaliasPass) &&
+                !string.IsNullOrEmpty(keyaliasPass))
+                PlayerSettings.Android.keyaliasPass = keyaliasPass;
             
             var editorBuildScenes = new List<EditorBuildSettingsScene>();
             foreach (var sceneName in scenes) {
@@ -498,6 +514,67 @@ namespace Editor {
             CreateAssetBundles.AddAllGameBundleScenes();
 #endif
         }
+
+        // From Game CI example
+        private static Dictionary<string, string> GetValidatedOptions() {
+            ParseCommandLineArguments(out Dictionary<string, string> validatedOptions);
+
+            if (!validatedOptions.TryGetValue("projectPath", out string _))
+            {
+                Console.WriteLine("Missing argument -projectPath");
+                EditorApplication.Exit(110);
+            }
+
+            if (validatedOptions.TryGetValue("buildTarget", out var buildTarget))
+            {
+                if (!Enum.IsDefined(typeof(BuildTarget), buildTarget ?? string.Empty))
+                {
+                    Console.WriteLine($"{buildTarget} is not a defined {nameof(BuildTarget)}");
+                    EditorApplication.Exit(121);
+                }
+            }
+            else if (!validatedOptions.TryGetValue("activeBuildProfile", out string _))
+            {
+                Console.WriteLine("Missing argument -buildTarget or -activeBuildProfile");
+                EditorApplication.Exit(120);
+            }
+
+            if (!validatedOptions.TryGetValue("customBuildPath", out string _))
+            {
+                Console.WriteLine("Missing argument -customBuildPath");
+                EditorApplication.Exit(130);
+            }
+
+            return validatedOptions;
+        }
+        
+        private static readonly string[] Secrets =
+            {"androidKeystorePass", "androidKeyaliasName", "androidKeyaliasPass"};
+
+        private static void ParseCommandLineArguments(out Dictionary<string, string> providedArguments)  {
+            providedArguments = new Dictionary<string, string>();
+            string[] args = Environment.GetCommandLineArgs();
+
+            // Extract flags with optional values
+            for (int current = 0, next = 1; current < args.Length; current++, next++)
+            {
+                // Parse flag
+                bool isFlag = args[current].StartsWith("-");
+                if (!isFlag) continue;
+                string flag = args[current].TrimStart('-');
+
+                // Parse optional value
+                bool flagHasValue = next < args.Length && !args[next].StartsWith("-");
+                string value = flagHasValue ? args[next].TrimStart('-') : "";
+                bool secret = Secrets.Contains(flag);
+                string displayValue = secret ? "*HIDDEN*" : "\"" + value + "\"";
+
+                // Assign
+                Console.WriteLine($"Found flag \"{flag}\" with value {displayValue}.");
+                providedArguments.Add(flag, value);
+            }
+        }
+        
     }
 }
 #endif

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,