gg.easy.airship 0.1.2170 → 0.1.2172

package/Editor/Accessories/AccessoryOutfitEditor.cs

@@ -16,27 +16,27 @@ public class AccessoryOutfitEditor : UnityEditor.Editor{
         }
     }
 
-    [MenuItem("Airship/Open Asset Bundle")]
-    public static void TestOpenAssetBundle() {
-        string path = "Assets/TestBundles/CoreMaterials";
-        AssetBundle bundle = AssetBundle.LoadFromFile(path);
-        if (bundle == null) {
-            Debug.LogError("Failed to load asset bundle.");
-        }
-
-        Debug.Log("<color=green>Success!</color>");
-
-        foreach (var name in bundle.GetAllAssetNames()) {
-            Debug.Log("  - " + name);
-        }
-
-        Debug.Log("------------");
-        GameObject prefab = bundle.LoadAsset<GameObject>("assets/airshippackages/@easy/corematerials/materiallibrary/codestrip/__decal projector.prefab");
-        GameObject go = Object.Instantiate(prefab);
-        Debug.Log("Instantiated " + go.name);
-
-        Debug.Log("Unloading bundle...");
-        bundle.Unload(true);
-        Debug.Log("Unloaded.");
-    }
+    // [MenuItem("Airship/Open Asset Bundle")]
+    // public static void TestOpenAssetBundle() {
+    //     string path = "Assets/TestBundles/CoreMaterials";
+    //     AssetBundle bundle = AssetBundle.LoadFromFile(path);
+    //     if (bundle == null) {
+    //         Debug.LogError("Failed to load asset bundle.");
+    //     }
+    //
+    //     Debug.Log("<color=green>Success!</color>");
+    //
+    //     foreach (var name in bundle.GetAllAssetNames()) {
+    //         Debug.Log("  - " + name);
+    //     }
+    //
+    //     Debug.Log("------------");
+    //     GameObject prefab = bundle.LoadAsset<GameObject>("assets/airshippackages/@easy/corematerials/materiallibrary/codestrip/__decal projector.prefab");
+    //     GameObject go = Object.Instantiate(prefab);
+    //     Debug.Log("Instantiated " + go.name);
+    //
+    //     Debug.Log("Unloading bundle...");
+    //     bundle.Unload(true);
+    //     Debug.Log("Unloaded.");
+    // }
 }

package/Editor/AirshipComponentEditor.cs

@@ -21,6 +21,14 @@ public struct ArrayDisplayInfo {
     public AirshipComponentPropertyType listType;
     public Type objType;
     public string errorReason;
+    
+    internal bool IsArrayDataMismatched(SerializedObject serializedObject, SerializedProperty serializedArray) {
+        try {
+            return serializedArray.propertyPath != reorderableList.serializedProperty.propertyPath;
+        } catch (ObjectDisposedException exception) {
+            return true;
+        }
+    }
 }
 
 [CustomEditor(typeof(AirshipComponent))]
@@ -29,7 +37,7 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     private static Dictionary<(string, string), bool> _openPropertyFoldouts = new();
 
     /** Maps (game object id, prop name) to ArrayDisplayInfo object (for Array properties) */
-    private Dictionary<(int, string), ArrayDisplayInfo> _reorderableLists = new();
+    private Dictionary<(int componentInstanceId, string propertyName), ArrayDisplayInfo> _reorderableLists = new();
 
     public void OnEnable() {
         var comp = (Component)serializedObject.targetObject;
@@ -44,6 +52,14 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         }
     }
 
+    private void OnDisable() {
+        var comp = (AirshipComponent)serializedObject.targetObject;
+        if (comp == null) return;
+        
+        var componentInstanceId = comp.GetInstanceID();
+        _componentSeenArrayProps.Remove(componentInstanceId);
+    }
+
     private bool debugging = false;
     
     public override void OnInspectorGUI() {
@@ -99,21 +115,53 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         serializedObject.ApplyModifiedProperties();
     }
 
+
+    private Dictionary<int, HashSet<string>> _componentSeenArrayProps = new();
+    private void CleanupOrphanedArrayDisplayInfos(int componentInstanceId) {
+        // We need to make sure we clean out dead array references
+        if (!_componentSeenArrayProps.TryGetValue(componentInstanceId, out var seenArrayProps)) return;
+        var removeSet = new HashSet<(int, string)>();
+        
+        foreach (var (key, value) in _reorderableLists) {
+            if (key.componentInstanceId != componentInstanceId) continue;
+            if (seenArrayProps.Contains(key.propertyName)) continue;
+            
+            // We cannot remove from a collection while iterating it, so we'll add it to a remove set
+            removeSet.Add(key);
+        }
+        
+        // array list removal pass
+        foreach (var item in removeSet) {
+            _reorderableLists.Remove(item);
+        }
+    }
+
+    private HashSet<string> GetOrCreateSeenArraysSet(int componentInstanceId) {
+        if (_componentSeenArrayProps.TryGetValue(componentInstanceId, out var seenArrays)) return seenArrays;
+        
+        seenArrays = new HashSet<string>();
+        _componentSeenArrayProps.Add(componentInstanceId, seenArrays);
+        return seenArrays;
+    }
+    
     private ArrayDisplayInfo GetOrCreateArrayDisplayInfo(int componentInstanceId, SerializedProperty arraySerializedProperty, string propName, AirshipComponentPropertyType listType, SerializedProperty itemInfo) {
-        var modified = arraySerializedProperty.FindPropertyRelative("modified");
+        
         
         Type objType = null;
         if (listType == AirshipComponentPropertyType.AirshipObject || listType == AirshipComponentPropertyType.AirshipComponent) {
             objType = TypeReflection.GetTypeFromString(itemInfo.FindPropertyRelative("objectType").stringValue);
         }
-        
-        if (!_reorderableLists.TryGetValue((componentInstanceId, propName), out var displayInfo) || displayInfo.listType != listType || displayInfo.objType != objType) {
+
+        var seenArrayProps = GetOrCreateSeenArraysSet(componentInstanceId);
+
+
+        void BindReorderableListToProperty(ReorderableList reorderableList) {
             var serializedArray = itemInfo.FindPropertyRelative("serializedItems");
             var objectRefs = itemInfo.FindPropertyRelative("objectRefs");
-            var newDisplayInfo = new ArrayDisplayInfo { listType = listType, objType = objType, reorderableList = new ReorderableList(serializedObject, serializedArray, true, false, true, true)};
+            var modified = arraySerializedProperty.FindPropertyRelative("modified");
             
-            newDisplayInfo.reorderableList.elementHeight = EditorGUIUtility.singleLineHeight;
-            newDisplayInfo.reorderableList.onRemoveCallback = (ReorderableList list) => {
+            reorderableList.elementHeight = EditorGUIUtility.singleLineHeight;
+            reorderableList.onRemoveCallback = (ReorderableList list) => {
                 if (list.selectedIndices.Count == 1) {
                     var deletedIndex = list.selectedIndices[0];
                     list.Deselect(deletedIndex);
@@ -123,25 +171,62 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                 list.serializedProperty.DeleteArrayElementAtIndex(list.serializedProperty.arraySize - 1);
             };
 
-            newDisplayInfo.reorderableList.onChangedCallback = (ReorderableList list) => {
+            reorderableList.onAddCallback = (list) => {
+                list.serializedProperty.InsertArrayElementAtIndex(list.serializedProperty.arraySize);
+            };
+
+            reorderableList.onChangedCallback = (ReorderableList list) => {
                 modified.boolValue = true;
                 // Match number of elements in inspector reorderable list to serialized objectRefs. This is to reconcile objectRefs
                 MatchReferenceArraySize(objectRefs, serializedArray);
             };
 
-            newDisplayInfo.reorderableList.onReorderCallbackWithDetails = (ReorderableList list, int oldIndex, int newIndex) => {
+            reorderableList.onReorderCallbackWithDetails = (ReorderableList list, int oldIndex, int newIndex) => {
                 objectRefs.MoveArrayElement(oldIndex, newIndex);
             };
             
-            newDisplayInfo.reorderableList.drawElementCallback = (Rect rect, int index, bool isActive, bool isFocused) => {
+            reorderableList.drawElementCallback = (Rect rect, int index, bool isActive, bool isFocused) => {
+                if (!serializedArray.isArray) {
+                    EditorGUILayout.HelpBox("Is not array", MessageType.Error);
+                    return;
+                }
+                
+                if (index > serializedArray.arraySize - 1) {
+                    EditorGUILayout.HelpBox("Element exceeds array size", MessageType.Error);
+                    return;
+                }
+                
                 RenderArrayElement(rect, arraySerializedProperty, itemInfo, index, listType, serializedArray.GetArrayElementAtIndex(index), modified, objectRefs, objType, out var errReason);
                 if (errReason.Length > 0) {
                     EditorGUI.LabelField(rect, $"{errReason}");
                 }
+        
+            };
+        }
+        
+        var serializedArray = itemInfo.FindPropertyRelative("serializedItems");
+        if (!_reorderableLists.TryGetValue((componentInstanceId, propName), out var displayInfo) || displayInfo.listType != listType || displayInfo.objType != objType) {
+            var newDisplayInfo = new ArrayDisplayInfo {
+                listType = listType, 
+                objType = objType, 
+                reorderableList = new ReorderableList(serializedObject, serializedArray, true, false, true, true),
             };
+            
+            BindReorderableListToProperty(newDisplayInfo.reorderableList);
+            
+            seenArrayProps.Add(propName);
             _reorderableLists[(componentInstanceId, propName)] = newDisplayInfo;
             return newDisplayInfo;
         }
+
+        
+        if (displayInfo.IsArrayDataMismatched(serializedObject, serializedArray)) {
+            displayInfo.reorderableList =
+                new ReorderableList(serializedObject, serializedArray, true, false, true, true);
+            BindReorderableListToProperty(displayInfo.reorderableList);
+        }
+        
+        seenArrayProps.Add(propName);
         return displayInfo;
     }
 
@@ -397,11 +482,22 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         propertyList.Sort((p1, p2) =>
             indexDictionary[p1.FindPropertyRelative("name").stringValue] > indexDictionary[p2.FindPropertyRelative("name").stringValue] ? 1 : -1
         );
+
+        var componentInstanceId = binding.GetInstanceID();
+        
+        // Keeping track of which array properties that have been seen
+        var seenArraysSet = GetOrCreateSeenArraysSet(componentInstanceId);
+        
+        // We're running a new render, so haven't seen the arrays yet
+        seenArraysSet.Clear();
         
         foreach (var prop in propertyList) {
-            DrawCustomProperty(binding.GetInstanceID(), binding.script.m_metadata, prop);   
+            DrawCustomProperty(componentInstanceId, binding.script.m_metadata, prop);   
         }
         
+        // By the end of the render of the properties, all the arrays should have been populated
+        CleanupOrphanedArrayDisplayInfos(componentInstanceId);
+        
 #if AIRSHIP_DEBUG
         AirshipEditorGUI.HorizontalLine();
         EditorGUILayout.LabelField("Debug", EditorStyles.boldLabel);

package/Editor/Assets/AudioAssetPostProcessor.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace Editor.Assets {
+    public class AudioAssetPostProcessor : AssetPostprocessor {
+        private static HashSet<string> processedClips = new HashSet<string>();
+
+        // todo: leaving this disabled for now. These are optimized settings for audio clips.  
+        // private void OnPostprocessAudio(AudioClip clip) {
+        //     var importer = (AudioImporter) assetImporter;
+        //     if (processedClips.Contains(importer.assetPath)) return; // Already processed
+        //
+        //     importer.loadInBackground = true;
+        //
+        //     var audioImporterSampleSettings = new AudioImporterSampleSettings() {
+        //         compressionFormat = AudioCompressionFormat.Vorbis,
+        //         quality = 0.5f,
+        //     };
+        //     // For clips over 30s in length we compress in memory on mobile to keep memory lower
+        //     if (clip.length > 30) {
+        //         var mobileQuality = new AudioImporterSampleSettings() {
+        //             loadType = AudioClipLoadType.CompressedInMemory,
+        //             compressionFormat = AudioCompressionFormat.Vorbis,
+        //             quality = 0.3f,
+        //         };
+        //         importer.SetOverrideSampleSettings(BuildTargetGroup.iOS, mobileQuality);
+        //         importer.SetOverrideSampleSettings(BuildTargetGroup.Android, mobileQuality);
+        //     }
+        //     importer.defaultSampleSettings = audioImporterSampleSettings;
+        //     processedClips.Add(importer.assetPath);
+        //     importer.SaveAndReimport();
+        // }
+    }
+}

package/Editor/Assets/AudioAssetPostProcessor.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a527826cca4b47f7a32161c3a060c19f
+timeCreated: 1754955389

package/Editor/Assets.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f096152cf47148288b4ecf4884b103de
+timeCreated: 1754955345

package/Editor/BuildMenu.cs

@@ -160,6 +160,8 @@ namespace Editor {
             OnBuild();
             CreateAssetBundles.ResetScenes();
 
+            CreateAssetBundles.SwapToQualityLevel("Normal");
+
             UserBuildSettings.architecture = OSArchitecture.x64ARM64;
             PlayerSettings.SplashScreen.show = false;
             PlayerSettings.SetScriptingBackend(NamedBuildTarget.Standalone, ScriptingImplementation.IL2CPP);
@@ -194,6 +196,8 @@ namespace Editor {
             OnBuild();
             CreateAssetBundles.ResetScenes();
 
+            CreateAssetBundles.SwapToQualityLevel("Low");
+
             UserBuildSettings.architecture = OSArchitecture.x64ARM64;
             PlayerSettings.SplashScreen.show = false;
             PlayerSettings.SetScriptingBackend(NamedBuildTarget.iOS, ScriptingImplementation.IL2CPP);
@@ -210,7 +214,7 @@ namespace Editor {
             options.extraScriptingDefines = extraDefines.ToArray();
 
             if (development == true) {
-                options.options = BuildOptions.Development;
+                options.options = BuildOptions.Development | BuildOptions.ConnectWithProfiler;
             }
 
             var report = BuildPipeline.BuildPlayer(options);
@@ -233,13 +237,24 @@ namespace Editor {
 #endif
         }
 
-        public static void BuildAndroidClient(bool development) {
+        public enum AndroidBuildType {
+            DevelopmentAPK,
+            ReleaseAPK,
+            ReleaseAAB,
+        }
+        
+        public static void BuildAndroidClient(AndroidBuildType buildType) {
+            var development = buildType == AndroidBuildType.DevelopmentAPK;
+            var buildApk = buildType != AndroidBuildType.ReleaseAAB;
+
+            CreateAssetBundles.SwapToQualityLevel("Low");
+            
             OnBuild();
             CreateAssetBundles.ResetScenes();
 
             PlayerSettings.SplashScreen.show = false;
             PlayerSettings.SetScriptingBackend(NamedBuildTarget.Android, ScriptingImplementation.IL2CPP);
-            PlayerSettings.Android.splitApplicationBinary = !development;
+            PlayerSettings.Android.splitApplicationBinary = !buildApk;
 
             BuildProfile buildProfile;
             if (development) {
@@ -255,9 +270,9 @@ namespace Editor {
             buildProfile.overrideGlobalScenes = true;
             buildProfile.scenes = editorBuildScenes.ToArray();
             options.buildProfile = buildProfile;
-            options.locationPathName = $"build/client_android/{ClientExecutableName}.{(development ? "apk" : "aab")}";
+            options.locationPathName = $"build/client_android/{ClientExecutableName}.{(buildApk ? "apk" : "aab")}";
             if (development) {
-                options.options = BuildOptions.Development;
+                options.options = BuildOptions.Development | BuildOptions.ConnectWithProfiler;
             }
 
             var report = BuildPipeline.BuildPlayer(options);
@@ -303,14 +318,25 @@ namespace Editor {
             BuildIOSClient(false, true);
         }
 
-        [MenuItem("Airship/Create Binary/Client/Android", priority = 80)]
+        [MenuItem("Airship/Create Binary/Client/iOS (Staging Development)", priority = 80)]
+        public static void BuildIOSClientStagingDevelopmentMenuItem() {
+            Debug.Log("Building iOS staging development client..");
+            BuildIOSClient(true, true);
+        }
+
+        [MenuItem("Airship/Create Binary/Client/Android (Google Play)", priority = 80)]
         public static void BuildAndroidClientMenuItem() {
-            BuildAndroidClient(false);
+            BuildAndroidClient(AndroidBuildType.ReleaseAAB);
+        }
+        
+        [MenuItem("Airship/Create Binary/Client/Android (APK)", priority = 80)]
+        public static void BuildAndroidProdAPK() {
+            BuildAndroidClient(AndroidBuildType.ReleaseAPK);
         }
 
-        [MenuItem("Airship/Create Binary/Client/Android (Development)", priority = 80)]
+        [MenuItem("Airship/Create Binary/Client/Android (Development APK)", priority = 80)]
         public static void BuildAndroidDevelopmentClientMenuItem() {
-            BuildAndroidClient(true);
+            BuildAndroidClient(AndroidBuildType.DevelopmentAPK);
         }
 #endif
 
@@ -327,6 +353,8 @@ namespace Editor {
             OnBuild();
             CreateAssetBundles.ResetScenes();
 
+            CreateAssetBundles.SwapToQualityLevel("Normal");
+
             PlayerSettings.SplashScreen.show = false;
             PlayerSettings.SetScriptingBackend(NamedBuildTarget.Standalone, ScriptingImplementation.IL2CPP);
             var options = new BuildPlayerOptions();

package/Editor/CreateAssetBundles.cs

@@ -5,7 +5,6 @@ using System.IO;
 using System.Linq;
 using Code.Bootstrap;
 using Editor.Packages;
-using Luau;
 using UnityEditor.Build.Pipeline;
 using UnityEditor.Build.Pipeline.Interfaces;
 using UnityEditor.Build.Pipeline.Tasks;
@@ -13,6 +12,7 @@ using UnityEngine;
 using UnityEngine.Rendering;
 #if UNITY_EDITOR
 using UnityEditor;
+using Editor.Quality;
 #endif
 using UnityEngine.SceneManagement;
 using Debug = UnityEngine.Debug;
@@ -294,6 +294,12 @@ public static class CreateAssetBundles {
 		Debug.Log($"[Editor]: Building {platform} asset bundles...");
 		Debug.Log("[Editor]: Build path: " + buildPath);
 
+		if (platform == AirshipPlatform.iOS || platform == AirshipPlatform.Android) {
+			SwapToQualityLevel("Low");
+		} else {
+			SwapToQualityLevel("Normal");
+		}
+
 		// Act as if we are building all asset bundles (including CoreMaterials).
 		// This is so our current build target will have references to those asset bundles.
 		// This is paired with changes to Scriptable Build Pipeline that prevent these bundles from actually being built.
@@ -486,6 +492,24 @@ public static class CreateAssetBundles {
 		return true;
 	}
 
+	public static void SwapToQualityLevel(string name) {
+#if UNITY_EDITOR
+		if (name == "Low") {
+			QualityConfig.ConfigureLowQualityLevel();
+		} else if (name == "Normal") {
+			QualityConfig.ConfigureNormalQualityLevel();
+		}
+#endif
+
+		int index = System.Array.IndexOf(QualitySettings.names, name);
+		if (index < 0) {
+			Debug.LogError($"Quality level '{name}' not found. Please report this issue to Airship devs.");
+			return;
+		}
+
+		QualitySettings.SetQualityLevel(index, applyExpensiveChanges: true);
+	}
+
 	static IList<IBuildTask> GetBuildTasks()
 	{
 		var buildTasks = new List<IBuildTask>();

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -28,6 +28,7 @@ using UnityEngine.Rendering;
 using Debug = UnityEngine.Debug;
 using Object = UnityEngine.Object;
 using ZipFile = Unity.VisualScripting.IonicZip.ZipFile;
+// ReSharper disable ReplaceWithSingleAssignment.True
 
 namespace Editor.Packages {
     public class AirshipPackagesWindow : EditorWindow {
@@ -416,7 +417,12 @@ namespace Editor.Packages {
                 // Act as if we are building all asset bundles (including CoreMaterials).
                 // This is so our current build target will have references to those asset bundles.
                 // This is paired with changes to Scriptable Build Pipeline that prevent these bundles from actually being built.
-                List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds(true);
+                
+                var compileUrpShaders = true;
+                if (packageDoc.id.ToLower() == "@easy/core") {
+                    compileUrpShaders = false;
+                }
+                List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds(compileUrpShaders);
 
                 foreach (var platform in platforms) {
                     var st = Stopwatch.StartNew();
@@ -444,6 +450,12 @@ namespace Editor.Packages {
                         });
                     }
 
+                    if (platform == AirshipPlatform.iOS || platform == AirshipPlatform.Android) {
+                        CreateAssetBundles.SwapToQualityLevel("Mobile");
+                    } else {
+                        CreateAssetBundles.SwapToQualityLevel("Normal");
+                    }
+
                     var buildParams = new BundleBuildParameters(
                         buildTarget,
                         buildTargetGroup,