gg.easy.airship 0.1.2176 → 0.1.2178

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs

@@ -1,4 +1,4 @@
-#if AIRSHIP_INTERNAL
+// #if AIRSHIP_INTERNAL
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -387,4 +387,4 @@ namespace Editor.Accessories.Clothing {
         }
     }
 }
-#endif
+// #endif

package/Editor/AirshipComponentEditor.cs

@@ -1083,10 +1083,10 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     
     private void DrawCustomRectProperty(GUIContent guiContent, SerializedProperty type, SerializedProperty modifiers, SerializedProperty value, SerializedProperty modified)
     {
-        var currentValue = JsonUtility.FromJson<Rect>(value.stringValue);
+        var currentValue = LuauMetadataPropertySerializer.DeserializeRect(value.stringValue);
         var newValue = EditorGUILayout.RectField(guiContent, currentValue);
         if (newValue != currentValue) {
-            value.stringValue = JsonUtility.ToJson(newValue);
+            value.stringValue = LuauMetadataPropertySerializer.SerializeRect(newValue);
             modified.boolValue = true;
         }
     }

package/Editor/Build/AutoIncrementIOSBuildNumber.cs

@@ -0,0 +1,26 @@
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+using UnityEngine;
+
+namespace Editor.Build {
+    public class AutoIncrementIOSBuildNumber : IPreprocessBuildWithReport {
+        // This makes sure the script runs before the build starts.
+        public int callbackOrder => 0;
+
+        public void OnPreprocessBuild(BuildReport report) {
+            if (report.summary.platform == BuildTarget.iOS) {
+                // Get current build number
+                int currentBuild = int.Parse(PlayerSettings.iOS.buildNumber);
+
+                // Increment by 1
+                int newBuild = currentBuild + 1;
+
+                // Set the new build number
+                PlayerSettings.iOS.buildNumber = newBuild.ToString();
+
+                Debug.Log($"[iOS] Auto-incremented build number: {currentBuild} → {newBuild}");
+            }
+        }
+    }
+}

package/Editor/Build/AutoIncrementIOSBuildNumber.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3f671b56afeae4e4882356894b25c412

package/Editor/BuildMenu.cs

@@ -43,9 +43,7 @@ namespace Editor {
         }
 
         private static void OnBuild() {
-            PhysicsSetup.Setup(null);
-
-
+            PhysicsSetup.Setup();
         }
 
         public static void BuildLinuxServerStaging() {

package/Editor/CreateAssetBundles.cs

@@ -239,24 +239,13 @@ public static class CreateAssetBundles {
 
 	public static GameConfig BuildGameConfig() {
 		GameConfig gameConfig = GameConfig.Load();
-
-		// Update tags
-		var tagList = UnityEditorInternal.InternalEditorUtility.tags[7..];
-		if (tagList.Length > GameConfig.MaximumTags) {
-			Debug.LogError($"Maximum number of allowed unity tags in Airship is {GameConfig.MaximumTags} - you have {tagList.Length} defined.");
+		try {
+			gameConfig.SerializeSettings();
+		} catch (Exception ex) {
+			Debug.LogError("Error when copying Unity properties to GameConfig: " + ex);
 			return null;
 		}
-		gameConfig.gameTags = tagList.ToArray();
 
-		// Update layers
-		var layers = new List<string>();
-		for (int i = 0; i < 31; i++) {
-			var layerName = LayerMask.LayerToName(i);
-			layers.Add(layerName);
-		}
-		gameConfig.gameLayers = layers.ToArray();
-		gameConfig.SerializeSettings();       
-		
 		// Local source packages set to forceLatest
 		foreach (var package in gameConfig.packages) {
 			if (package.localSource) {

package/Editor/Easy.Airship.Editor.asmdef

@@ -17,7 +17,6 @@
         "GUID:33b0850c3f930a440abe6b01a9898921",
         "GUID:5c1ff9bd975acec488150743d53a93ca",
         "GUID:c5ecc461727906345a35491a0440694f",
-        "GUID:5966039ae77c64b44bc04472c1ae63bb",
         "GUID:894a6cc6ed5cd2645bb542978cbed6a9",
         "GUID:4c25c05f410a3a447a75c3b0909152ef",
         "GUID:7f7d1af65c2641843945d409d28f2e20",
@@ -39,7 +38,6 @@
         "GUID:36bccdedfe0feeb4daf43bef9e43b65b",
         "GUID:17013b2a21298c14ea4808251346a38a",
         "GUID:ec266f293c0b4f6c9d06847488a52a0c",
-        "GUID:8db43d2f2329593428db90e3b3a6034c",
         "GUID:9e34ae0a5b8947247abb9d001d89e512",
         "GUID:199bc21c5ec6a3e41b1d67e225a7bd04",
         "GUID:103be11cab738ef4d849a96eca5df2eb",
@@ -67,7 +65,9 @@
         "GUID:3b5390adca4e2bb4791cb930316d6f3e",
         "GUID:725ee7191c021de4dbf9269590ded755",
         "GUID:2a0340569ab0e1245a38e0d6c7b2529b",
-        "GUID:befe48b9a36afc04ea625c93daad910e"
+        "GUID:befe48b9a36afc04ea625c93daad910e",
+        "GUID:5966039ae77c64b44bc04472c1ae63bb",
+        "GUID:8db43d2f2329593428db90e3b3a6034c"
     ],
     "includePlatforms": [
         "Editor"

package/Editor/GameConfig/EditorGameConfigSerializer.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Diagnostics;
+using UnityEditor;
+using UnityEngine;
+using Debug = UnityEngine.Debug;
+
+[InitializeOnLoad]
+public class EditorGameConfigSerializer {
+    static EditorGameConfigSerializer() {
+        #if !AIRSHIP_PLAYER
+        EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
+        #endif
+    }
+
+    private static void OnPlayModeStateChanged(PlayModeStateChange stateChange) {
+        if (stateChange == PlayModeStateChange.ExitingEditMode) {
+            try {
+                var gameConfig = GameConfig.Load();
+                
+                // Only Dirty & Save GameConfig if the JSON changes. On my device takes less than 10ms if no changes
+                // were found. If we do have to save this takes around 80ms.
+                var prevHash = JsonUtility.ToJson(gameConfig).GetHashCode();
+                gameConfig.SerializeSettings();
+                if (prevHash != JsonUtility.ToJson(gameConfig).GetHashCode()) {
+                    EditorUtility.SetDirty(gameConfig);
+                    AssetDatabase.SaveAssetIfDirty(gameConfig);   
+                }
+            } catch (Exception ex) {
+                Debug.LogError("Error when copying Unity properties to GameConfig: " + ex);
+            }
+        }
+    }
+}

package/Editor/GameConfig/EditorGameConfigSerializer.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 07c2968480ef45448314aa4eddd9cc7e
+timeCreated: 1757018905

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -398,7 +398,7 @@ namespace Editor.Packages {
             if (isCoreMaterials) {
                 platforms.Clear();
                 platforms.Add(AirshipPlatform.iOS);
-                // platforms.Add(AirshipPlatform.Android);
+                platforms.Add(AirshipPlatform.Android);
                 // platforms.Add(AirshipPlatform.Windows);
                 // platforms.Add(AirshipPlatform.Mac);
             }
@@ -451,7 +451,7 @@ namespace Editor.Packages {
                     }
 
                     if (platform == AirshipPlatform.iOS || platform == AirshipPlatform.Android) {
-                        CreateAssetBundles.SwapToQualityLevel("Mobile");
+                        CreateAssetBundles.SwapToQualityLevel("Low");
                     } else {
                         CreateAssetBundles.SwapToQualityLevel("Normal");
                     }
@@ -487,6 +487,7 @@ namespace Editor.Packages {
                         yield break;
                     }
 
+
                     // var manifest = BuildPipeline.BuildAssetBundles(
                     //     buildPath,
                     //     builds.ToArray(),
@@ -500,6 +501,8 @@ namespace Editor.Packages {
             }
 
             if (isCoreMaterials) {
+                packageUploadProgress.Remove(packageDoc.id);
+                Repaint();
                 yield break;
             }
 

package/Editor/Publish/Deploy.cs

@@ -9,6 +9,7 @@ using Airship.Editor;
 using Code.Authentication;
 using Code.Bootstrap;
 using Code.Http.Internal;
+using Code.Luau.LuauAssembly.Protection;
 using Code.Platform.Shared;
 using Editor.Packages;
 using Luau;
@@ -60,6 +61,17 @@ public class Deploy {
 		EditorCoroutines.Execute((BuildAndDeploy(platforms.ToArray(), false)));
 	}
 
+	[MenuItem("Airship/Misc/Build Game Asset Bundle")]
+	public static void BuildGameAssetBundleForAnalysis() {
+		List<AirshipPlatform> platforms = new();
+#if UNITY_EDITOR_OSX
+		platforms.Add(AirshipPlatform.Mac);
+#else
+		platforms.Add(AirshipPlatform.Windows);
+#endif
+		EditorCoroutines.Execute((BuildAndDeploy(platforms.ToArray(), false, true, true)));
+	}
+
 	[MenuItem("Airship/Publish Game (Code Only)", priority = 50)]
 	public static void DeployCodeOnly()
 	{
@@ -75,7 +87,7 @@ public class Deploy {
 		EditorCoroutines.Execute((BuildAndDeploy(AirshipPlatformUtil.livePlatforms, false, false)));
 	}
 
-	private static IEnumerator BuildAndDeploy(AirshipPlatform[] platforms, bool skipBuild = false, bool useCache = true) {
+	private static IEnumerator BuildAndDeploy(AirshipPlatform[] platforms, bool skipBuild = false, bool useCache = true, bool dontUpload = false) {
 		var possibleKeys = new List<string>() { AuthConfig.instance.deployKey, InternalHttpManager.editorAuthToken };
 		possibleKeys.RemoveAll(string.IsNullOrEmpty);
 		if (possibleKeys.Count == 0) {
@@ -97,8 +109,6 @@ public class Deploy {
 			}
 		}
 
-
-
 		var confirmedSaveState = EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo();
 		if (!confirmedSaveState  || SceneManager.GetActiveScene().isDirty) { // User clicked "cancel"
 			Debug.LogError("[Airship]: Cancelling publish: you must save or discard scene changes.");
@@ -106,7 +116,7 @@ public class Deploy {
 		}
 
 		foreach (var scene in gameConfig.gameScenes) {
-			if (LuauCore.IsProtectedSceneName(scene.name)) {
+			if (LuauProtection.IsProtectedSceneName(scene.name)) {
 				Debug.LogError($"Game scene name not allowed: {scene.name}");
 				yield break;
 			}
@@ -117,7 +127,7 @@ public class Deploy {
 			}
 		}
 
-		if (LuauCore.IsProtectedSceneName(gameConfig.startingScene.name)) {
+		if (LuauProtection.IsProtectedSceneName(gameConfig.startingScene.name)) {
 			Debug.LogError($"Game starting scene not allowed: {gameConfig.startingScene}");
 			yield break;
 		}
@@ -318,9 +328,9 @@ public class Deploy {
 			yield return null;
 		}
 
-		if (EditorIntegrationsConfig.instance.buildWithoutUpload) {
+		if (EditorIntegrationsConfig.instance.buildWithoutUpload || dontUpload) {
 			if (shouldResumeTypescriptWatch) TypescriptCompilationService.StartCompilerServices();
-			Debug.Log("Build without upload is enabled. Ending early. You can now view bundles using AssetBundle browser.");
+			Debug.Log("Build without upload is enabled. Ending early. You can now inspect the built bundle inside \"bundles\" folder.");
 			yield break;
 		}
 

package/Editor/Util/LuauReflectionGenerator.cs

@@ -95,7 +95,7 @@ namespace Editor.Util {
 			"CsToTs",
 			"Easy.Airship",
 			"LeTai.TrueShadow",
-			"LuauAPI",
+			"LuauAPIAttribute",
 			"Mirror.Authenticators",
 			"Mirror.CompilerSymbols",
 			"Mirror.Components",
@@ -247,3 +247,4 @@ namespace Editor.Util {
 	}
 }
 */
+

package/Generator/LuauDirectCallbackGenerator.dll.meta

@@ -0,0 +1,67 @@
+fileFormatVersion: 2
+guid: 2a0a8e30474a3411a9bea8f5b0b91f89
+labels:
+- RoslynAnalyzer
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 3
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 1
+  isExplicitlyReferenced: 1
+  validateReferences: 0
+  platformData:
+    Android:
+      enabled: 0
+      settings:
+        AndroidLibraryDependee: UnityLibrary
+        AndroidSharedLibraryType: Executable
+        CPU: ARMv7
+    Any:
+      enabled: 0
+      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:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+    Linux64:
+      enabled: 0
+      settings:
+        CPU: None
+    OSXUniversal:
+      enabled: 0
+      settings:
+        CPU: None
+    Win:
+      enabled: 0
+      settings:
+        CPU: None
+    Win64:
+      enabled: 0
+      settings:
+        CPU: None
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+    iOS:
+      enabled: 0
+      settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Generator.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0913ecbdee29746f3be77ba6622f513e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Code/Airship/Resources/Scripts/Editor/Airship.Airship.Editor.asmdef

@@ -4,7 +4,6 @@
     "references": [
         "GUID:eab6daf15424fc24a878e63a8cd81ec2",
         "GUID:842bf14b8e2ba45638e25dba28f03539",
-        "GUID:1f7f51f8968140b8be5bcee537b6d629",
         "GUID:3b7e0a4d14cc4c4b98380d63986903e1",
         "GUID:563fac65016c405bb85a284491b989f2",
         "GUID:9a16190c3a18e8a4b84be0d37f3b4bd4",
@@ -12,7 +11,6 @@
         "GUID:98164ae7d6df4261a415a46ee3d095fc",
         "GUID:90710d4fb4a84d0f8ece9f3b9b5c2556",
         "GUID:a7ffa74110914b76bbe3b751b4e05b45",
-        "GUID:5966039ae77c64b44bc04472c1ae63bb",
         "GUID:5e727e99520a4004a883ac814ea3911e",
         "GUID:cc332e87d96278649bb327cfb7b97850",
         "GUID:76216682843b45b59a5ee4264241dec3",
@@ -59,7 +57,10 @@
         "GUID:725ee7191c021de4dbf9269590ded755",
         "GUID:77ccaf49895b0d64e87cd4b4faf83c49",
         "GUID:2a0340569ab0e1245a38e0d6c7b2529b",
-        "GUID:befe48b9a36afc04ea625c93daad910e"
+        "GUID:befe48b9a36afc04ea625c93daad910e",
+        "GUID:1f7f51f8968140b8be5bcee537b6d629",
+        "GUID:bdc05fc3964826a4a87a7a1f462f46e7",
+        "GUID:5966039ae77c64b44bc04472c1ae63bb"
     ],
     "includePlatforms": [
         "Editor"

package/Runtime/Code/Bootstrap/ClientBundleLoader.cs

@@ -6,6 +6,7 @@ using System.IO;
 using Airship.DevConsole;
 using Code.Authentication;
 using Code.Analytics;
+using Code.Luau.LuauAssembly.Protection;
 using Luau;
 using Mirror;
 using UnityEngine;
@@ -101,7 +102,7 @@ namespace Code.Bootstrap {
             }, false);
             NetworkServer.RegisterHandler<ClientFinishedPreparingMessage>((conn, data) => {
                 var sceneName = serverBootstrap.startupConfig.StartingSceneName;
-                if (LuauCore.IsProtectedSceneName(sceneName)) {
+                if (LuauProtection.IsProtectedSceneName(sceneName)) {
                     Debug.LogError("Invalid starting scene name: " + sceneName);
                     conn.Disconnect();
                     return;
@@ -118,7 +119,7 @@ namespace Code.Bootstrap {
 
                 // Validate scene name
                 var sceneName = this.serverBootstrap.startupConfig.StartingSceneName;
-                if (LuauCore.IsProtectedSceneName(sceneName)) {
+                if (LuauProtection.IsProtectedSceneName(sceneName)) {
                     Debug.LogError("Invalid starting scene name: " + sceneName + ". The name of this scene is not allowed.");
                     conn.Send(new KickMessage() {
                         reason = "Invalid starting scene name: " + sceneName + ". The name of this scene is not allowed. Report this to the game developer.",

package/Runtime/Code/Bootstrap/ServerBootstrap.cs

@@ -59,6 +59,7 @@ public class ServerBootstrap : MonoBehaviour
     [NonSerialized] public string organizationId = "";
 	[NonSerialized] public bool isShutdownEventTriggered = false;
 	[NonSerialized] public bool isAgonesShutdownTriggered = false;
+	[NonSerialized] public bool isShutdownComplete = false;
 
     public ServerContext serverContext;
 
@@ -142,29 +143,54 @@ public class ServerBootstrap : MonoBehaviour
 		}
 
 		this.Setup();
-
-		AppDomain.CurrentDomain.ProcessExit += ProcessExit;
 	}
 
 	public void InvokeOnProcessExit() {
+		// If Shutdown() was called, any future term signals or mark for shutdown should immedately close the server.
+		// Shutdown() should never be called unless we are ok with not running shutdown handlers (usually because they already
+		// finished).
+		if (isShutdownComplete) {
+			Application.Quit();
+			return;
+		}
+		// Don't need to refire shutdown events if they've already been processed or if agones has been notified of
+		// the shutdown. (agones in shutdown state means we are exiting immediately (OnApplicationQuit) and cannot yield)
+		if (this.isAgonesShutdownTriggered) {
+			Debug.Log("Agones Shutdown already triggered when invoking OnProcessExit. TS Handlers will not be called.");
+			return;
+		}
+		// Don't refire the events if we've already fired them. (This might happen if we have multiple sigterms)
 		if (this.isShutdownEventTriggered) return;
 		this.isShutdownEventTriggered = true;
+		
+		// Ensure we always shut down the server after 1 hour even if TS fails to complete for some reason.
+		StartCoroutine(HandleTimeout());
 
+		// If we have TS handlers, fire them.
 		if ((this.onProcessExit?.GetInvocationList().Length ?? 0) > 0) {
 			Debug.Log("Invoking OnProcessExit handlers.");
 			this.onProcessExit?.Invoke();
 		} else {
-			Debug.LogWarning("No OnProcessExit handlers were registered. Directly exiting process.");
-			this.Shutdown();
+			// If we don't have handlers, shut down immediately.
+			Application.Quit();
 		}
 	}
-
-	private void OnDestroy() {
-		AppDomain.CurrentDomain.ProcessExit -= ProcessExit;
+	
+	private IEnumerator HandleTimeout() {
+		yield return new WaitForSecondsRealtime(3600f);
+		Debug.Log($"OnProcessExit handlers did not complete after 1 hour. Shutting down.");
+		Application.Quit();
 	}
 
-	private void ProcessExit(object sender, EventArgs args) {
-		this.InvokeOnProcessExit();
+	private void OnApplicationQuit() {
+		Debug.Log($"OnApplicationQuit() fired.");
+		
+		// Notify agones we are going to quit
+		if (agones && !this.isAgonesShutdownTriggered) {
+			this.isAgonesShutdownTriggered = true;
+			agones.Shutdown();
+			Debug.Log($"Sent Agones Shutdown notification.");
+		}
 	}
 
 	public bool IsAgonesEnvironment() {
@@ -252,7 +278,8 @@ public class ServerBootstrap : MonoBehaviour
 		if (!processedMarkedForDeletion && server.ObjectMeta != null && server.ObjectMeta.Labels != null && server.ObjectMeta.Labels.ContainsKey("MarkedForShutdown")) {
 			Debug.Log("Found \"MarkedForShutdown\" label!");
 			this.processedMarkedForDeletion = true;
-			this.InvokeOnProcessExit();
+			InvokeOnProcessExit();
+			return;
 		}
 		
 		if (this.allocatedByAgones) return;
@@ -486,14 +513,6 @@ public class ServerBootstrap : MonoBehaviour
         isServerReady = true;
         OnServerReady?.Invoke();
 	}
-	
-	private void ShutdownInternal(int exitCode = 0) {
-		if (agones && !this.isAgonesShutdownTriggered) {
-			this.isAgonesShutdownTriggered = true;
-			agones.Shutdown();
-			Application.Quit(exitCode);
-		}
-	}
 
 	private void ShutdownDueToAssetFailure(int exitCode = 1) {
 		if (NetworkServer.connections != null && NetworkServer.connections.Count > 0) {
@@ -508,12 +527,22 @@ public class ServerBootstrap : MonoBehaviour
 			}
 		}
 
-		ShutdownInternal(exitCode);
+		Application.Quit(exitCode);
 	}
 
+	/**
+	 * Used to immediately shutdown the server. Used by TS to confirm it is ready to shut down.
+	 * Sets the isShutdownComplete field, meaning that InvokeOnProcessExit has completed and will not be called
+	 * again.
+	 */
 	public void Shutdown()
 	{
-		ShutdownInternal(0);
+		Debug.LogWarning($"Bootstrap Shutdown() started.");
+		if (!isShutdownEventTriggered) {
+			Debug.LogWarning("Shutdown() was called before InvokeOnProcessExit(). TS handlers will not be fired.");
+		}
+		isShutdownComplete = true; // The application _should_ quit, but if it doesn't we'll mark shutdown as complete so the next interrupt will immediately shut down.
+		Application.Quit();
 	}
 
 	/**

package/Runtime/Code/Bootstrap/SignalHandler.cs

@@ -7,7 +7,7 @@ namespace Code.Bootstrap {
     public class SignalHandler : MonoBehaviour {
         public ServerBootstrap serverBootstrap;
         public UnityMainThreadDispatcher unityMainThread;
-
+        
 #if UNITY_STANDALONE_LINUX || UNITY_EDITOR_LINUX
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void SignalDelegate();
@@ -47,12 +47,10 @@ namespace Code.Bootstrap {
             }
         }
 
-        private IEnumerator HandleSigterm()
-        {
-            Debug.Log("SIGTERM received. Performing cleanup.");
+        private IEnumerator HandleSigterm() {
+            Debug.Log("SIGTERM received. Starting application shutdown.");
             serverBootstrap.InvokeOnProcessExit();
             yield return null;
-            Application.Quit();
         }
 #endif
     }

package/Runtime/Code/Bundles/Airship.Bundles.asmdef

@@ -12,7 +12,6 @@
         "GUID:894a6cc6ed5cd2645bb542978cbed6a9",
         "GUID:33b0850c3f930a440abe6b01a9898921",
         "GUID:103be11cab738ef4d849a96eca5df2eb",
-        "GUID:5966039ae77c64b44bc04472c1ae63bb",
         "GUID:5a902c5989fd2e74c9e7050e78d83db3",
         "GUID:199bc21c5ec6a3e41b1d67e225a7bd04",
         "GUID:15fc0a57446b3144c949da3e2b9737a9",
@@ -20,7 +19,15 @@
         "GUID:ec266f293c0b4f6c9d06847488a52a0c",
         "GUID:325984b52e4128546bc7558552f8b1d2",
         "GUID:72872094b21c16e48b631b2224833d49",
-        "GUID:befe48b9a36afc04ea625c93daad910e"
+        "GUID:befe48b9a36afc04ea625c93daad910e",
+        "GUID:5966039ae77c64b44bc04472c1ae63bb",
+        "GUID:f87ecb857e752164ab814a3de8eb0262",
+        "GUID:51ab30dfa13781d45931a9650979d997",
+        "GUID:28801137de0f73c4d834f29b158b80a7",
+        "GUID:6b289bb677194eb40b60db3a566aab7b",
+        "GUID:bdc05fc3964826a4a87a7a1f462f46e7",
+        "GUID:34b86c7776fb64479aa6cc8114a663f0",
+        "GUID:18e5109d897e1b244ab2dfeaf5482c7b"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

package/Runtime/Code/Components/DynamicVariables/Airship.DynamicVariables.asmdef

@@ -7,7 +7,9 @@
         "GUID:47a57257b08841e9a7b6a61ce7119d42",
         "GUID:1d82bdf40e2465b44b34adf79595e74c",
         "GameKit.Utilities",
-        "GUID:894a6cc6ed5cd2645bb542978cbed6a9"
+        "GUID:894a6cc6ed5cd2645bb542978cbed6a9",
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:325984b52e4128546bc7558552f8b1d2"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

package/Runtime/Code/Components/DynamicVariables/GameObjectReferences.cs

@@ -49,7 +49,9 @@ public class GameObjectReferences : MonoBehaviour {
 
     private void Awake() {
         if (isStaticInstance) {
-            AllReferences.Add(staticBundleId, this);
+            if (!AllReferences.TryAdd(staticBundleId, this)) {
+                Debug.LogError($"Duplicate instance of static GameObjectReferences for key {staticBundleId}", this.gameObject);
+            }
         }
 
         PackBundles();