gg.easy.airship 0.1.2170 → 0.1.2171

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -416,7 +416,11 @@ namespace Editor.Packages {
                 // Act as if we are building all asset bundles (including CoreMaterials).
                 // This is so our current build target will have references to those asset bundles.
                 // This is paired with changes to Scriptable Build Pipeline that prevent these bundles from actually being built.
-                List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds(true);
+                var compileUrpShaders = true;
+                if (packageDoc.id.ToLower() == "@easy/core") {
+                    compileUrpShaders = false;
+                }
+                List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds(compileUrpShaders);
 
                 foreach (var platform in platforms) {
                     var st = Stopwatch.StartNew();

package/Editor/Util/AirshipEditorUtil.cs

@@ -60,7 +60,7 @@ public class AirshipEditorUtil {
         int counter = 0;
         for (int i = 0; i < total; i++) {
             string path = AssetDatabase.GUIDToAssetPath(prefabGUIDs[i]);
-            if (path.Contains("Assets/Polygon Arsenal") || path.Contains("Assets/Hovl") || path.Contains("Packages/") || path.Contains("Assets/Raygeas")) {
+            if (path.Contains("Assets/Polygon Arsenal") || path.Contains("Assets/Hovl") || path.Contains("Assets/Raygeas")) {
                 continue;
             }
             EditorUtility.DisplayProgressBar("Reimporting Prefabs", path, (float)i / total);

package/Runtime/Code/AirshipConst.cs

@@ -1,11 +1,12 @@
 // ReSharper disable InconsistentNaming
+
 namespace Code {
     public static class AirshipConst {
-        public const int playerVersion = 13;
+        public const int playerVersion = 14;
 
         /// <summary>
         /// The server will kick clients that have a playerVersion lower than this value.
         /// </summary>
         public const int minAcceptedPlayerVersionOnServer = 13;
     }
-}
+}

package/Runtime/Code/CoreUI/Login/LoginApp.cs

@@ -139,9 +139,9 @@ public class LoginApp : MonoBehaviour {
         this.loading = false;
         if (this.mobileMode) {
             if (fullScreen) {
-                NativeTween.OffsetMax(mobileBottom, new Vector2(0, Screen.height * 0.64f), instant ? 0f : 0.12f);
+                NativeTween.AnchorMax(this.mobileBottom, new Vector2(1f, 0.74f), instant ? 0f : 0.12f);
             } else {
-                NativeTween.OffsetMax(mobileBottom, new Vector2(0, Screen.height * 0.4f), instant ? 0f : 0.12f);
+                NativeTween.AnchorMax(this.mobileBottom, new Vector2(1f, 0.46f), instant ? 0f : 0.12f);
             }
             this.mobileLoginPage.SetActive(false);
             this.mobilePickUsernamePage.SetActive(false);
@@ -157,9 +157,19 @@ public class LoginApp : MonoBehaviour {
         } else {
             this.backButton.SetActive(pageGameObject != this.loginPage);
         }
-    }   
+    }
+
+    public void BackToLoginPage() {
+        RouteToPage(this.mobileMode ? this.mobileLoginPage : this.loginPage, false);
+    }
 
     public async void PressContinueWithGoogle() {
+        // Uncomment to test transition
+        // if (true) {
+        //     RouteToPage(this.mobileMode ? this.mobilePickUsernamePage : this.pickUsernamePage, true);
+        //     return;
+        // }
+
         loading = true;
         var authResult = await AuthManager.AuthWithGoogle();
         if (!authResult.success) {

package/Runtime/Code/Luau/AirshipComponent.cs

@@ -325,6 +325,7 @@ public class AirshipComponent : MonoBehaviour, ITriggerReceiver {
 	
 	private void OnDestroy() {
 		ComponentIdToScriptName.Remove(_airshipComponentId);
+		LuauCore.onResetInstance -= OnLuauReset;
 		
 		if (thread == IntPtr.Zero || !LuauCore.IsReady) return;
 		
@@ -336,7 +337,6 @@ public class AirshipComponent : MonoBehaviour, ITriggerReceiver {
 			LuauPlugin.LuauDestroyThread(thread);
 		}
 		thread = IntPtr.Zero;
-		LuauCore.onResetInstance -= OnLuauReset;
 	}
 
 	#region Collision Events
@@ -460,6 +460,7 @@ public class AirshipComponent : MonoBehaviour, ITriggerReceiver {
 	private void OnLuauReset(LuauContext ctx) {
 		if (ctx == context) {
 			thread = IntPtr.Zero;
+			LuauCore.onResetInstance -= OnLuauReset;
 		}
 	}
 

package/Runtime/Code/Luau/LuauCore.cs

@@ -139,6 +139,7 @@ public partial class LuauCore : MonoBehaviour {
 
         var stringCount = unityAPIClasses.Count;
         var stringList = new IntPtr[stringCount];
+        var stringLenList = new int[stringCount];
         eventConnections.Clear();
         
         var counter = 0;
@@ -146,9 +147,11 @@ public partial class LuauCore : MonoBehaviour {
             var apiName = api.Value.GetAPIType().Name;
             var strPtr = Marshal.StringToCoTaskMemUTF8(apiName);
             stringList[counter] = strPtr;
+            stringLenList[counter] = apiName.Length;
             counter += 1;
         }
         var stringAddresses = GCHandle.Alloc(stringList, GCHandleType.Pinned);
+        var stringLengthsHandle = GCHandle.Alloc(stringLenList, GCHandleType.Pinned);
         
         LuauPlugin.LuauInitializePrintCallback(printCallback_holder);
         LuauPlugin.LuauInitializeComponentCallbacks(componentSetEnabledCallback_holder);
@@ -165,6 +168,7 @@ public partial class LuauCore : MonoBehaviour {
                 isObjectDestroyedCallback = isObjectDestroyedCallback_holder,
                 getUnityObjectNameCallback = getUnityObjectNameCallback_holder,
                 staticList = stringAddresses.AddrOfPinnedObject(),
+                staticListStrLen = stringLengthsHandle.AddrOfPinnedObject(),
                 staticCount = stringCount,
                 isServer = RunCore.IsServer() ? 1 : 0,
 #if UNITY_EDITOR
@@ -180,6 +184,7 @@ public partial class LuauCore : MonoBehaviour {
         LuauState.FromContext(LuauContext.Game);
 
         stringAddresses.Free();
+        stringLengthsHandle.Free();
         
         // Free up the strings:
         foreach (var ptr in stringList) {

package/Runtime/Code/Luau/LuauCoreCallbacks.cs

@@ -517,7 +517,7 @@ public partial class LuauCore : MonoBehaviour {
 
                     case PODTYPE.POD_STRING: {
                         if (t.IsAssignableFrom(stringType)) {
-                            string dataStr = LuauCore.PtrToStringUTF8NullTerminated(propertyData);
+                            var dataStr = Marshal.PtrToStringUTF8(propertyData, propertyDataSize);
                             if (field != null) {
                                 field.SetValue(objectReference, dataStr);
                             } else {

package/Runtime/Code/Luau/LuauMetadataPropertySerializer.cs

@@ -20,7 +20,7 @@ namespace Luau {
             { "LayerMask", typeof(LayerMask) },
             { "AnimationCurve", typeof(AnimationCurve) },
         };
-        
+
         public static string SerializeAirshipProperty(object obj, AirshipComponentPropertyType objectType) {
             switch (objectType) {
                 case AirshipComponentPropertyType.AirshipFloat: {
@@ -68,15 +68,18 @@ namespace Luau {
                             obj = Activator.CreateInstance(objType, args);
                         } else if (objDefaultVal.target == "method") {
                             var args = objDefaultVal.arguments.ToArray();
-                            for (var i = 0; i < args.Length; i++)
-                            {
-                                if (args[i] is double)
-                                {
+                            
+                            var argTypes = new Type[args.Length];
+                            for (var i = 0; i < args.Length; i++) {
+                                if (args[i] is double) {
                                     args[i] = Convert.ToSingle(args[i]);
                                 }
+                                
+                                // Pass the argument types to GetMethod to clear any ambiguity
+                                argTypes[i] = args[i].GetType();
                             }
-
-                            var expectedMethod = objType.GetMethod(objDefaultVal.method);
+    
+                            var expectedMethod = objType.GetMethod(objDefaultVal.method, argTypes);
                             obj = expectedMethod?.Invoke(null, args);
                         }
 

package/Runtime/Code/Luau/LuauPlugin.cs

@@ -66,6 +66,7 @@ public static class LuauPlugin {
 		public GetUnityObjectName getUnityObjectNameCallback;
 		
 		public IntPtr staticList;
+		public IntPtr staticListStrLen;
 		public int staticCount;
 		public int isServer;
 		public int useUnityAllocator;
@@ -256,6 +257,31 @@ public static class LuauPlugin {
         Reset(context);
 	}
 
+#if UNITY_IPHONE
+    [DllImport("__Internal")]
+#else
+	[DllImport("LuauPlugin", CallingConvention = CallingConvention.Cdecl)]
+#endif
+	private static extern ulong GetUniqueInstanceIdCount(LuauContext context);
+
+#if UNITY_IPHONE
+    [DllImport("__Internal")]
+#else
+	[DllImport("LuauPlugin", CallingConvention = CallingConvention.Cdecl)]
+#endif
+	private static extern ulong GetUniqueInstanceIds(LuauContext context, IntPtr arr, ulong arrSize);
+	public static unsafe ReadOnlySpan<int> LuauGetUniqueInstanceIds(LuauContext context) {
+		var count = GetUniqueInstanceIdCount(context);
+		var ids = new int[count];
+		
+		ulong countFetched;
+		fixed (int* idsPtr = ids) {
+			countFetched = GetUniqueInstanceIds(context, new IntPtr(idsPtr), count);
+		}
+
+		return new ReadOnlySpan<int>(ids, 0, (int)countFetched);
+	}
+
 #if UNITY_IPHONE
     [DllImport("__Internal")]
 #else

package/Runtime/Code/Luau/LuauState.cs

@@ -122,6 +122,10 @@ namespace Luau {
         public void Reset() {
             Active = false;
             _currentBuffer?.Clear();
+            
+            var uniqueInstanceIds = LuauPlugin.LuauGetUniqueInstanceIds(Context);
+            ThreadDataManager.DeleteObjectReferencesList(uniqueInstanceIds);
+            
             LuauPlugin.LuauReset(Context);
             if (_luauModulesFolder != null) {
                 Object.Destroy(_luauModulesFolder);

package/Runtime/Code/Luau/ThreadManager.cs

@@ -180,6 +180,15 @@ namespace Luau {
             s_cleanUpKeys.Add(instanceId);
         }
 
+        public static void DeleteObjectReferencesList(ReadOnlySpan<int> instanceIds) {
+            foreach (var instanceId in instanceIds) {
+                if (s_objectKeys.TryGetValue(instanceId, out var obj)) {
+                    s_reverseObjectKeys.Remove(obj);
+                }
+                s_objectKeys.Remove(instanceId);
+            }
+        }
+
         public static Luau.CallbackWrapper RegisterCallback(LuauContext context, IntPtr thread, int handle, string methodName, bool validateContext) {
             ThreadData threadData = GetOrCreateThreadData(context, thread, "RegisterCallback");
 

package/Runtime/Code/LuauAPI/Bridge.cs

@@ -114,6 +114,17 @@ public static class Bridge {
         return AudioListener.volume;
     }
 
+    public static void SetDefaultAudioSourceValues(AudioSource source) {
+        source.volume = 1.0f;
+        source.loop = false;
+        source.pitch = 1.0f;
+        source.panStereo = 0.0f;
+        source.minDistance = 1.0f;
+        source.maxDistance = 500.0f;
+        source.rolloffMode = AudioRolloffMode.Logarithmic;
+        source.dopplerLevel = 0.0f;
+    }
+
     public static void SetFullScreen(bool value) {
         Screen.fullScreen = value;
     }

package/Runtime/Code/Network/Simulation/AirshipNetworkedObject.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 namespace Code.Network.Simulation
 {
-    struct TransformSnapshot
+    struct PositionSnapshot
     {
         public Vector3 position;
         public Quaternion rotation;
@@ -23,11 +23,12 @@ namespace Code.Network.Simulation
         [Range(-1, 1)]
         public float bufferAdjustment = 0;
         
-        private History<TransformSnapshot> history;
+        private History<PositionSnapshot> history;
+        private Rigidbody rb;
 
-        private void Start()
-        {
-            history = new History<TransformSnapshot>(1);
+        private void Start() {
+            rb = GetComponent<Rigidbody>();
+            history = new History<PositionSnapshot>(1);
             AirshipSimulationManager.Instance.OnCaptureSnapshot += this.CaptureSnapshot;
             AirshipSimulationManager.Instance.OnSetSnapshot += this.SetSnapshot;
             AirshipSimulationManager.Instance.OnLagCompensationCheck += this.LagCompensationCheck;
@@ -51,20 +52,31 @@ namespace Code.Network.Simulation
                 this.transform.rotation = state.rotation;
                 return;
             }
-            
-            this.history.Add(tick, new TransformSnapshot()
-            {
-                position = this.transform.position,
-                rotation = this.transform.rotation
-            });
+
+            var snapshot = rb != null
+                ? new PositionSnapshot() {
+                    position = this.rb.position,
+                    rotation = this.rb.rotation
+                }
+                : new PositionSnapshot() {
+                    position = this.transform.position,
+                    rotation = this.transform.rotation
+                };
+            this.history.Add(tick, snapshot);
         }
 
         private void SetSnapshot(object objTick)
         {
             if (objTick is int tick) {
                 var snapshot = this.history.Get(tick);
-                this.transform.position = snapshot.position;
-                this.transform.rotation = snapshot.rotation;
+                if (this.rb != null) {
+                    this.rb.position = snapshot.position;
+                    this.rb.rotation = snapshot.rotation;
+                } else {
+                    this.transform.position = snapshot.position;
+                    this.transform.rotation = snapshot.rotation;
+                }
+               
             }
         }
 

package/Runtime/Code/Network/Simulation/AirshipSimulationManager.cs

@@ -221,7 +221,6 @@ namespace Code.Network.Simulation
                     processedLagCompensation = true;
                     // Debug.LogWarning("Server lag compensation rolling back for client " + entry.Key.connectionId);
                     OnLagCompensationCheck?.Invoke(entry.Key.connectionId, tick, time, entry.Key.rtt / 2f, entry.Key.bufferTime);
-                    Physics.SyncTransforms();
                     foreach (var request in entry.Value)
                     {
                         request.check();
@@ -239,7 +238,6 @@ namespace Code.Network.Simulation
                 // Debug.LogWarning("Server completed " + this.lagCompensationRequests.Count + " lag compensation requests. Resetting to current tick (" + time + ") and finalizing.");
                 // Reset back to the server view of the world at the current time.
                 OnSetSnapshot?.Invoke(tick);
-                Physics.SyncTransforms();
                 // Invoke all of the callbacks for modifying physics that should be applied in the next tick.
                 foreach (var entry in this.lagCompensationRequests)
                 {
@@ -411,7 +409,6 @@ namespace Code.Network.Simulation
             {
                 OnSetPaused?.Invoke(true);
                 OnSetSnapshot?.Invoke(targetTick);
-                Physics.SyncTransforms();
                 // Advance the tick so that we are re-processing the next tick after the base time provided.
                 targetTick++;
                 // index of the tick in the previousTicks list, we use this to access the associated time.

package/Runtime/Code/Network/StateSystem/AirshipNetworkedStateManager.cs

@@ -1022,7 +1022,6 @@ namespace Code.Network.StateSystem
                 // Since we now know where we should be authoritatively, set the current state. Since this isn't a prediction,
                 // we don't add it to the stateHistory.
                 this.stateSystem.SetCurrentState(state);
-                Physics.SyncTransforms();
                 return;
             }