gg.easy.airship 0.1.2153 → 0.1.2154

package/Editor/TypescriptServices/Editor/TypescriptLogService.cs

@@ -140,12 +140,12 @@ namespace Airship.Editor {
         }
 
         internal static void StartLogging() {
+            if (started) return;
+            
             if (!Directory.Exists(LogFolder)) {
                 Directory.CreateDirectory(LogFolder);
             }
             
-            if (started) return;
-            
             string logDir = Path.GetDirectoryName(Application.consoleLogPath);
             logPath = LogFilePath;
             prevLogPath = LogFilePrevPath; // lol

package/Editor/TypescriptServices/TypescriptServices.cs

@@ -48,7 +48,7 @@ namespace Airship.Editor {
     /// <summary>
     /// Main static class for handling the TypeScript services
     /// </summary>
-    public static class TypescriptServices {
+    public class TypescriptServices : AssetPostprocessor {
         internal static event CompilerCrashEvent CompilerCrash;
         
         /// <summary>
@@ -87,10 +87,18 @@ namespace Airship.Editor {
             Debug.LogWarning("[TypescriptServices] Skipped, in Airship Player mode");
             return;
 #endif
+            TypescriptLogService.StartLogging();
+            
             // On project load we'll force a full compile to try and get all the refs up to date
             if (!SessionState.GetBool("TypescriptInitialBoot", false) && IsValidEditorContext) {
                 SessionState.SetBool("TypescriptInitialBoot", true);
-                TypescriptCompilationService.BuildTypescript(TypeScriptCompileFlags.FullClean | TypeScriptCompileFlags.Setup | TypeScriptCompileFlags.DisplayProgressBar);
+                
+                if (HasAllPackagesDownloaded()) {
+                    TypescriptCompilationService.BuildTypescript(TypeScriptCompileFlags.FullClean | TypeScriptCompileFlags.Setup | TypeScriptCompileFlags.DisplayProgressBar);
+                }
+                else {
+                    TypescriptLogService.LogWarning("Skipped precompile due to not having packages downloaded yet");
+                }
             }
             
             // If a server or clone - ignore
@@ -145,20 +153,31 @@ namespace Airship.Editor {
             }
         }
 
+#if !AIRSHIP_PLAYER
+        private static bool assetDbReady = false;
+        // ReSharper disable once Unity.IncorrectMethodSignature
+        private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets,
+            string[] movedFromAssetPaths, bool didDomainReload) {
+            if (!IsValidEditorContext || !didDomainReload) return;
+            if (!assetDbReady) assetDbReady = true;
+        }
+#endif
+        
         private static bool HasAllPackagesDownloaded() {
+            if (!assetDbReady) return false;
+            
             var gameConfig = GameConfig.Load();
-            foreach (var project in gameConfig.packages) {
-                if (!project.localSource && !project.IsDownloaded()) return false;
-            }
-
-            return true;
+            return gameConfig != null && gameConfig.packages.All(project => project.localSource || project.IsDownloaded());
         }
         
         private static IEnumerator InitializeProject() {
             TypescriptProjectsService.ReloadProjects();
             TypescriptCompilationService.ClearIncrementalCache(); // clear incremental cache
+            TypescriptLogService.LogInfo("Checking and waiting for packages to download...");
             yield return new WaitUntil(HasAllPackagesDownloaded);
+            TypescriptLogService.LogInfo("Packages are OK, will now initialize TypeScript");
             yield return InitializeTypeScript();
+            TypescriptLogService.LogInfo("TypeScript initialized, now starting the TypeScript runtime");
             yield return StartTypescriptRuntime();
         }
         
@@ -193,12 +212,13 @@ namespace Airship.Editor {
         
         private  static IEnumerator StartTypescriptRuntime() {
             TypescriptProjectsService.ReloadProject();
+           
             
             // Wait for updates
-            if (AirshipUpdateService.IsUpdatingAirship || AirshipPackagesWindow.IsModifyingPackages) {
+            if (AirshipUpdateService.IsUpdatingAirship || AirshipPackagesWindow.IsModifyingPackages || !HasAllPackagesDownloaded()) {
                 IsAwaitingRestart = true;
                 yield return new WaitUntil(() =>
-                    !AirshipPackagesWindow.IsModifyingPackages && !AirshipUpdateService.IsUpdatingAirship);
+                    !AirshipPackagesWindow.IsModifyingPackages && !AirshipUpdateService.IsUpdatingAirship && HasAllPackagesDownloaded());
                 IsAwaitingRestart = false;
             }
 
@@ -228,6 +248,7 @@ namespace Airship.Editor {
                 return;
             }
 
+            TypescriptLogService.LogInfo("Enforcing default config settings");
             project.EnforceDefaultConfigurationSettings();
             CompilerCrash += OnCrash;
 
@@ -243,6 +264,7 @@ namespace Airship.Editor {
             }
             
             if (!SessionState.GetBool("InitializedTypescriptServices", false)) {
+                TypescriptLogService.LogInfo("Running initial setup for TypeScript services");
                 SessionState.SetBool("InitializedTypescriptServices", true);
                 TypescriptCompilationService.StopCompilerServices();
                 
@@ -259,6 +281,7 @@ namespace Airship.Editor {
                 }
             }
             else {
+                TypescriptLogService.LogInfo("Attempting to resume TypeScript compilation services...");
                 TypescriptCompilationService.StopCompilerServices(shouldRestart: TypescriptCompilationService.IsWatchModeRunning);
             }
             
@@ -324,12 +347,12 @@ namespace Airship.Editor {
                 invokedCrashEvent = false;
             }
 
-            var shouldAutostart = !IsCompilerActive && !TypescriptCompilationService.Crashed &&
-                                  ShouldCompilerBeRunning && !IsAwaitingRestart && !IsCompilerStoppedByUser;
-
-            if (!shouldAutostart) return;
-            TypescriptLogService.LogWarning("Found compiler inactive, doing an automatic restart");
-            EditorCoroutines.Execute(StartTypescriptRuntime());
+            // var shouldAutostart = !IsCompilerActive && !TypescriptCompilationService.Crashed &&
+            //                       ShouldCompilerBeRunning && !IsAwaitingRestart && !IsCompilerStoppedByUser && HasAllPackagesDownloaded();
+            //
+            // if (!shouldAutostart) return;
+            // TypescriptLogService.LogWarning("Found compiler inactive, doing an automatic restart");
+            // EditorCoroutines.Execute(StartTypescriptRuntime());
         }
     }
 }

package/Runtime/Code/Player/Character/Animation/CharacterAnimationHelper.cs

@@ -204,18 +204,26 @@ namespace Code.Player.Character.NetworkedMovement
 
         public void SetVelocity(Vector3 localVel)
         {
+            currentSpeed = new Vector2(localVel.x, localVel.z).magnitude;
             //The target speed is the movement speed the animations were built for
             var targetSpeed = animWalkSpeed;
             if (currentState == CharacterState.Sprinting)
             {
-                targetSpeed = animRunSpeed;
+                if (currentSpeed < animWalkSpeed) {
+                    //We will walk instead of run even though we are trying to run
+                } else {
+                    targetSpeed = animRunSpeed;
+                }
             }
             else if (currentState == CharacterState.Crouching)
             {
                 targetSpeed = animCrouchSpeed;
             }
+            
+            //Have to update sprinting state dynamically because low speeds can disable it
+            animator.SetBool("Sprinting",
+                currentState == CharacterState.Sprinting && currentSpeed >= animWalkSpeed);
 
-            currentSpeed = new Vector2(localVel.x, localVel.z).magnitude;
             this.targetPlaybackSpeed = currentSpeed / targetSpeed;
             targetVelNormalized = new Vector2(localVel.x, localVel.z).normalized;
             verticalVel = Mathf.Clamp(localVel.y, -10, 10);
@@ -233,8 +241,6 @@ namespace Code.Player.Character.NetworkedMovement
             this.grounded = syncedState.grounded;
             animator.SetBool("Grounded", grounded);
             animator.SetBool("Crouching", syncedState.crouching || syncedState.state == CharacterState.Crouching);
-            animator.SetBool("Sprinting",
-                !syncedState.crouching && (syncedState.sprinting || syncedState.state == CharacterState.Sprinting));
 
             if (syncedState.jumping) {
                 SetTrigger("Jump");

package/Runtime/Code/Player/Character/MovementSystems/Character/CharacterMovement.cs

@@ -553,7 +553,7 @@ namespace Code.Player.Character.MovementSystems.Character {
              */
             var isMoving = currentVelocity.sqrMagnitude > .1f;
             var inAir = didJump || (!detectedGround && !currentMoveSnapshot.prevStepUp);
-            var tryingToSprint = movementSettings.onlySprintForward
+            var tryingToSprint =  movementSettings.onlySprintForward
                 ? command.sprint && graphicTransform.InverseTransformVector(command.moveDir).z > 0.1f
                 : //Only sprint if you are moving forward
                 command.sprint && command.moveDir.magnitude > 0.1f; //Only sprint if you are moving
@@ -579,6 +579,10 @@ namespace Code.Player.Character.MovementSystems.Character {
                 groundedState = CharacterState.Idle;
             }
 
+            if (groundedState == CharacterState.Crouching) {
+                tryingToSprint = false;
+            }
+
             //If you are in the air override the state
             if (inAir) {
                 currentMoveSnapshot.state = CharacterState.Airborne;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg.easy.airship",
-  "version": "0.1.2153",
+  "version": "0.1.2154",
   "displayName": "Airship",
   "unity": "2021.3",
   "unityRelease": "12f1",