gg.easy.airship 0.1.2184 → 0.1.2186

package/Editor/AirshipComponentEditor.cs

@@ -598,6 +598,9 @@ public class ScriptBindingEditor : UnityEditor.Editor {
             case "IntEnum":
                 DrawCustomIntEnumProperty(guiContent, bindingProp, value, modified);
                 break;
+            case "FlagEnum":
+                DrawCustomFlagEnumProperty(guiContent, bindingProp, value, modified);
+                break;
             case "boolean" or "bool":
                 DrawCustomBoolProperty(guiContent, type, decorators, value, modified);
                 break;
@@ -642,6 +645,11 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                 GUILayout.Label($"{propName.stringValue}: {type.stringValue} not yet supported");
                 break;
         }
+
+        if (Application.isPlaying) {
+            var component = (AirshipComponent)target;
+            component.WriteChangedComponentProperties();
+        }
         
         if (hasOverride && Event.current.type == EventType.Repaint) {
             var lastRect = GUILayoutUtility.GetLastRect();
@@ -851,11 +859,22 @@ public class ScriptBindingEditor : UnityEditor.Editor {
             }
             case AirshipComponentPropertyType.AirshipObject: {
                 var objOld = objectRefs.arraySize > index ? objectRefs.GetArrayElementAtIndex(index).objectReferenceValue : null;
-                var objNew = EditorGUI.ObjectField(rect, label, objOld, objectType, true);
-                if (objOld != objNew) {
-                    objectRefs.GetArrayElementAtIndex(index).objectReferenceValue = objNew;
-                    arrayModified.boolValue = true;
+
+                if (objectType == typeof(Sprite) || objectType == typeof(Texture2D)) {
+                    var objNew = AirshipEditorGUI.ObjectField(rect, new GUIContent(label), objOld, objectType, true);
+                    if (objOld != objNew) {
+                        objectRefs.GetArrayElementAtIndex(index).objectReferenceValue = objNew;
+                        arrayModified.boolValue = true;
+                    }
+                } else {
+                    var objNew = EditorGUI.ObjectField(rect, label, objOld, objectType, true);
+                    if (objOld != objNew) {
+                        objectRefs.GetArrayElementAtIndex(index).objectReferenceValue = objNew;
+                        arrayModified.boolValue = true;
+                    }
                 }
+                
+
                 break;
             }
             default:
@@ -882,11 +901,11 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         {
             newValue = Math.Max(Convert.ToInt32(minParams[0].value), newValue);
         }
-        if (modifiers.TryGetValue("Max", out var maxParams))
-        {
+
+        if (modifiers.TryGetValue("Max", out var maxParams)) {
             newValue = Math.Min(Convert.ToInt32(maxParams[0].value), newValue);
         }
-        
+
         if (newValue != currentValue) {
             value.stringValue = newValue.ToString(CultureInfo.InvariantCulture);
             modified.boolValue = true;
@@ -981,7 +1000,7 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         
         List<GUIContent> items = new();
         foreach (var item in enumerableType.members) {
-            items.Add(new GUIContent(ObjectNames.NicifyVariableName(item.Name) + " [" + item.IntValue + "]") );
+            items.Add(new GUIContent(ObjectNames.NicifyVariableName(item.Name)) );
         }
             
         int idx = 0;
@@ -1004,6 +1023,28 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     private void DrawCustomIntEnumProperty(GUIContent guiContent, LuauMetadataProperty metadataProperty,
         SerializedProperty value, SerializedProperty modified) {
         //
+        if (!AirshipEditorInfo.Instance) {
+            EditorGUILayout.HelpBox("Cannot find editor info", MessageType.Error);
+            return;
+        }
+
+        if (metadataProperty.refPath == null) {
+            EditorGUILayout.HelpBox("Cannot find refPath", MessageType.Error);
+            return;
+        }
+        
+        var tsEnum = AirshipEditorInfo.Enums.GetEnum(metadataProperty.refPath);
+        if (tsEnum == null) {
+            EditorGUILayout.HelpBox("Cannot find enum from refPath", MessageType.Error);
+            return;
+        }
+
+        DrawCustomIntEnumDropdown(guiContent, tsEnum, value, modified, null);
+    }
+    
+    private void DrawCustomFlagEnumProperty(GUIContent guiContent, LuauMetadataProperty metadataProperty,
+        SerializedProperty value, SerializedProperty modified) {
+
         if (!AirshipEditorInfo.Instance) return;
 
         if (metadataProperty.refPath == null) {
@@ -1012,8 +1053,25 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         
         var tsEnum = AirshipEditorInfo.Enums.GetEnum(metadataProperty.refPath);
         if (tsEnum == null) return;
+        
+        int.TryParse(value.stringValue, out int currentMask);
 
-        DrawCustomIntEnumDropdown(guiContent, tsEnum, value, modified, null);
+#if AIRSHIP_INTERNAL
+        EditorGUILayout.BeginHorizontal();
+#endif
+        var newMask = EditorGUILayout.MaskField(guiContent, currentMask, tsEnum.flagNames);
+        if (newMask != currentMask) {
+            value.stringValue = newMask.ToString(CultureInfo.InvariantCulture);
+            modified.boolValue = true;
+        }
+
+#if AIRSHIP_INTERNAL
+        GUI.enabled = false;
+        EditorGUILayout.IntField(newMask, GUILayout.Width(100));
+        EditorGUILayout.Toggle("", tsEnum.isFlagLike, GUILayout.Width(30));
+        GUI.enabled = true;
+        EditorGUILayout.EndHorizontal();
+#endif
     }
     
     private void DrawCustomStringEnumProperty(GUIContent guiContent, LuauMetadataProperty metadataProperty, SerializedProperty value,
@@ -1097,11 +1155,11 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         {
             currentValue = 0;
         }
-        int newValue = EditorGUILayout.LayerField(guiContent, currentValue);
-        if (newValue != currentValue)
-        {
-            value.stringValue = newValue.ToString(CultureInfo.InvariantCulture);
-            modified.boolValue = true;
+
+        int maskValue = EditorGUILayout.MaskField(guiContent, currentValue, GameConfig.Load().gameLayers);
+        if (maskValue != currentValue) {
+            value.stringValue = maskValue.ToString(CultureInfo.InvariantCulture);
+            modified.boolValue = true;   
         }
     }
     
@@ -1225,7 +1283,13 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     private void DrawCustomObjectProperty(GUIContent guiContent, SerializedProperty type, SerializedProperty modifiers, SerializedProperty obj, SerializedProperty objType, SerializedProperty modified) {
         var currentObject = obj.objectReferenceValue;
         var t = objType.stringValue != "" ? TypeReflection.GetTypeFromString(objType.stringValue) : typeof(Object);
-        var newObject = EditorGUILayout.ObjectField(guiContent, currentObject, t, true);
+
+        UnityEngine.Object newObject;
+        if (t == typeof(Sprite) || t == typeof(Texture2D)) {
+            newObject = AirshipEditorGUI.ObjectFieldLayout(guiContent, currentObject, t, true);
+        } else {
+            newObject = EditorGUILayout.ObjectField(guiContent, currentObject, t, true);
+        }
             
         if (newObject != currentObject) {
             obj.objectReferenceValue = newObject;

package/Editor/AirshipScriptGUI.cs

@@ -1,5 +1,6 @@
 #if UNITY_EDITOR
 using System;
+using Editor.EditorInternal;
 using JetBrains.Annotations;
 using Luau;
 using UnityEditor;
@@ -187,7 +188,7 @@ namespace Code.Luau {
                         temp.image = displayIcon;
                     }
                     
-                    EditorStyles.objectField.Draw(position, temp, id, DragAndDrop.activeControlID == id,
+                    AirshipEditorGUI.nonClippingObjectField.Draw(position, temp, id, DragAndDrop.activeControlID == id,
                         position.Contains(Event.current.mousePosition));
 
 
@@ -242,6 +243,10 @@ namespace Code.Luau {
             var r = EditorGUILayout.GetControlRect(false, ObjectField.singleLineHeight);
             return AirshipBehaviourField(r, content, script, airshipComponent, null);
         }
+
+        internal static Sprite AirshipSpriteField(Rect position, GUIContent content, Sprite sprite) {
+            return (Sprite) AirshipEditorInternals.DoCustomObjectField(position, content, sprite, typeof(Sprite));
+        }
     }
 }
 #endif

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;
@@ -78,7 +80,7 @@ namespace Editor {
                 locationPathName = $"build/StandaloneLinux64/{ServerExecutableName}",
                 options = BuildOptions.Development,
             };
-            
+
             var report = BuildPipeline.BuildPlayer(options);
             var summary = report.summary;
             switch (summary.result) {
@@ -87,12 +89,18 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.Log("Build Linux failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.Log("Build Linux unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
-            
+
             CreateAssetBundles.AddAllGameBundleScenes();
         }
 
@@ -142,9 +150,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.LogError("Build Mac failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.LogError("Build Mac unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 
@@ -181,9 +195,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.LogError("Build Mac failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.LogError("Build Mac unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 
@@ -227,9 +247,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.LogError("Build iOS failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.LogError("Build iOS unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 
@@ -242,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;
 
@@ -255,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;
@@ -274,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:
@@ -284,13 +336,21 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.LogError("Build Android failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.LogError("Build Android unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
-
+            
+            StreamingAssets.ResetCoreMaterials();
             CreateAssetBundles.AddAllGameBundleScenes();
+#endif
         }
 
 #if AIRSHIP_PLAYER
@@ -324,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
 
@@ -371,9 +441,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.Log("Build Windows failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.Log("Build Windows unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 
@@ -407,9 +483,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.Log("Build Windows failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.Log("Build Windows unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 

package/Editor/EditorInternal/AirshipEditorInternals.cs

@@ -1,4 +1,7 @@
-using UnityEditor;
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.EventSystems;
 
 namespace Editor.EditorInternal {
     public class AirshipEditorInternals {
@@ -11,5 +14,62 @@ namespace Editor.EditorInternal {
         internal static bool GetBoldDefaultFont() {
             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 UnityEngine.Object DoCustomObjectField(Rect position, GUIContent label,
+            UnityEngine.Object value, System.Type type) {
+            int id = "s_ObjectField".GetHashCode();
+            var eventType = Event.current;
+
+            position = EditorGUI.PrefixLabel(position, label);
+
+            switch (eventType.type) {
+                case EventType.MouseDown: {
+                    if (position.Contains(UnityEngine.Event.current.mousePosition) &&
+                        UnityEngine.Event.current.button == 0) {
+                        // Rect buttonRect = EditorGUI.GetButtonRect(visualType, position);
+                        EditorGUIUtility.editingTextField = false;
+                        if (GUI.enabled) {
+                            ShowObjectSelector(value, type, null, true);
+                        }
+                    }
+
+                    break;
+                }
+                case EventType.Repaint: {
+                    EditorGUI.BeginHandleMixedValueContentColor();
+
+                    GUIContent content = EditorGUIUtility.ObjectContent(value, type, false);
+                    Color contentColor = GUI.contentColor;
+                    float a = contentColor.a;
+
+                    try {
+                        if (value == null) {
+                            contentColor.a = 0.7f;
+                            GUI.contentColor = contentColor;
+                        }
+
+                        var buttonRect = new Rect(position.xMax - 19f, position.y, 19f, position.height);
+                        Rect position1 = EditorStyles.objectFieldButton.margin.Remove(buttonRect);
+                        EditorStyles.objectField.Draw(position, content, id, DragAndDrop.activeControlID == id,
+                            position.Contains(UnityEngine.Event.current.mousePosition));
+                        EditorStyles.objectFieldButton.Draw(position1, GUIContent.none, id,
+                            DragAndDrop.activeControlID == id,
+                            position1.Contains(UnityEngine.Event.current.mousePosition));
+
+                        EditorGUI.EndHandleMixedValueContentColor();
+                        break;
+                    } finally {
+                        contentColor.a = a;
+                        GUI.contentColor = contentColor;
+                    }
+                }
+            }
+
+            return null;
+        }
     }
 }