gg.easy.airship 0.1.2185 → 0.1.2187

package/Editor/Accessories/AccessoryBuilderEditor.cs

@@ -1,81 +1,82 @@
-using System.Threading.Tasks;
 using UnityEditor;
 using UnityEngine;
 
-[CustomEditor(typeof(AccessoryBuilder))]
-//[CanEditMultipleObjects]
-public class AccessoryBuilderEditor : UnityEditor.Editor{
+namespace Editor.Accessories {
+    [CustomEditor(typeof(AccessoryBuilder))]
+    [Icon("Packages/gg.easy.airship/Editor/shirt-outline-icon.png")]
+    public class AccessoryBuilderEditor : UnityEditor.Editor{
 
-    private bool downloading = false;
-    private bool canceled = false;
+        private bool downloading = false;
+        private bool canceled = false;
 
-    public override void OnInspectorGUI() {
-        AccessoryBuilder builder = (AccessoryBuilder)target;
-        EditorGUILayout.LabelField("Requried Setup");
-        DrawDefaultInspector();
+        public override void OnInspectorGUI() {
+            AccessoryBuilder builder = (AccessoryBuilder)target;
+            EditorGUILayout.LabelField("Required Setup", EditorStyles.boldLabel);
+            DrawDefaultInspector();
 
-        EditorGUILayout.Space(30);
+            EditorGUILayout.Space(30);
 
-        EditorGUILayout.LabelField("Editor Tools");
+            EditorGUILayout.LabelField("Editor Tools", EditorStyles.boldLabel);
 
-        builder.currentOutfit = (AccessoryOutfit)EditorGUILayout.ObjectField("Outfit", builder.currentOutfit, typeof(AccessoryOutfit), true);
-        
-        GUI.enabled = !downloading;
-        if (GUILayout.Button("Equip Referenced Outfit")) {
-            if(builder.currentOutfit != null){
-                Debug.Log("Equipping outfit " + builder.currentOutfit.name);
-                builder.LoadOutfit(builder.currentOutfit);
-                builder.UpdateCombinedMesh();
+            builder.currentOutfit = (AccessoryOutfit)EditorGUILayout.ObjectField("Outfit", builder.currentOutfit, typeof(AccessoryOutfit), true);
+
+            GUI.enabled = !downloading;
+            if (GUILayout.Button("Equip Referenced Outfit")) {
+                if(builder.currentOutfit != null){
+                    Debug.Log("Equipping outfit " + builder.currentOutfit.name);
+                    builder.LoadOutfit(builder.currentOutfit);
+                    builder.UpdateCombinedMesh();
+                }
             }
-        }
-        
-        // GUILayout.Space(10);
-        // GUI.enabled = true;
-        // builder.currentUserName = EditorGUILayout.TextField("Username", builder.currentUserName);
-        // builder.currentUserId = EditorGUILayout.TextField("User ID", builder.currentUserId);
-        // GUI.enabled = !downloading;
-        // if (GUILayout.Button("Equip User Outfit")) {
-        //     if(!string.IsNullOrEmpty(builder.currentUserName)){
-        //         DownloadUsernameOutfit(builder);
-        //     }
-        //     if(!string.IsNullOrEmpty(builder.currentUserId)){
-        //         Debug.Log("Equipping user outfit " + builder.currentUserId);
-        //         DownloadUserOutfit(builder);
-        //     }
-        // }
-        // GUI.enabled = true;
-        // GUILayout.Space(30);
 
-        if (GUILayout.Button("Clear Outfit")) {
-            if(downloading){
-                builder.cancelPendingDownload = true;
-                downloading = false;
+            // GUILayout.Space(10);
+            // GUI.enabled = true;
+            // builder.currentUserName = EditorGUILayout.TextField("Username", builder.currentUserName);
+            // builder.currentUserId = EditorGUILayout.TextField("User ID", builder.currentUserId);
+            // GUI.enabled = !downloading;
+            // if (GUILayout.Button("Equip User Outfit")) {
+            //     if(!string.IsNullOrEmpty(builder.currentUserName)){
+            //         DownloadUsernameOutfit(builder);
+            //     }
+            //     if(!string.IsNullOrEmpty(builder.currentUserId)){
+            //         Debug.Log("Equipping user outfit " + builder.currentUserId);
+            //         DownloadUserOutfit(builder);
+            //     }
+            // }
+            // GUI.enabled = true;
+            // GUILayout.Space(30);
+
+            if (GUILayout.Button("Clear Outfit")) {
+                if(downloading){
+                    builder.cancelPendingDownload = true;
+                    downloading = false;
+                }
+                Debug.Log("Clearing outfit.");
+                builder.RemoveAll();
+                builder.SetSkinColor(new Color(0.7169812f, 0.5064722f, 0.3754005f));
+                builder.UpdateCombinedMesh();
             }
-            Debug.Log("Clearing outfit.");
-            builder.RemoveAll();
-            builder.SetSkinColor(new Color(0.7169812f, 0.5064722f, 0.3754005f));
-            builder.UpdateCombinedMesh();
-        }
 
 
-        if(GUI.changed){
-            EditorUtility.SetDirty(builder);
+            if(GUI.changed){
+                EditorUtility.SetDirty(builder);
+            }
         }
-    }
 
-    // private async Task DownloadUserOutfit(AccessoryBuilder builder) {
-    //     Debug.Log("Starting download");
-    //     downloading = true;
-    //     await builder.AddOutfitFromUserId(builder.currentUserId);
-    //     Debug.Log("Done with download");
-    //     downloading = false;
-    // }
-    //
-    // private async Task DownloadUsernameOutfit(AccessoryBuilder builder) {
-    //     Debug.Log("Starting download");
-    //     downloading = true;
-    //     await builder.EquipOutfitFromUsername(builder.currentUserName);
-    //     Debug.Log("Done with download");
-    //     downloading = false;
-    // }
+        // private async Task DownloadUserOutfit(AccessoryBuilder builder) {
+        //     Debug.Log("Starting download");
+        //     downloading = true;
+        //     await builder.AddOutfitFromUserId(builder.currentUserId);
+        //     Debug.Log("Done with download");
+        //     downloading = false;
+        // }
+        //
+        // private async Task DownloadUsernameOutfit(AccessoryBuilder builder) {
+        //     Debug.Log("Starting download");
+        //     downloading = true;
+        //     await builder.EquipOutfitFromUsername(builder.currentUserName);
+        //     Debug.Log("Done with download");
+        //     downloading = false;
+        // }
+    }
 }

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs

@@ -71,6 +71,11 @@ namespace Editor.Accessories.Clothing {
 
         public async Task BuildAllPlatforms() {
             var st = Stopwatch.StartNew();
+
+            if (!AirshipPackagesWindow.VerifyBuildModules(true)) {
+                return;
+            }
+
             bool success = true;
 
             List<AirshipPlatform> platforms = new();
@@ -193,6 +198,15 @@ namespace Editor.Accessories.Clothing {
 
                 bundlePaths.Add(path);
             }
+            // {
+            //     var path = await this.BuildPlatform(AirshipPlatform.Windows, airId);
+            //     if (string.IsNullOrEmpty(path)) {
+            //         success = false;
+            //         return;
+            //     }
+            //
+            //     bundlePaths.Add(path);
+            // }
 
             if (!success) return;
 
@@ -202,6 +216,7 @@ namespace Editor.Accessories.Clothing {
             for (int i = 0; i < platforms.Count; i++) {
                 var platform = platforms[i];
                 var buildOutputFile = bundlePaths[i];
+                // var buildOutputFile = bundlePaths[0];
 
                 // Update air asset
                 var bytes = await File.ReadAllBytesAsync(buildOutputFile);
@@ -279,6 +294,7 @@ namespace Editor.Accessories.Clothing {
         /// <returns>Path to built bundle. Empty string if it failed.</returns>
         private async Task<string> BuildPlatform(AirshipPlatform platform, string airId) {
             var st = Stopwatch.StartNew();
+
             var manifest = (PlatformGearBundleManifest)this.target;
 
             var buildOutputFolder = "bundles/gear/";
@@ -340,7 +356,7 @@ namespace Editor.Accessories.Clothing {
                 CreateAssetBundles.buildingBundles = false;
                 AirshipScriptableBuildPipelineConfig.buildingGameBundles = false;
                 if (returnCode != ReturnCode.Success) {
-                    Debug.LogError("Failed to build asset bundles. ReturnCode=" + returnCode);
+                    Debug.LogError("Failed to build asset bundles. ReturnCode: " + returnCode);
                     return null;
                 }
                 Debug.Log($"Finished building {platform} in {st.Elapsed.TotalSeconds} seconds.");

package/Editor/Build/AirshipIOSBuildProcessor.cs

@@ -19,6 +19,7 @@ namespace Editor.Build {
             var root = plist.root;
             var buildKey = "NSCameraUsageDescription";
             root.SetString(buildKey, "Use the camera to take profile pictures.");
+            root.SetBoolean("ITSAppUsesNonExemptEncryption", false);
             root.SetBoolean("GCSupportsGameMode", true);
             File.WriteAllText(plistPath, plist.WriteToString());
 #endif

package/Editor/BuildMenu.cs

@@ -2,6 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Code.Bootstrap;
+using NUnit;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Profile;
@@ -42,7 +44,7 @@ namespace Editor {
             return $"{gb:F2} GB [{bytes} bytes]";
         }
 
-        private static void OnBuild() {
+        public static void OnBuild() {
             PhysicsSetup.Setup();
         }
 
@@ -266,8 +268,16 @@ namespace Editor {
             ReleaseAPK,
             ReleaseAAB,
         }
+
+        public enum AndroidEnvironment {
+            Production,
+            Staging,
+        }
         
-        public static void BuildAndroidClient(AndroidBuildType buildType) {
+        public static void BuildAndroidClient(AndroidBuildType buildType, AndroidEnvironment environment) {
+#if AIRSHIP_PLAYER
+           StreamingAssets.SetCoreMaterialPlatform(AirshipPlatform.Android);
+            
             var development = buildType == AndroidBuildType.DevelopmentAPK;
             var buildApk = buildType != AndroidBuildType.ReleaseAAB;
 
@@ -279,18 +289,35 @@ namespace Editor {
             PlayerSettings.SplashScreen.show = false;
             PlayerSettings.SetScriptingBackend(NamedBuildTarget.Android, ScriptingImplementation.IL2CPP);
             PlayerSettings.Android.splitApplicationBinary = !buildApk;
-
+            PlayerSettings.Android.applicationEntry = AndroidApplicationEntry.GameActivity;
+            
+            PlayerSettings.Android.keyaliasName = environment switch {
+                AndroidEnvironment.Production => "airship",
+                AndroidEnvironment.Staging => "airship-staging",
+                _ => throw new ArgumentOutOfRangeException(nameof(environment), environment, null)
+            };
+            
+            var editorBuildScenes = new List<EditorBuildSettingsScene>();
+            foreach (var sceneName in scenes) {
+                editorBuildScenes.Add(new EditorBuildSettingsScene(sceneName, true));
+            }
+            
             BuildProfile buildProfile;
             if (development) {
                 buildProfile = AssetDatabase.LoadAssetAtPath<BuildProfile>("Assets/Settings/Build Profiles/Android Debug.asset");
             } else {
                 buildProfile = AssetDatabase.LoadAssetAtPath<BuildProfile>("Assets/Settings/Build Profiles/Android Google Play.asset");
             }
-            var options = new BuildPlayerWithProfileOptions();
-            var editorBuildScenes = new List<EditorBuildSettingsScene>();
-            foreach (var sceneName in scenes) {
-                editorBuildScenes.Add(new EditorBuildSettingsScene(sceneName, true));
+
+            var defines = new List<string>();
+            defines.Add("AIRSHIP_PLAYER");
+            if (environment == AndroidEnvironment.Staging) {
+                defines.Add("AIRSHIP_STAGING");
+                defines.Add("AIRSHIP_INTERNAL");
             }
+            buildProfile.scriptingDefines = defines.ToArray();
+            
+            var options = new BuildPlayerWithProfileOptions();
             buildProfile.overrideGlobalScenes = true;
             buildProfile.scenes = editorBuildScenes.ToArray();
             options.buildProfile = buildProfile;
@@ -298,8 +325,9 @@ namespace Editor {
             if (development) {
                 options.options = BuildOptions.Development | BuildOptions.ConnectWithProfiler;
             }
-
-            var report = BuildPipeline.BuildPlayer(options);
+        
+            var  report = BuildPipeline.BuildPlayer(options);
+            
             var summary = report.summary;
             switch (summary.result) {
                 case BuildResult.Succeeded:
@@ -319,8 +347,10 @@ namespace Editor {
 #endif
                     break;
             }
-
+            
+            StreamingAssets.ResetCoreMaterials();
             CreateAssetBundles.AddAllGameBundleScenes();
+#endif
         }
 
 #if AIRSHIP_PLAYER
@@ -354,19 +384,29 @@ namespace Editor {
             BuildIOSClient(true, true);
         }
 
-        [MenuItem("Airship/Create Binary/Client/Android (Google Play)", priority = 80)]
+        [MenuItem("Airship/Create Binary/Client/Android/Android Release (Google Play)", priority = 10)]
         public static void BuildAndroidClientMenuItem() {
-            BuildAndroidClient(AndroidBuildType.ReleaseAAB);
+            BuildAndroidClient(AndroidBuildType.ReleaseAAB, AndroidEnvironment.Production);
         }
         
-        [MenuItem("Airship/Create Binary/Client/Android (APK)", priority = 80)]
+        [MenuItem("Airship/Create Binary/Client/Android/Android APK", priority = 80)]
         public static void BuildAndroidProdAPK() {
-            BuildAndroidClient(AndroidBuildType.ReleaseAPK);
+            BuildAndroidClient(AndroidBuildType.ReleaseAPK, AndroidEnvironment.Production);
         }
 
-        [MenuItem("Airship/Create Binary/Client/Android (Development APK)", priority = 80)]
+        [MenuItem("Airship/Create Binary/Client/Android/Android APK (Development)", priority = 80)]
         public static void BuildAndroidDevelopmentClientMenuItem() {
-            BuildAndroidClient(AndroidBuildType.DevelopmentAPK);
+            BuildAndroidClient(AndroidBuildType.DevelopmentAPK, AndroidEnvironment.Production);
+        }
+        
+        [MenuItem("Airship/Create Binary/Client/Android/Android Staging APK", priority = 150)]
+        public static void BuildAndroidProdStagingAPK() {
+            BuildAndroidClient(AndroidBuildType.ReleaseAPK, AndroidEnvironment.Staging);
+        }
+
+        [MenuItem("Airship/Create Binary/Client/Android/Android Staging APK (Development)", priority = 150)]
+        public static void BuildAndroidDevelopmentStagingClientMenuItem() {
+            BuildAndroidClient(AndroidBuildType.DevelopmentAPK, AndroidEnvironment.Staging);
         }
 #endif
 

package/Editor/Easy.Airship.Editor.asmdef

@@ -67,7 +67,8 @@
         "GUID:2a0340569ab0e1245a38e0d6c7b2529b",
         "GUID:befe48b9a36afc04ea625c93daad910e",
         "GUID:5966039ae77c64b44bc04472c1ae63bb",
-        "GUID:8db43d2f2329593428db90e3b3a6034c"
+        "GUID:8db43d2f2329593428db90e3b3a6034c",
+        "GUID:15fc0a57446b3144c949da3e2b9737a9"
     ],
     "includePlatforms": [
         "Editor"

package/Editor/Publish/Deploy.cs

@@ -19,6 +19,7 @@ using UnityEditor;
 using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.Networking;
+using UnityEngine.Rendering;
 using UnityEngine.SceneManagement;
 using Debug = UnityEngine.Debug;
 

package/Editor/Quality/QualityConfig.cs

@@ -2,6 +2,7 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal;
 
 namespace Editor.Quality {
     [InitializeOnLoad]
@@ -34,9 +35,12 @@ namespace Editor.Quality {
             // Not super necessary, so if we notice animation issues on mobile we can increase this.
             QualitySettings.skinWeights = SkinWeights.TwoBones;
 
-            QualitySettings.renderPipeline =
-                AssetDatabase.LoadAssetAtPath<RenderPipelineAsset>(
-                    "Packages/gg.easy.airship/URP/AirshipMobileURPAsset.asset");
+            var pipeline = (UniversalRenderPipelineAsset) AssetDatabase.LoadAssetAtPath<RenderPipelineAsset>(
+                "Packages/gg.easy.airship/URP/AirshipMobileURPAsset.asset");
+            QualitySettings.renderPipeline = pipeline;
+
+            pipeline.shadowCascadeCount = 2;
+            pipeline.cascade4Split = new Vector3(0.067f, 0.2f, 0.467f);
         }
 
         private static void ConfigureForNormal() {
@@ -44,9 +48,13 @@ namespace Editor.Quality {
 
             QualitySettings.skinWeights = SkinWeights.FourBones;
 
-            QualitySettings.renderPipeline =
-                AssetDatabase.LoadAssetAtPath<RenderPipelineAsset>(
-                    "Packages/gg.easy.airship/URP/AirshipURPAsset.asset");
+            var pipeline = (UniversalRenderPipelineAsset) AssetDatabase.LoadAssetAtPath<RenderPipelineAsset>(
+                "Packages/gg.easy.airship/URP/AirshipURPAsset.asset");
+
+            QualitySettings.renderPipeline = pipeline;
+
+            pipeline.shadowCascadeCount = 2;
+            pipeline.cascade4Split = new Vector3(0.067f, 0.2f, 0.467f);
         }
 
         private static void SwapToQualityLevel(string name) {

package/Editor/StreamingAssets.cs

@@ -0,0 +1,82 @@
+using System;
+using System.IO;
+using Code.Bootstrap;
+using Editor;
+using Editor.Util;
+using UnityEditor;
+using UnityEngine;
+
+#if AIRSHIP_PLAYER
+internal class StreamingAssets {
+    private static readonly string ShippedBundles = "Assets/StreamingAssets/ShippedBundles";
+    private static readonly string ShippedBundlesTmp = "Assets/StreamingAssets/ShippedBundles~";
+
+    public static readonly string CoreMaterialsAndroid = "Assets/StreamingAssets/ShippedBundles/CoreMaterials_Android";
+    public static readonly string CoreMaterialsWindows = "Assets/StreamingAssets/ShippedBundles/CoreMaterials_Windows";
+    public static readonly string CoreMaterialsIOS = "Assets/StreamingAssets/ShippedBundles/CoreMaterials_iOS";
+    public static readonly string CoreMaterialsMac = "Assets/StreamingAssets/ShippedBundles/CoreMaterials_Mac";
+
+    public static readonly string RelativeResourcesPath = "@easy/corematerials_shared/resources";
+    
+    private static void ExcludeStreamingAssetsPath(string path) {
+        var targetPath = path.Replace("StreamingAssets", "StreamingAssets~");
+        
+        if (!Directory.Exists(targetPath)) {
+            Directory.CreateDirectory(targetPath);
+        }
+        Directory.Move(path, targetPath);
+    }
+
+    private static void FixStreamingAssetsPath(string sourcePath) {
+        var resourcePath = PosixPath.Join(sourcePath, RelativeResourcesPath);
+        var excludedResourcePath = resourcePath.Replace("StreamingAssets", "StreamingAssets~");
+        if (!File.Exists(excludedResourcePath)) {
+            Debug.LogWarning($"Could not find {excludedResourcePath}");
+            return;
+        }
+        File.Move(excludedResourcePath, resourcePath);
+        AssetDatabase.ImportAsset(resourcePath);
+    }
+    
+    public static void SetCoreMaterialPlatform(AirshipPlatform platform) {
+        var platformPath = platform switch {
+            AirshipPlatform.Android => CoreMaterialsAndroid,
+            _ => throw new ArgumentOutOfRangeException(nameof(platform), platform, null)
+        };
+
+        var paths = new[] {
+            CoreMaterialsAndroid,
+            CoreMaterialsMac,
+            CoreMaterialsWindows,
+            CoreMaterialsIOS,
+        };
+
+        foreach (var path in paths) {
+            if (path == platformPath) continue;
+            var resourcePath = PosixPath.Join(path, RelativeResourcesPath);
+            if (!File.Exists(resourcePath)) {
+                Debug.LogWarning($"could not find resource path {resourcePath}");
+                continue;
+            }
+
+
+            var targetPath = resourcePath.Replace("StreamingAssets", "StreamingAssets~");
+            var targetFolder = Path.GetDirectoryName(targetPath);
+            if (!Directory.Exists(targetFolder)) {
+                Directory.CreateDirectory(targetFolder);
+            }
+            
+            File.Move(resourcePath, targetPath);
+        }
+        
+        AssetDatabase.ImportAsset("Assets/StreamingAssets", ImportAssetOptions.ImportRecursive);
+    }
+    
+    public static void ResetCoreMaterials() {
+        FixStreamingAssetsPath(CoreMaterialsAndroid);
+        FixStreamingAssetsPath(CoreMaterialsWindows);
+        FixStreamingAssetsPath(CoreMaterialsMac);
+        FixStreamingAssetsPath(CoreMaterialsIOS);
+    }
+}
+#endif

package/Editor/StreamingAssets.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 23b1ca55a86f4a8597889786fd1941ab
+timeCreated: 1758582757