gg.easy.airship 0.1.2135 → 0.1.2136

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
@@ -389,7 +389,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 +407,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)) {
+                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;