gg.easy.airship 0.1.2187 → 0.1.2189

package/Editor/CreateAssetBundles.cs

@@ -481,6 +481,18 @@ public static class CreateAssetBundles {
 		return true;
 	}
 
+#if UNITY_EDITOR
+	[MenuItem("Airship/Set Quality/Normal", false, 1901)]
+	static void MenuSetQualityLevel() {
+		CreateAssetBundles.SwapToQualityLevel("Normal");
+	}
+
+	[MenuItem("Airship/Set Quality/Low", false, 1902)]
+	static void MenuSetQualityLevelLow() {
+		CreateAssetBundles.SwapToQualityLevel("Low");
+	}
+#endif
+
 	public static void SwapToQualityLevel(string name) {
 #if UNITY_EDITOR
 		if (name == "Low") {

package/Editor/Publish/Deploy.cs

@@ -530,9 +530,11 @@ public class Deploy {
 			Debug.Log("<color=#77f777>Finished publish! Your game is live.</color> ");
 		}
 
+		CreateAssetBundles.SwapToQualityLevel("Normal");
+
 		if (shouldResumeTypescriptWatch) TypescriptCompilationService.StartCompilerServices();
 	}
-	
+
 	private static IEnumerator UploadSingleGameFile(string url, string filePath, AirshipPlatform? platform, bool absolutePath = false) {
 		var uploadInfo = new UploadInfo();
 		if (platform.HasValue) uploadInfo.platform = platform.Value;

package/Runtime/Code/Accessories/Clothing/Editor/PlatformGearDownloader.cs

@@ -1,5 +1,4 @@
-// Assets/Editor/DownloadClothingWindow.cs
-
+#if UNITY_EDITOR
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -82,6 +81,7 @@ namespace Code.Accessories.Clothing.Editor {
                     EditorUtility.DisplayDialog("Download Error", "Clothing was null.", "OK");
                 } else {
                     this.SpawnClothing(gear);
+                    // PlatformGear.UnloadAssetBundle(gear.classId);
                     status = "Complete";
                     progress = 1f;
                     Repaint();
@@ -143,3 +143,4 @@ namespace Code.Accessories.Clothing.Editor {
         }
     }
 }
+#endif

package/Runtime/Code/Accessories/Clothing/PlatformGear.cs

@@ -19,14 +19,17 @@ namespace Code.Accessories.Clothing {
         }
     }
 
+    [Serializable]
     public class GearFetchResponse {
         public GearDto gear;
     }
 
+    [Serializable]
     public class GearDto {
         public GearListingDto gear;
     }
 
+    [Serializable]
     public class GearListingDto {
         public string category;
         public string subcategory;
@@ -55,14 +58,28 @@ namespace Code.Accessories.Clothing {
 
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
         public static void OnReload() {
-            // foreach (var bundle in loadedPlatformGearBundles) {
-            //     bundle.Value.assetBundle.Unload(true);
-            // }
-            // loadedPlatformGearBundles.Clear();
+            foreach (var bundle in loadedPlatformGearBundles) {
+                if (bundle.Value.assetBundle != null) {
+                    bundle.Value.assetBundle.Unload(true);
+                }
+            }
+            loadedPlatformGearBundles.Clear();
             inProgressDownloads.Clear();
             classIdToAirIdCache.Clear();
         }
 
+        public static void UnloadAssetBundle(string classId) {
+            if (Application.isPlaying) {
+                throw new Exception("PlatformGear.UnloadAssetBundle cannot be called during play mode.");
+            }
+            if (classIdToAirIdCache.TryGetValue(classId, out var airId)) {
+                if (loadedPlatformGearBundles.TryGetValue(airId, out var bundle)) {
+                    bundle.assetBundle.Unload(true);
+                    loadedPlatformGearBundles.Remove(airId);
+                }
+            }
+        }
+
         public static async Task<PlatformGear> DownloadYielding(string classId) {
             if (classIdToAirIdCache.TryGetValue(classId, out string airId)) {
                 return await DownloadYielding(classId, airId);
@@ -79,6 +96,7 @@ namespace Code.Accessories.Clothing {
 
                 var gearRes = JsonUtility.FromJson<GearFetchResponse>(req.downloadHandler.text);
                 airId = gearRes.gear.gear.airAssets[0];
+                classIdToAirIdCache[classId] = airId;
             }
 
             return await DownloadYielding(classId, airId);

package/Runtime/Code/AirshipConst.cs

@@ -9,6 +9,8 @@ namespace Code {
         public const int playerVersion = 20;
         public static readonly IReadOnlyList<string> playerFlags = new string[] {
             "SkipLoading",
+            "LagCompCheckIdIsInt",
+            "PlatformGearDownloadClassId",
         };
 
 

package/Runtime/Code/Luau/CallbackWrapper.cs

@@ -1,16 +1,25 @@
 using System;
 using System.Collections.Generic;
+using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine;
 using UnityEngine.Profiling;
 
 namespace Luau
 {
     public class CallbackWrapper {
-        public LuauContext context;
+        /// <summary>
+        /// The LuauContext that this callback was created in (and will fire in). This is only relevant if
+        /// validateContext is true (used for stuff like network events where we don't want protected broadcasts
+        /// to be listened to in game context).
+        /// </summary>
+        public LuauContext callbackContext;
         public int handle;
         public int luauRef;
         public IntPtr thread;
         public string methodName;
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+        private string profilerTagName;
+#endif
         /// <summary>
         /// If true we will not send an event if the first variable (context) doesn't match the creation context
         /// </summary>
@@ -25,9 +34,12 @@ namespace Luau
         }
 
         public CallbackWrapper(LuauContext context, IntPtr thread, string methodName, int handle, bool validateContext) {
-            this.context = context;
+            this.callbackContext = context;
             this.thread = thread;
             this.methodName = methodName;
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+            profilerTagName = $"EngineEvent.{methodName}";
+#endif
             this.handle = handle;
             this.validateContext = validateContext;
 
@@ -55,18 +67,6 @@ namespace Luau
             
         }
 
-        static void WritePropertyToThread(IntPtr thread, object parameter)
-        {
-            if (parameter == null)
-            {
-                LuauCore.WritePropertyToThread(thread, null, null);
-            }
-            else
-            {
-                LuauCore.WritePropertyToThread(thread, parameter, parameter.GetType());
-            }
-        }
-
 
         unsafe public void HandleEventDelayed0()
         {
@@ -76,28 +76,28 @@ namespace Luau
             {
                 if (thread.m_error) return;
 
-                Profiler.BeginSample("HandleEventDelayed0 " + this.methodName);
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+                Profiler.BeginSample(profilerTagName);
+#endif
                 System.Int32 integer = (System.Int32)handle;
                 int retValue = LuauPlugin.CallMethodOnThread(this.thread, new IntPtr(value: &integer), 0, numParameters);
                 if (retValue < 0)
                 {
                     ThreadDataManager.Error(this.thread);
                 }
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
                 Profiler.EndSample();
+#endif
             }
         }
 
-        private bool IsBlockedByInvalidContext(object param0) {
+        private bool IsBlockedByInvalidContext(LuauContext callContext) {
             if (!validateContext) return false;
-            if (param0 is null) return false;
-            if (param0 is not LuauContext lc) return false;
-            var isBlocked = lc != context;
-            // if (isBlocked) Debug.Log("Blocked by invalid context: lc=" + lc + " context=" + context + " mn=" + methodName);
-            return isBlocked;
+            return callContext != callbackContext;
         }
         
-        unsafe public void HandleEventDelayed1(object param0) {
-            if (IsBlockedByInvalidContext(param0)) return;
+        unsafe public void HandleEventDelayed1<A>(A param0) {
+            if (typeof(A) == typeof(LuauContext) && IsBlockedByInvalidContext(UnsafeUtility.As<A, LuauContext>(ref param0))) return;
             
             int numParameters = 1;
             ThreadData thread = ThreadDataManager.GetThreadDataByPointer(this.thread);
@@ -105,21 +105,27 @@ namespace Luau
             {
                 if (thread.m_error) return;
 
-                Profiler.BeginSample("EngineEvent." + this.methodName);
-                WritePropertyToThread(this.thread, param0);
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+                Profiler.BeginSample(profilerTagName);
+#endif
+                Profiler.BeginSample("WriteProperties");
+                LuauCore.WritePropertyToThread(this.thread, param0);
+                Profiler.EndSample();
                 System.Int32 integer = (System.Int32)handle;
                 int retValue = LuauPlugin.CallMethodOnThread(this.thread, new IntPtr(value: &integer), 0, numParameters);
                 if (retValue < 0)
                 {
                     ThreadDataManager.Error(this.thread);
                 }
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
                 Profiler.EndSample();
+#endif
             }
         }
 
 
-        unsafe public void HandleEventDelayed2(object param0, object param1) {
-            if (IsBlockedByInvalidContext(param0)) return;
+        unsafe public void HandleEventDelayed2<A, B>(A param0, B param1) {
+            if (typeof(A) == typeof(LuauContext) && IsBlockedByInvalidContext(UnsafeUtility.As<A, LuauContext>(ref param0))) return;
             
             int numParameters = 2;
             ThreadData thread = ThreadDataManager.GetThreadDataByPointer(this.thread);
@@ -130,21 +136,27 @@ namespace Luau
                     return;
                 }
 
-                Profiler.BeginSample("EngineEvent." + this.methodName);
-                WritePropertyToThread(this.thread, param0);
-                WritePropertyToThread(this.thread, param1);
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+                Profiler.BeginSample(profilerTagName);
+#endif
+                Profiler.BeginSample("WriteProperties");
+                LuauCore.WritePropertyToThread<A>(this.thread, param0);
+                LuauCore.WritePropertyToThread<B>(this.thread, param1);
+                Profiler.EndSample();
                 System.Int32 integer = (System.Int32)handle;
                 int retValue = LuauPlugin.CallMethodOnThread(this.thread, new IntPtr(value: &integer), 0, numParameters);
                 if (retValue < 0)
                 {
                     ThreadDataManager.Error(this.thread);
                 }
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
                 Profiler.EndSample();
+#endif
             }
         }
 
-        unsafe public void HandleEventDelayed3(object param0, object param1, object param2) {
-            if (IsBlockedByInvalidContext(param0)) return;
+        unsafe public void HandleEventDelayed3<A, B, C>(A param0, B param1, C param2) {
+            if (typeof(A) == typeof(LuauContext) && IsBlockedByInvalidContext(UnsafeUtility.As<A, LuauContext>(ref param0))) return;
             
             int numParameters = 3;
             ThreadData thread = ThreadDataManager.GetThreadDataByPointer(this.thread);
@@ -153,22 +165,28 @@ namespace Luau
 
                 if (thread.m_error) return;
 
-                Profiler.BeginSample("EngineEvent." + this.methodName);
-                WritePropertyToThread(this.thread, param0);
-                WritePropertyToThread(this.thread, param1);
-                WritePropertyToThread(this.thread, param2);
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+                Profiler.BeginSample(profilerTagName);
+#endif
+                Profiler.BeginSample("WriteProperties");
+                LuauCore.WritePropertyToThread<A>(this.thread, param0);
+                LuauCore.WritePropertyToThread<B>(this.thread, param1);
+                LuauCore.WritePropertyToThread<C>(this.thread, param2);
+                Profiler.EndSample();
                 System.Int32 integer = (System.Int32)handle;
                 int retValue = LuauPlugin.CallMethodOnThread(this.thread, new IntPtr(value: &integer), 0, numParameters);
                 if (retValue < 0)
                 {
                     ThreadDataManager.Error(this.thread);
                 }
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
                 Profiler.EndSample();
+#endif
             }
         }
 
-        unsafe public void HandleEventDelayed4(object param0, object param1, object param2, object param3) {
-            if (IsBlockedByInvalidContext(param0)) return;
+        unsafe public void HandleEventDelayed4<A, B, C, D>(A param0, B param1, C param2, D param3) {
+            if (typeof(A) == typeof(LuauContext) && IsBlockedByInvalidContext(UnsafeUtility.As<A, LuauContext>(ref param0))) return;
             
             int numParameters = 4;
             ThreadData thread = ThreadDataManager.GetThreadDataByPointer(this.thread);
@@ -177,18 +195,24 @@ namespace Luau
 
                 if (thread.m_error) return;
 
-                Profiler.BeginSample("EngineEvent." + this.methodName);
-                WritePropertyToThread(this.thread, param0);
-                WritePropertyToThread(this.thread, param1);
-                WritePropertyToThread(this.thread, param2);
-                WritePropertyToThread(this.thread, param3);
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+                Profiler.BeginSample(profilerTagName);
+#endif
+                Profiler.BeginSample("WriteProperties");
+                LuauCore.WritePropertyToThread<A>(this.thread, param0);
+                LuauCore.WritePropertyToThread<B>(this.thread, param1);
+                LuauCore.WritePropertyToThread<C>(this.thread, param2);
+                LuauCore.WritePropertyToThread<D>(this.thread, param3);
+                Profiler.EndSample();
                 System.Int32 integer = (System.Int32)handle;
                 int retValue = LuauPlugin.CallMethodOnThread(this.thread, new IntPtr(value: &integer), 0, numParameters);
                 if (retValue < 0)
                 {
                     ThreadDataManager.Error(this.thread);
                 }
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
                 Profiler.EndSample();
+#endif
             }
         }
     }

package/Runtime/Code/Luau/LuauAssembly/AttachContext.cs

@@ -2,7 +2,10 @@ using System;
 
 namespace Code.Luau {
     /// <summary>
-    /// This will cause an event to only fire for the context provided as the first argument.
+    /// This will cause an event to only fire for the context provided as the first argument. If used on a method
+    /// the generated type will exclude the context and it will be forced to the calling context in C#.
+    ///
+    /// In both cases the first parameter should be a LuauContext.
     /// </summary>
     [AttributeUsage(AttributeTargets.Event | AttributeTargets.Method)]
     public class AttachContext : Attribute {

package/Runtime/Code/Luau/LuauAssembly/BinaryBlob.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Mirror;
 using Code.Util;
@@ -42,7 +43,8 @@ namespace Assets.Luau {
         }
 
         public bool Equals(BinaryBlob other) {
-            return this.DataSize == other?.DataSize;
+            if (DataSize != other?.DataSize) return false;
+            return Data.SequenceEqual(other.Data);
         }
 
         /// <summary>

package/Runtime/Code/Luau/LuauCore.cs

@@ -205,7 +205,9 @@ public partial class LuauCore : MonoBehaviour {
         _taskId++;
         _completedTasks.Clear();
         eventConnections.Clear();
-        propertyGetCache.Clear();
+        memberGetCache.Clear();
+        fastMemberGetCacheKeys.AsSpan().Clear();
+        fastMemberGetCacheValues.AsSpan().Clear();
         _propertySetterCache.Clear();
         WriteMethodFunctions.Clear();
         LuauProtection.CurrentContext = LuauContext.Game;