gg.easy.airship 0.1.2167 → 0.1.2169

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs

@@ -285,7 +285,7 @@ namespace Editor.Accessories.Clothing {
             var buildOutputFile = $"bundles/gear/{airId}_{AirshipPlatformUtil.GetStringName(platform)}.bundle";
             var sourceFolderPath = Path.GetRelativePath(".", Directory.GetParent(AssetDatabase.GetAssetPath(manifest))!.FullName);
 
-            List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds();
+            List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds(false);
 
             var assetGuids = AssetDatabase.FindAssets("*", new string[] {sourceFolderPath}).ToList();
             var assetPaths = assetGuids

package/Editor/AirAsset/AirAssetBundleEditor.cs

@@ -158,7 +158,7 @@ namespace Editor.AirAsset {
             var buildOutputFile = $"bundles/airassetbundle/{airId}_{AirshipPlatformUtil.GetStringName(platform)}.bundle";
             var sourceFolderPath = Path.GetRelativePath(".", Directory.GetParent(AssetDatabase.GetAssetPath(airAssetBundle))!.FullName);
 
-            List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds();
+            List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds(false);
 
             var assetGuids = AssetDatabase.FindAssets("*", new string[] {sourceFolderPath}).ToList();
             var assetPaths = assetGuids

package/Editor/AirshipComponentDropdown.cs

@@ -176,7 +176,7 @@ public class AirshipComponentDropdown : AdvancedDropdown {
         foreach (var binaryFile in binaryFiles) {
             if (binaryFile.m_metadata == null) continue;
             
-            var airshipComponentMenu = binaryFile.m_metadata.GetDecorators().Find(f => f.name == "AirshipComponentMenu");
+            var airshipComponentMenu = binaryFile.m_metadata.decorators.Find(f => f.name == "AirshipComponentMenu");
             if (airshipComponentMenu != null && airshipComponentMenu.parameters[0].TryGetString(out var customPath)) {
                 if (customPath == "") continue; // ignore empty names :)
                 

package/Editor/AirshipComponentEditor.cs

@@ -218,6 +218,30 @@ public class ScriptBindingEditor : UnityEditor.Editor {
 
         var metadata = serializedObject.FindProperty("metadata");
         
+        var originalMetadata = binding.script.m_metadata;
+        
+        var originalDecorators = originalMetadata.decorators;
+        var serializedDecorators = binding.metadata.decorators;
+        
+        if (serializedDecorators.Count != originalDecorators.Count) {
+            return true;
+        }
+        
+        foreach (var serializedDecorator in serializedDecorators)
+        {
+            var decoratorName = serializedDecorator.name;
+            var originalDecorator = originalDecorators.Find(d => d.name == decoratorName);
+            
+            if (originalDecorator == null) {
+                return true;
+            }
+
+            var serializedParameters = serializedDecorator.parameters;
+            if (serializedParameters.Count != originalDecorator.parameters.Count) {
+                return true;
+            }
+        }
+        
         var metadataProperties = metadata.FindPropertyRelative("properties");
         var originalMetadataProperties = binding.script.m_metadata?.properties;
 

package/Editor/Artifacts/AirshipReconciliationService.cs

@@ -125,6 +125,7 @@ namespace Airship.Editor {
 
             if (scriptMetadata == null) return false;
             componentMetadata.name = scriptMetadata.name;
+            componentMetadata.decorators = new List<LuauMetadataDecoratorElement>(scriptMetadata.decorators);
             
             // Add missing properties
             foreach (var scriptProperty in scriptMetadata.properties) {
@@ -193,10 +194,108 @@ namespace Airship.Editor {
                 }
             }
 #endif
+            
+            // Add required components
+            var requireComponents = scriptMetadata.FindClassDecorators("RequireComponent");
+            foreach (var requireComponent in requireComponents) {
+               var parameter = requireComponent.parameters.FirstOrDefault();
+               if (parameter == null) continue;
+               
+               var requiredComponentTypeName = parameter.value?.ToString();
+               if (string.IsNullOrEmpty(requiredComponentTypeName)) continue;
+               
+               var gameObject = component.gameObject;
+               if (gameObject == null) continue;
+               
+               var parameterType = parameter.type;
+               
+               switch (parameterType)
+               {
+                   case "object":
+                   {
+                       EnsureUnityComponent(gameObject, requiredComponentTypeName);
+                       break;
+                   }
+                   case "AirshipBehaviour":
+                   {
+                       EnsureAirshipComponent(gameObject, requiredComponentTypeName, component.context);
+                       break;
+                   }
+               }
+            }
+            
             // component.componentHash = component.script.sourceFileHash;
             return true;
         }
+
+        /// <summary>
+        /// Ensures that a Unity component is present on the GameObject, adding it if necessary
+        /// </summary>
+        /// <param name="gameObject">The GameObject to check</param>
+        /// <param name="componentTypeName">The name of the Unity component type</param>
+        private static void EnsureUnityComponent(GameObject gameObject, string componentTypeName) {
+            try {
+                var componentType = GetComponentTypeByName(componentTypeName);
+                if (componentType == null) {
+                    Debug.LogWarning($"[RequireComponent] Could not find Unity component type: {componentTypeName}.", gameObject);
+                    return;
+                }
+                
+                var existingComponent = gameObject.GetComponent(componentType);
+                if (existingComponent != null) {
+                    return;
+                }
+                
+                gameObject.AddComponent(componentType);
+#if AIRSHIP_DEBUG
+                Debug.Log($"[RequireComponent] Added Unity component '{componentTypeName}' to GameObject '{gameObject.name}'", gameObject);
+#endif
+            }
+            catch (Exception ex) {
+                Debug.LogException(ex);
+            }
+        }
+
+        /// <summary>
+        /// Ensures that an AirshipComponent is present on the GameObject, adding it if necessary
+        /// </summary>
+        /// <param name="gameObject">The GameObject to check</param>
+        /// <param name="componentTypeName">The name of the AirshipComponent type</param>
+        /// <param name="context">The Luau context to use when creating the component</param>
+        private static void EnsureAirshipComponent(GameObject gameObject, string componentTypeName, LuauContext context) {
+            try {
+                var existingComponents = gameObject.GetComponents<AirshipComponent>();
+                foreach (var existingComponent in existingComponents) {
+                    if (existingComponent.script == null || existingComponent.script.m_metadata == null) continue;
+
+                    if (existingComponent.script.m_metadata.name != componentTypeName) continue;
+
+                    return;
+                }
+                
+                var buildInfo = AirshipBuildInfo.Instance;
+                if (buildInfo == null || !buildInfo.HasAirshipBehaviourClass(componentTypeName)) {
+                    Debug.LogWarning($"[RequireComponent] AirshipComponent '{componentTypeName}' not found in build info", gameObject);
+                    return;
+                }
+                
+                var scriptPath = buildInfo.GetScriptPath(componentTypeName);
+                AirshipComponent.Create(gameObject, $"Assets/{scriptPath}", context);
+                
+#if AIRSHIP_DEBUG
+                Debug.Log($"[RequireComponent] Added AirshipComponent '{componentTypeName}' to GameObject '{gameObject.name}'", gameObject);
+#endif
+            }
+            catch (Exception ex) {
+                Debug.LogException(ex);
+            }
+        }
         
+        private static Type GetComponentTypeByName(string name) {
+            var types = TypeCache.GetTypesDerivedFrom<Component>();
+            return types.FirstOrDefault(type => type.Name == name);
+        }
+
         /// <summary>
         /// Reconciles all queued components for the given script
         /// </summary>
@@ -381,4 +480,4 @@ namespace Airship.Editor {
         }
     }
 }
-#endif
+#endif

package/Editor/CreateAssetBundles.cs

@@ -173,7 +173,7 @@ public static class CreateAssetBundles {
 	/// Creates an AssetBundleBuild for every AirshipPackage in the project.
 	/// </summary>
 	/// <returns></returns>
-	public static List<AssetBundleBuild> GetPackageAssetBundleBuilds() {
+	public static List<AssetBundleBuild> GetPackageAssetBundleBuilds(bool compileURPShaders) {
 		List<AssetBundleBuild> builds = new();
 
 		if (!Directory.Exists(Path.Join("Assets", "AirshipPackages"))) {
@@ -197,7 +197,7 @@ public static class CreateAssetBundles {
 						assetGuids.AddRange(urpGuids);
 					});
 
-					if (!EditorIntegrationsConfig.instance.selfCompileAllShaders) {
+					if (!compileURPShaders) {
 						Debug.Log("Adding URP assets to CoreMaterials bundle.");
 						addUrpFiles("Packages/com.unity.render-pipelines.universal/Shaders");
 						addUrpFiles("Packages/com.unity.render-pipelines.universal/ShaderLibrary");
@@ -297,7 +297,7 @@ public static class CreateAssetBundles {
 		// 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 = GetPackageAssetBundleBuilds();
+		List<AssetBundleBuild> builds = GetPackageAssetBundleBuilds(gameConfig.compileURPShaders);
 
 		// Make a fake asset bundle with all package content. This makes the build have the correct dependency data.
 		// {

package/Editor/EditorIntegrationsConfig.cs

@@ -39,8 +39,6 @@ public class EditorIntegrationsConfig : ScriptableSingleton<EditorIntegrationsCo
     [SerializeField] 
     public bool safeguardBundleModification = true;
 
-    [SerializeField] public bool selfCompileAllShaders = false;
-
     [SerializeField] internal bool useProjectReconcileOption = false;
     [FormerlySerializedAs("reconcilerVersion")] [SerializeField] internal ReconcilerVersion projectReconcilerVersion = ReconcilerVersion.Default;
     

package/Editor/GameConfig/GameConfigEditor.cs

@@ -18,6 +18,7 @@ public class GameConfigEditor : UnityEditor.Editor {
     private Action requestRefresh;
 
     private SerializedProperty supportsMobile;
+    private SerializedProperty compileURPShaders;
 
     Rect buttonRect;
     public override void OnInspectorGUI() {
@@ -51,6 +52,12 @@ public class GameConfigEditor : UnityEditor.Editor {
         EditorGUILayout.PropertyField(this.supportsMobile, new GUIContent("Mobile"));
         GUILayout.Space(20);
 
+        EditorGUILayout.LabelField("Shaders", EditorStyles.boldLabel);
+        EditorGUILayout.PropertyField(this.compileURPShaders, new GUIContent("Compile URP Shaders") {
+            tooltip = "By default, your game will use a precompiled set of URP shaders for basic usage. Checking this box will compile URP shaders specifically for your game. If you have any advanced URP materials (or notice invisible materials on published games), you should check this box."
+        });
+        GUILayout.Space(20);
+
         foreach (var field in typeof(GameConfig).GetFields()) {
             if (field.Name is "gameId" or "gameLayers" || Attribute.IsDefined(field, typeof(HideInInspector))) continue; // Rendered above
 
@@ -107,6 +114,7 @@ public class GameConfigEditor : UnityEditor.Editor {
         }
 
         this.supportsMobile = serializedObject.FindProperty("supportsMobile");
+        this.compileURPShaders = serializedObject.FindProperty("compileURPShaders");
         
         updateSelectedGame += (update) => {
             var gameId = update.gameId;

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -416,7 +416,7 @@ 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();
+                List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds(true);
 
                 foreach (var platform in platforms) {
                     var st = Stopwatch.StartNew();

package/Editor/Settings/AirshipSettingsProvider.cs

@@ -153,8 +153,7 @@ public class AirshipSettingsProvider : SettingsProvider
             EditorIntegrationsConfig.instance.autoUpdatePackages = EditorGUILayout.Toggle(new GUIContent("Auto Update Packages", "Airship Packages will automatically update whenever a new update is available."), EditorIntegrationsConfig.instance.autoUpdatePackages);
             EditorIntegrationsConfig.instance.enableMainMenu = EditorGUILayout.Toggle(new GUIContent("Enable Main Menu", "When true, the main menu will show when pressing [Escape]."), EditorIntegrationsConfig.instance.enableMainMenu);
             EditorIntegrationsConfig.instance.buildWithoutUpload = EditorGUILayout.Toggle(new GUIContent("Build Without Upload", "When publishing, this will build the asset bundles but won't upload them to Airship. This is useful for testing file sizes with AssetBundle Browser."), EditorIntegrationsConfig.instance.buildWithoutUpload);
-            EditorIntegrationsConfig.instance.selfCompileAllShaders = EditorGUILayout.Toggle(new GUIContent("Self Compile All Shaders", "Instead of using pre-compiled shaders from CoreMaterials, you will compile all needed URP shaders when publishing. This makes publishing take significantly longer but reduces shader stripping issues."), EditorIntegrationsConfig.instance.selfCompileAllShaders);
-            
+
             // EditorIntegrationsConfig.instance.manageTypescriptProject = EditorGUILayout.Toggle(new GUIContent("Manage Typescript Projects", "Automatically update Typescript configuration files. (package.json, tsconfig.json)"), EditorIntegrationsConfig.instance.manageTypescriptProject);
 
             // EditorIntegrationsConfig.instance.typescriptAutostartCompiler = EditorGUILayout.Toggle(