gg.easy.airship 0.1.2144 → 0.1.2145

package/Editor/LuauPluginUpdateCheck.cs

@@ -57,7 +57,7 @@ public static class LuauPluginUpdateCheck {
         if (lastHash != "") {
             // Check if user wants to restart
             var acceptsRestart = EditorUtility.DisplayDialog("Luau Plugin Updated",
-                "The Luau plugin has updated. Restart Unity to apply changes. We're sorry for this..", "Quit", "Cancel");
+                "Airship Luau plugin has updated. Restart Unity to apply changes.", "Quit", "Cancel");
             if (acceptsRestart) {
                 // Verify any unsaved changes are saved
                 var confirmedSaveState = EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo();

package/Editor/TypescriptServices/TypescriptServices.cs

@@ -163,7 +163,11 @@ namespace Airship.Editor {
         private  static IEnumerator StartTypescriptRuntime() {
             TypescriptProjectsService.ReloadProject();
             
-            // if (!EditorIntegrationsConfig.instance.typescriptAutostartCompiler) yield break;
+            // Wait for updates
+            if (AirshipUpdateService.IsUpdatingAirship || AirshipPackagesWindow.IsModifyingPackages) {
+                yield return new WaitUntil(() =>
+                    !AirshipPackagesWindow.IsModifyingPackages && !AirshipUpdateService.IsUpdatingAirship);
+            }
 
             if (TypescriptCompilationService.IsWatchModeRunning) {
                 TypescriptCompilationService.StopCompilerServices(true);

package/Runtime/Code/Airship/Resources/Scripts/MaterialColorURP.cs

@@ -62,7 +62,17 @@ public class MaterialColorURP : MonoBehaviour {
 
     // Called when the color is changed in the inspector
     private void OnValidate() {
-        DoUpdate();
+        #if UNITY_EDITOR
+                if (Application.isPlaying) {
+                    DoUpdate();
+                } else {
+                    EditorApplication.delayCall += () => {
+                        if (this != null) DoUpdate();
+                    };
+                }
+        #else
+            DoUpdate();
+        #endif
     }
 
     private void OnDestroy() {

package/Runtime/Code/Auth/AuthManager.cs

@@ -5,7 +5,9 @@ using Cdm.Authentication.Browser;
 using Cdm.Authentication.Clients;
 using Cdm.Authentication.OAuth2;
 using Code.Http.Internal;
+#if UNITY_ANDROID
 using Google;
+#endif
 using JetBrains.Annotations;
 using Proyecto26;
 using RSG;
@@ -112,6 +114,7 @@ public class AuthManager {
             scope = "openid email profile",
         });
 
+#if UNITY_ANDROID
         GoogleSignIn.Configuration = new GoogleSignInConfiguration() {
 			RequestEmail = true,
 			RequestProfile = true,
@@ -121,6 +124,7 @@ public class AuthManager {
 			ClientSecret = clientSecret,
 #endif
         };
+#endif
         
 #if AIRSHIP_ANDROID_DEBUG
         GoogleSignIn.DefaultInstance.EnableDebugLogging(true);

package/Runtime/Code/Bootstrap/ClientBundleLoader.cs

@@ -252,7 +252,7 @@ namespace Code.Bootstrap {
 
             this.codeReceiveSt.Restart();
 
-            print("Requesting scripts from server..");
+            print("[Airship] Requesting scripts from server...");
             NetworkClient.Send(new RequestScriptsMessage());
         }
 

package/Runtime/Code/Bundles/AirshipLuauDebugger.cs

@@ -68,11 +68,6 @@ public class AirshipLuauDebugger : NetworkBehaviour {
 				var n = "(Destroyed)";
 				if (unityObj != null) {
 					n = unityObj.name;
-				} else {
-					var cachedName = ThreadDataManager.GetObjectReferenceName_TEMP_DEBUG(instanceId);
-					if (cachedName != null) {
-						n = cachedName + " (Destroyed)";
-					}
 				}
 				var objName = $"[{t.Name}] {n}";
 				if (!countByName.TryAdd(objName, 1)) {

package/Runtime/Code/Bundles/SystemRoot.cs

@@ -324,7 +324,7 @@ public class SystemRoot : Singleton<SystemRoot> {
 
 #if AIRSHIP_PLAYER || true
 			try {
-				Debug.Log("Scanning network prefabs...");
+				// Debug.Log("Scanning network prefabs...");
 				Debug.Log($"Listing {NetworkClient.prefabs.Count} network prefabs:");
 				int i = 1;
 				foreach (var pair in NetworkClient.prefabs) {

package/Runtime/Code/GoogleSignIn/GoogleSignIn.asmdef

@@ -1,3 +1,16 @@
 {
-	"name": "GoogleSignin"
-}
+    "name": "GoogleSignin",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [
+        "iOS"
+    ],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

package/Runtime/Code/GoogleSignIn/Plugins/iOS/GoogleSignIn.h.meta

@@ -5,7 +5,7 @@ labels:
 - gvh_version-1.0.4
 PluginImporter:
   externalObjects: {}
-  serializedVersion: 2
+  serializedVersion: 3
   iconMap: {}
   executionOrder: {}
   defineConstraints: []
@@ -14,21 +14,22 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
-  - first:
-      Any: 
-    second:
+    Any:
       enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 1
+    Editor:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
+    iOS:
+      enabled: 0
       settings: {}
   userData: 
   assetBundleName: 

package/Runtime/Code/GoogleSignIn/Plugins/iOS/GoogleSignIn.mm.meta

@@ -5,7 +5,7 @@ labels:
 - gvh_version-1.0.4
 PluginImporter:
   externalObjects: {}
-  serializedVersion: 2
+  serializedVersion: 3
   iconMap: {}
   executionOrder: {}
   defineConstraints: []
@@ -14,21 +14,22 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
-  - first:
-      Any: 
-    second:
+    Any:
       enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 1
+    Editor:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
+    iOS:
+      enabled: 0
       settings: {}
   userData: 
   assetBundleName: 

package/Runtime/Code/GoogleSignIn/Plugins/iOS/GoogleSignInAppController.h.meta

@@ -5,7 +5,7 @@ labels:
 - gvh_version-1.0.4
 PluginImporter:
   externalObjects: {}
-  serializedVersion: 2
+  serializedVersion: 3
   iconMap: {}
   executionOrder: {}
   defineConstraints: []
@@ -14,21 +14,22 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
-  - first:
-      Any: 
-    second:
+    Any:
       enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 1
+    Editor:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
+    iOS:
+      enabled: 0
       settings: {}
   userData: 
   assetBundleName: 

package/Runtime/Code/GoogleSignIn/Plugins/iOS/GoogleSignInAppController.mm.meta

@@ -5,7 +5,7 @@ labels:
 - gvh_version-1.0.4
 PluginImporter:
   externalObjects: {}
-  serializedVersion: 2
+  serializedVersion: 3
   iconMap: {}
   executionOrder: {}
   defineConstraints: []
@@ -14,21 +14,22 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
-  - first:
-      Any: 
-    second:
+    Any:
       enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 1
+    Editor:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
+    iOS:
+      enabled: 0
       settings: {}
   userData: 
   assetBundleName: 

package/Runtime/Code/Health/AirshipProfileExporter.cs

@@ -184,7 +184,7 @@ namespace Code.Health
             Profiler.logFile = logPath;
             Profiler.enableBinaryLog = true;
             
-            Debug.Log($"Starting profiler for {durationSecs} seconds.");
+            Debug.Log($"Starting profiler for {durationSecs} seconds. Callstacks = {enableCallstacks}");
             Profiler.enabled = true;
             Profiler.enableAllocationCallstacks = enableCallstacks;
             StopProfilingAfterDelay(logPath, fileName, durationSecs, profileInitiator);

package/Runtime/Code/Luau/AirshipComponent.cs

@@ -61,6 +61,9 @@ public class AirshipComponent : MonoBehaviour {
 	internal static bool UsePostCompileReconciliation { get; set; } = true;
 	private const bool ElevateToProtectedWithinCoreScene = true;
 	
+	private static readonly List<GCHandle> InitGcHandles = new();
+	private static readonly List<IntPtr> InitStringPtrs = new();
+	
 	public static LuauScript.AwakeData QueuedAwakeData = null;
 	public static readonly Dictionary<int, string> ComponentIdToScriptName = new();
 	
@@ -110,6 +113,8 @@ public class AirshipComponent : MonoBehaviour {
 		_validatedSceneInGameConfig = false;
 		QueuedAwakeData = null;
 		ComponentIdToScriptName.Clear();
+		InitGcHandles.Clear();
+		InitStringPtrs.Clear();
 	}
 	
 	public static AirshipComponent Create(GameObject go, string scriptPath, LuauContext context) {
@@ -226,16 +231,17 @@ public class AirshipComponent : MonoBehaviour {
 
 		InitAirshipComponent();
 	}
-	
-	private void InitAirshipComponent() {
-		InitializeAirshipReference();
 
+	private unsafe void InitAirshipComponent() {
+		InitializeAirshipReference();
+		
 		// Ensure all AirshipComponent dependencies are ready first
 		foreach (var dependency in GetDependencies()) {
 			dependency.Init();
 		}
 		
-		var properties = new List<LuauMetadataProperty>(metadata.properties);
+		var properties = metadata.properties;
+		var propertiesCopied = false;
         
 		// Ensure allowed objects
 		for (var i = metadata.properties.Count - 1; i >= 0; i--) {
@@ -245,6 +251,11 @@ public class AirshipComponent : MonoBehaviour {
 				case "object": {
 					if (!ReflectionList.IsAllowedFromString(property.objectType, context)) {
 						Debug.LogError($"[Airship] Skipping AirshipBehaviour property \"{property.name}\": Type \"{property.objectType}\" is not allowed");
+						if (!propertiesCopied) {
+							// As an optimization, we use the original metadata.properties list until we need to modify it at all, such as here:
+							propertiesCopied = true;
+							properties = new List<LuauMetadataProperty>(metadata.properties);
+						}
 						properties.RemoveAt(i);
 					}
 
@@ -253,16 +264,27 @@ public class AirshipComponent : MonoBehaviour {
 			}
 		}
 
-		var propertyDtos = new LuauMetadataPropertyMarshalDto[properties.Count];
-		var gcHandles = new List<GCHandle>();
-		var stringPtrs = new List<IntPtr>();
+		var propertyDtos = properties.Count <= 1024 ?
+			stackalloc LuauMetadataPropertyMarshalDto[properties.Count] : 
+			new LuauMetadataPropertyMarshalDto[properties.Count];
+		
 		for (var i = 0; i < properties.Count; i++) {
 			var property = properties[i];
-			property.AsStructDto(thread, gcHandles, stringPtrs, out var dto);
+			property.AsStructDto(thread, InitGcHandles, InitStringPtrs, out var dto);
 			propertyDtos[i] = dto;
 		}
 		
 		LuauPlugin.LuauInitializeAirshipComponent(context, thread, AirshipBehaviourRootV2.GetId(gameObject), _airshipComponentId, propertyDtos);
+
+		// Free handles:
+		foreach (var handle in InitGcHandles) {
+			handle.Free();
+		}
+		foreach (var strPtr in InitStringPtrs) {
+			Marshal.FreeCoTaskMem(strPtr);
+		}
+		InitGcHandles.Clear();
+		InitStringPtrs.Clear();
 	}
 
 	private void Start() {
@@ -470,6 +492,9 @@ public class AirshipComponent : MonoBehaviour {
     }
     
     private void OnValidate() {
+	    if (Application.isPlaying) {
+		    return;
+	    }
 	    Validate();
     }