gg.easy.airship 0.1.2135 → 0.1.2137

package/Editor/Artifacts/AirshipLocalArtifactDatabase.cs

@@ -150,7 +150,11 @@ namespace Airship.Editor {
         /// Will try to get the script asset data associated with the specified script (if applicable)
         /// </summary>
         internal bool TryGetScriptAssetData(AirshipScript script, out ComponentScriptAssetData assetData) {
-            var item = scripts.FirstOrDefault(f => f.script == script.assetPath);
+            return TryGetScriptAssetDataFromPath(script.assetPath, out assetData);
+        }
+
+        internal bool TryGetScriptAssetDataFromPath(string path, out ComponentScriptAssetData assetData) {
+            var item = scripts.FirstOrDefault(f => f.script == path);
             if (item != null) {
                 assetData = item;
                 return true;

package/Editor/Artifacts/AirshipPrefabUtility.cs

@@ -0,0 +1,36 @@
+using Mirror;
+using UnityEditor;
+using UnityEngine;
+
+namespace Airship.Editor {
+    internal static class AirshipPrefabUtility {
+        internal static bool FindReconcilablePrefabComponent(AirshipComponent component, out AirshipComponent prefabComponent) {
+            var isPrefab = PrefabUtility.IsPartOfAnyPrefab(component);
+            prefabComponent = PrefabUtility.GetCorrespondingObjectFromOriginalSource(component);
+
+            if (!isPrefab) {
+                prefabComponent = null;
+                return false;
+            }
+            
+            if (prefabComponent.script == null) {
+                prefabComponent = null;
+                return false;
+            }
+            
+            var networkIdentity = prefabComponent.gameObject.GetComponentInParent<NetworkIdentity>();
+            if (networkIdentity != null) {
+                prefabComponent = null;
+                return false;
+            }
+
+            var meshFilter = prefabComponent.GetComponentsInChildren<MeshFilter>(); // because of 'SendMessage' we can't force reconcile these
+            if (meshFilter.Length > 0) {
+                prefabComponent = null;
+                return false;
+            }
+
+            return true;
+        }
+    }
+}

package/Editor/Artifacts/AirshipPrefabUtility.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 49673f97bd5f43a184a49c4379fb4786
+timeCreated: 1748391009

package/Editor/Artifacts/AirshipReconciliationService.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Editor.EditorInternal;
 using Luau;
+using Mirror;
 using Mirror.SimpleWeb;
 using Newtonsoft.Json;
 using UnityEditor;
@@ -251,7 +252,7 @@ namespace Airship.Editor {
                 status = ReconcileStatus.Unsuccessful;
                 return false;
             }
-            
+
             var artifactData = AirshipLocalArtifactDatabase.instance;
             
             // Ensure we have the script asset data first, if not we'll just have to queue it for the compiler to process...
@@ -334,10 +335,7 @@ namespace Airship.Editor {
             
             if (ReconcilerVersion == ReconcilerVersion.Version2) {
                 var component = eventData.Component;
-
-                var isPrefab = PrefabUtility.IsPartOfAnyPrefab(component);
-                var prefabOriginalComponent = PrefabUtility.GetCorrespondingObjectFromOriginalSource(component);
-                if (isPrefab && prefabOriginalComponent.script != null) {
+                if (AirshipPrefabUtility.FindReconcilablePrefabComponent(component, out var prefabOriginalComponent)) {
                     // If it's a instance component:
                     // - We need to reconcile the source component first:
                     //      - If successful: We can then reconcile the instance
@@ -365,6 +363,9 @@ namespace Airship.Editor {
                                 break;
                         }
                     }
+                    
+                    
+                    
                 }
                 else {
                     // It's just an orphaned instance, or we're reconciling the original component, we can just reconcile it outright. No silly business required.
@@ -372,6 +373,7 @@ namespace Airship.Editor {
                 }
             }
             else {
+               
                 var component = eventData.Component;
                 ReconcileComponent(component);
                 //component.componentHash = component.scriptHash;

package/Editor/TypescriptServices/Compiler/TypescriptCompilationService.cs

@@ -57,7 +57,7 @@ using Object = UnityEngine.Object;
         // [InitializeOnLoad]
         public static class TypescriptCompilationService {
             private const int ExitCodeKill = 137;
-            private const string TsCompilerService = "Typescript Compilation Service";
+            private const string TsCompilerService = "Compiling Scripts";
             
             /// <summary>
             /// True if the compiler is running in watch mode
@@ -225,18 +225,42 @@ using Object = UnityEngine.Object;
                     return;
                 }
 
+                var artifacts = AirshipLocalArtifactDatabase.instance;
+                var modifiedDatabase = false;
+                
                 try {
                     AssetDatabase.StartAssetEditing();
                     var compileFileList = CompiledFileQueue.ToArray();
+                    
                     foreach (var file in compileFileList) {
-                        // var asset = AssetDatabase.LoadAssetAtPath<AirshipScript>(file);
-                        AssetDatabase.ImportAsset(file, ImportAssetOptions.Default);
+                        var outFileHash = TypescriptProjectsService.Project.GetOutputFileHash(file);
+                        
+                        if (artifacts.TryGetScriptAssetDataFromPath(PosixPath.ToPosix(file), out var data)) {
+                            if (outFileHash != data.metadata.compiledHash) {
+                                AssetDatabase.ImportAsset(file, ImportAssetOptions.Default);
+                                data.metadata.compiledHash = outFileHash;
+                                modifiedDatabase = true;
+                            }
+                        }
+                        else {
+                            var scriptData = artifacts.GetOrCreateScriptAssetData(AssetDatabase.LoadAssetAtPath<AirshipScript>(file));
+                            scriptData.metadata = new TypescriptCompilerMetadata() {
+                                compiledHash = outFileHash
+                            };
+                            
+                            AssetDatabase.ImportAsset(file, ImportAssetOptions.Default);
+                            modifiedDatabase = true;
+                        }
                     }
+                    
                     AssetDatabase.Refresh();
                 } catch (Exception ex) {
-                    Debug.LogError("[Airship] Failed to reimport compiled files: " + ex);
+                    Debug.LogException(ex);
                 } finally {
                     AssetDatabase.StopAssetEditing();
+                    if (modifiedDatabase) {
+                        artifacts.Modify();
+                    }
                 }
                 
                 EditorApplication.update -= ReimportCompiledFiles;
@@ -389,7 +413,7 @@ using Object = UnityEngine.Object;
                 try
                 {
                     if (fullClean) {
-                        UpdateCompilerProgressBarText($"Install packages for '{packageInfo.Name}'...");
+                        UpdateCompilerProgressBarText($"Preparing TypeScript project");
                         var success = RunNpmInstall(packageDir);
                         if (!success)
                         {
@@ -407,7 +431,7 @@ using Object = UnityEngine.Object;
                     while (!compilerProcess.HasExited) {
                         if (compilationState.FilesToCompileCount == 0) continue;
                         UpdateCompilerProgressBar(
-                            compilationState.CompiledFileCount / (float)compilationState.FilesToCompileCount, $"Compiling {compilationState.CompiledFileCount}/{project.CompilationState.FilesToCompileCount}");
+                            compilationState.CompiledFileCount / (float)compilationState.FilesToCompileCount, $"Compiling TypeScript files {compilationState.CompiledFileCount}/{project.CompilationState.FilesToCompileCount}...");
                     }
                     
                     // compilerProcess.WaitForExit();

package/Editor/TypescriptServices/TypescriptServices.cs

@@ -64,6 +64,12 @@ namespace Airship.Editor {
             Debug.LogWarning("[TypescriptServices] Skipped, in Airship Player mode");
             return;
 #endif
+            // On project load we'll force a full compile to try and get all the refs up to date
+            if (!SessionState.GetBool("TypescriptInitialBoot", false) && IsValidEditor) {
+                SessionState.SetBool("TypescriptInitialBoot", true);
+                TypescriptCompilationService.BuildTypescript(TypeScriptCompileFlags.FullClean | TypeScriptCompileFlags.Setup | TypeScriptCompileFlags.DisplayProgressBar);
+            }
+            
             // If a server or clone - ignore
             if (!IsValidEditor) return;
             EditorApplication.delayCall += OnLoadDeferred;

package/Runtime/Code/Core/RunCore.cs

@@ -10,7 +10,7 @@ using Unity.Multiplayer.Playmode;
 [LuauAPI]
 public class RunCore {
     // Launch params
-    public static bool launchInDedicatedServerMode = true;
+    public static bool launchInDedicatedServerMode = false;
 
     private static bool isServer = false;
     private static bool isClient = false;

package/Runtime/Code/Luau/AirshipScript.cs

@@ -18,6 +18,8 @@ namespace Luau {
         /// The file hash at the compile time
         /// </summary>
         public string hash;
+
+        public string compiledHash;
         /// <summary>
         /// The timestamp when this was compiled
         /// </summary>

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

@@ -102,12 +102,10 @@ namespace Code.Network.Simulation
          */
         public event Action<int, double, double> OnLagCompensationCheck;
 
-        /**
-         * This action tells all watching components that they need to perform a tick.
-         * A Physics.Simulate() call will be made after PerformTick completes.
-         */
-        public event Action<double, bool> OnPerformTick;
-
+        /// <summary>
+        /// This action tells all watching components that they need to perform a tick.
+        /// A Physics.Simulate() call will be made after PerformTick completes.
+        /// </summary>
         public event Action<object, object> OnTick;
 
         /**
@@ -184,7 +182,6 @@ namespace Code.Network.Simulation
             if (resimBackTo != time) this.PerformResimulation(resimBackTo);
 
             // Perform the standard tick behavior
-            OnPerformTick?.Invoke(time, false);
             OnTick?.Invoke(time, false);
             // Debug.Log("Simulate call. Main Tick: " + NetworkTime.time);
             Physics.Simulate(Time.fixedDeltaTime);
@@ -310,13 +307,14 @@ namespace Code.Network.Simulation
             this.ScheduleResimulation((resim => resim(time)));
         }
 
-        /**
-         * Requests a simulation based on the provided time. Requesting a simulation will roll back the physics
-         * world to the snapshot just before or at the base time provided. Calling the returned tick function
-         * will advance the simulation and re-simulate the calls to OnPerformTick, Physics.Simulate(), and OnCaptureSnapshot
-         *
-         * This function is used internally to implement the scheduled resimulations.
-         */
+        /// <summary>
+        /// Requests a simulation based on the provided time. Requesting a simulation will roll back the physics
+        /// world to the snapshot just before or at the base time provided. Calling the returned tick function
+        /// will advance the simulation and re-simulate the calls to <see cref="OnTick"/>, Physics.Simulate,
+        /// and <see cref="OnCaptureSnapshot"/>
+        /// 
+        /// This function is used internally to implement the scheduled resimulations.
+        /// </summary>
         private void PerformResimulation(double baseTime)
         {
             Debug.Log($"T:{Time.unscaledTimeAsDouble} Resimulating from {baseTime}");
@@ -343,7 +341,7 @@ namespace Code.Network.Simulation
 
                 while (tickIndex < this.tickTimes.Count)
                 {
-                    OnPerformTick?.Invoke(this.tickTimes[tickIndex], true);
+                    OnTick?.Invoke(this.tickTimes[tickIndex], true);
                     // Debug.Log("Simulate call. Replay Tick: " + this.tickTimes[tickIndex]);
                     Physics.Simulate(Time.fixedDeltaTime);
                     OnCaptureSnapshot?.Invoke(this.tickTimes[tickIndex], true);

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

@@ -165,7 +165,7 @@ namespace Code.Network.StateSystem
         private void Awake()
         {
             AirshipSimulationManager.Instance.ActivateSimulationManager();
-            AirshipSimulationManager.Instance.OnPerformTick += this.OnPerformTick;
+            AirshipSimulationManager.Instance.OnTick += this.OnTick;
             AirshipSimulationManager.Instance.OnSetSnapshot += this.OnSetSnapshot;
             AirshipSimulationManager.Instance.OnCaptureSnapshot += this.OnCaptureSnapshot;
             AirshipSimulationManager.Instance.OnLagCompensationCheck += this.OnLagCompensationCheck;
@@ -195,7 +195,7 @@ namespace Code.Network.StateSystem
 
         public void OnDestroy()
         {
-            AirshipSimulationManager.Instance.OnPerformTick -= this.OnPerformTick;
+            AirshipSimulationManager.Instance.OnTick -= this.OnTick;
             AirshipSimulationManager.Instance.OnSetSnapshot -= this.OnSetSnapshot;
             AirshipSimulationManager.Instance.OnCaptureSnapshot -= this.OnCaptureSnapshot;
             AirshipSimulationManager.Instance.OnLagCompensationCheck -= this.OnLagCompensationCheck;
@@ -282,8 +282,9 @@ namespace Code.Network.StateSystem
 
         #region Top Level Event Functions
 
-        private void OnPerformTick(double time, bool replay)
-        {
+        private void OnTick(object timeObj, object replayObj) {
+            if (timeObj is not double time || replayObj is not bool replay) return;
+            
             // We are in shared mode
             if (isServer && isClient)
             {