gg.easy.airship 0.1.2139 → 0.1.2140

package/Editor/AirshipComponentEditor.cs

@@ -645,10 +645,9 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     private void RenderArrayElement(Rect rect, SerializedProperty arraySerializedProperty, SerializedProperty itemInfo, int index, AirshipComponentPropertyType elementType, SerializedProperty serializedElement, SerializedProperty arrayModified, SerializedProperty objectRefs, [CanBeNull] Type objectType, out string errorReason) {
         var label = $"Element {index}";
         errorReason = "";
+        var arrayType = itemInfo.FindPropertyRelative("type");
         switch (elementType) {
             case AirshipComponentPropertyType.AirshipString: {
-                var arrayType = itemInfo.FindPropertyRelative("type");
-
                 if (arrayType.stringValue == "StringEnum") {
                     var tsEnum = AirshipEditorInfo.Enums.GetEnum(arraySerializedProperty.FindPropertyRelative("refPath").stringValue);
                     DrawCustomStringEnumDropdown(new GUIContent(label), tsEnum, serializedElement, arrayModified, rect);
@@ -664,6 +663,19 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                 
                 break;
             }
+            case AirshipComponentPropertyType.AirshipPod:
+                if (arrayType.stringValue == "Color") {
+                    var currentValue = serializedElement.stringValue != "" ? JsonUtility.FromJson<Color>(serializedElement.stringValue) : default;
+                    var newValue = EditorGUI.ColorField(rect, label, currentValue);
+                    if (newValue != currentValue)
+                    {
+                        serializedElement.stringValue = JsonUtility.ToJson(newValue);
+                        arrayModified.boolValue = true;
+                    }
+                    break;
+                }
+                errorReason = $"Pod type not yet supported in Airship Array ({arrayType.stringValue})";
+                break;
             case AirshipComponentPropertyType.AirshipBoolean:
                 var boolOld = serializedElement.stringValue != "0";
                 var boolNew = EditorGUI.Toggle(rect, label, boolOld);
@@ -681,8 +693,6 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                 }
                 break;
             case AirshipComponentPropertyType.AirshipInt: {
-                var arrayType = itemInfo.FindPropertyRelative("type");
-
                 if (arrayType.stringValue == "IntEnum") {
                     var tsEnum = AirshipEditorInfo.Enums.GetEnum(arraySerializedProperty.FindPropertyRelative("refPath").stringValue);
                     DrawCustomIntEnumDropdown(new GUIContent(label), tsEnum, serializedElement, arrayModified, rect);

package/Editor/TypescriptServices/Compiler/TypescriptCompilationService.cs

@@ -233,24 +233,24 @@ using Object = UnityEngine.Object;
                     var compileFileList = CompiledFileQueue.ToArray();
                     
                     foreach (var file in compileFileList) {
-                        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
-                            };
+                        // var outFileHash = TypescriptProjectsService.Project.GetOutputFileHash(file);
+                        //
+                        // if (artifacts.TryGetScriptAssetDataFromPath(PosixPath.ToPosix(file), out var data)) {
+                        //     if (string.IsNullOrEmpty(outFileHash) || string.IsNullOrEmpty(data.metadata.compiledHash) || 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;
-                        }
+                        //     modifiedDatabase = true;
+                        // }
                     }
                     
                     AssetDatabase.Refresh();

package/Runtime/Code/Bundles/AirshipPackage.cs

@@ -70,7 +70,7 @@ namespace Code.Bootstrap {
             var assetVersionInt = Int32.Parse(this.assetVersion);
             if (this.packageType == AirshipPackageType.Game) {
                 // folders to delete
-                var folders = Directory.GetDirectories(Application.persistentDataPath, "Games")
+                var folders = Directory.GetDirectories(Path.Join(Application.persistentDataPath, "Games"))
                     .Where((path) => path.Contains(this.id + "_v"))
                     .Where((path) => {
                         try {

package/Runtime/Code/Bundles/SystemRoot.cs

@@ -345,7 +345,7 @@ public class SystemRoot : Singleton<SystemRoot> {
 
 			// Shader Variant Collections
 			if (!preWarmedCoreShaders && RunCore.IsClient()) {
-#if !UNITY_IOS && !UNITY_ANDROID && !UNITY_EDITOR
+#if !UNITY_IOS && !UNITY_ANDROID && AIRSHIP_PLAYER
 				preWarmedCoreShaders = true;
 				string[] collections = new[] {
 					"MainMenu",

package/Runtime/Code/LuauAPI/MinMaxCurveAPI.cs

@@ -0,0 +1,11 @@
+using System;
+using UnityEngine;
+
+[LuauAPI]
+public class MinMaxCurveAPI : BaseLuaAPIClass
+{
+    public override Type GetAPIType()
+    {
+        return typeof(ParticleSystem.MinMaxCurve);
+    }
+}

package/Runtime/Code/LuauAPI/MinMaxCurveAPI.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a131bb02680e4e1f8365b29ded9cc9a6
+timeCreated: 1749083306

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

@@ -24,8 +24,6 @@ namespace Code.Player.Character.NetworkedMovement
 
         [SerializeField] public NetworkAnimator? networkAnimator;
         public AnimationEventListener? animationEvents;
-        public ParticleSystem? sprintVfx;
-        public ParticleSystem? jumpPoofVfx;
 
         [Header("Variables")] public float minAirborneTime = .25f;
         public float particleMaxDistance = 25f;
@@ -59,19 +57,8 @@ namespace Code.Player.Character.NetworkedMovement
         private float lastGroundedTime = 0;
         private bool grounded = false;
 
-        private void Awake()
-        {
-            if (this.sprintVfx)
-            {
-                sprintVfx.Stop();
-            }
-
-            if (this.jumpPoofVfx)
-            {
-                jumpPoofVfx.Stop();
-            }
-
-            //   // Make a new instance of the animator override controller
+        private void Awake() {
+            // Make a new instance of the animator override controller
             if (!this.animatorOverride)
             {
                 if (this.animator.runtimeAnimatorController is AnimatorOverrideController over)
@@ -130,19 +117,6 @@ namespace Code.Player.Character.NetworkedMovement
             SetState(new CharacterAnimationSyncData());
         }
 
-        private void OnDisable()
-        {
-            if (sprintVfx)
-            {
-                sprintVfx.Stop();
-            }
-
-            if (jumpPoofVfx)
-            {
-                jumpPoofVfx.Stop();
-            }
-        }
-
         public bool IsInParticleDistance()
         {
             return true;
@@ -262,26 +236,10 @@ namespace Code.Player.Character.NetworkedMovement
             animator.SetBool("Sprinting",
                 !syncedState.crouching && (syncedState.sprinting || syncedState.state == CharacterState.Sprinting));
 
-            if (syncedState.jumping)
-            {
+            if (syncedState.jumping) {
                 SetTrigger("Jump");
             }
 
-            if (sprintVfx)
-            {
-                if (newState == CharacterState.Sprinting)
-                {
-                    if (this.IsInParticleDistance() && !sprintVfx.isPlaying)
-                    {
-                        sprintVfx.Play();
-                    }
-                }
-                else
-                {
-                    sprintVfx.Stop();
-                }
-            }
-
             if (this.firstPerson)
             {
                 animator.SetLayerWeight(0, 0);
@@ -294,24 +252,8 @@ namespace Code.Player.Character.NetworkedMovement
             //print("Set state: " + currentState);
         }
 
-        [HideFromTS]
-        public void OnCharacterMovementDisabled()
-        {
-            if (this.sprintVfx)
-            {
-                sprintVfx.Stop();
-            }
-
-            if (this.jumpPoofVfx)
-            {
-                jumpPoofVfx.Stop();
-            }
-        }
-
-        private void SetTrigger(string trigger)
-        {
-            if (networkAnimator != null)
-            {
+        private void SetTrigger(string trigger) {
+            if (networkAnimator != null) {
                 networkAnimator.SetTrigger(trigger);
                 return;
             }

package/Runtime/Code/Player/PlayerManagerBridge.cs

@@ -196,7 +196,13 @@ namespace Code.Player {
 				return;
 			}
 
+			var startPollingTime = Time.time;
+			var sentFailedToReadyMsg = false;
 			while (!conn.isAuthenticated || !conn.isReady) {
+				if (!sentFailedToReadyMsg && (Time.time - startPollingTime) > 10) {
+					sentFailedToReadyMsg = true;
+					Debug.LogError($"Failed to setup player for connection id {conn.connectionId}: isAuthenticated={conn.isAuthenticated} isReady={conn.isReady}");
+				}
 				// print($"Waiting for {conn.connectionId} to be ready.");
 				await Awaitable.NextFrameAsync();
 			}

package/Runtime/Code/VoxelWorld/VoxelWorldChunk.cs

@@ -442,10 +442,11 @@ namespace VoxelWorldStuff {
         /// need quick collision changes that don't intend to persist.
         /// </summary>
         public void WriteTemporaryCollision(Vector3 position, bool hasCollision) {
+            var centerOfPos = Vector3Int.FloorToInt(position) + Vector3.one / 2;
             if (hasCollision) {
-                VoxelWorldCollision.MakeCollider(this, Vector3Int.FloorToInt(position) + Vector3.one / 2, Vector3Int.one);
+                VoxelWorldCollision.MakeCollider(this, centerOfPos, Vector3Int.one);
             } else {
-                VoxelWorldCollision.RemoveSingleVoxelCollision(this, position);
+                VoxelWorldCollision.RemoveSingleVoxelCollision(this, centerOfPos);
             }
         }
 

package/Runtime/Code/VoxelWorld/VoxelWorldCollision.cs

@@ -235,9 +235,6 @@ namespace VoxelWorldStuff {
 
         public static void RemoveSingleVoxelCollision(Chunk chunk, Vector3 pos) {
             var chunkGO = chunk.GetGameObject();
-            // var worldPosition = chunk.chunkKey * VoxelWorld.chunkSize + pos;
-            // Debug.Log("World position is " + worldPosition);
-            Debug.DrawLine(pos - Vector3.one / 3, pos + Vector3.one / 3, Color.blue, 25);
             var resultCount = Physics.OverlapBoxNonAlloc(pos, Vector3.one / 3, chunkOverlapResults, chunkGO.transform.rotation, 1 << chunkGO.layer, QueryTriggerInteraction.Ignore);
             if (resultCount == 0) return; // Already no collider here
 
@@ -251,7 +248,11 @@ namespace VoxelWorldStuff {
             var minCorner = (bcCenter - bcSize / 2);
             var posRelativeToSize = Vector3Int.FloorToInt(pos - minCorner);
             
-            Debug.Log($"Splitting! posRelativeToSize={posRelativeToSize} bcSize={bcSize} minCorner={minCorner} bcCenter={bcCenter}");
+            // Debug.Log($"Splitting! posRelativeToSize={posRelativeToSize} bcSize={bcSize} minCorner={minCorner} bcCenter={bcCenter}");
+            
+            var bcComp = new GameObject("ComponentTrue");
+            bcComp.transform.localScale = bcSize;
+            bcComp.transform.position = bcCenter;
             
             // Create 6 new colliders split off
             if (posRelativeToSize.x > 0) {
@@ -266,22 +267,22 @@ namespace VoxelWorldStuff {
             }
             if (posRelativeToSize.y > 0) {
                 var size = new Vector3(1, posRelativeToSize.y, bcSize.z);
-                var center = new Vector3(bcCenter.x, minCorner.y + posRelativeToSize.y / 2f, bcCenter.z);
+                var center = new Vector3(minCorner.x + posRelativeToSize.x + 0.5f, minCorner.y + posRelativeToSize.y / 2f, bcCenter.z);
                 MakeCollider(chunk, center, Vector3Int.FloorToInt(size));
             }
             if (posRelativeToSize.y < bcSize.y - 1) {
                 var size = new Vector3(1, bcSize.y - posRelativeToSize.y - 1, bcSize.z);
-                var center = new Vector3(bcCenter.x, minCorner.y + (posRelativeToSize.y + 1) + (bcSize.y - (posRelativeToSize.y + 1)) / 2, bcCenter.z);
+                var center = new Vector3(minCorner.x + posRelativeToSize.x + 0.5f, minCorner.y + (posRelativeToSize.y + 1) + (bcSize.y - (posRelativeToSize.y + 1)) / 2, bcCenter.z);
                 MakeCollider(chunk, center, Vector3Int.FloorToInt(size));
             }
             if (posRelativeToSize.z > 0) {
                 var size = new Vector3(1, 1, posRelativeToSize.z);
-                var center = new Vector3(bcCenter.x, bcCenter.y, minCorner.z + posRelativeToSize.z / 2f);
+                var center = new Vector3(minCorner.x + posRelativeToSize.x + 0.5f, minCorner.y + posRelativeToSize.y + 0.5f, minCorner.z + posRelativeToSize.z / 2f);
                 MakeCollider(chunk, center, Vector3Int.FloorToInt(size));
             }
             if (posRelativeToSize.z < bcSize.z - 1) {
                 var size = new Vector3(1, 1, bcSize.z - posRelativeToSize.z - 1);
-                var center = new Vector3(bcCenter.x, bcCenter.y, minCorner.z + (posRelativeToSize.z + 1) + (bcSize.z - (posRelativeToSize.z + 1)) / 2);
+                var center = new Vector3(minCorner.x + posRelativeToSize.x + 0.5f, minCorner.y + posRelativeToSize.y + 0.5f, minCorner.z + (posRelativeToSize.z + 1) + (bcSize.z - (posRelativeToSize.z + 1)) / 2);
                 MakeCollider(chunk, center, Vector3Int.FloorToInt(size));
             }
             Object.Destroy(bc);

package/Runtime/DevConsole/Resources/Prefabs/FAB_DevConsole.Instance.prefab

@@ -426,7 +426,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
+  m_VertexColorAlwaysGammaSpace: 1
   m_AdditionalShaderChannelsFlag: 25
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
@@ -2686,7 +2686,7 @@ GameObject:
   - component: {fileID: 845665600302246255}
   - component: {fileID: 2176320651782205306}
   m_Layer: 5
-  m_Name: InputField
+  m_Name: DevConsoleInputField
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2765,7 +2765,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
-    m_Mode: 3
+    m_Mode: 0
     m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}

package/Runtime/DevConsole/Runtime/DevConsoleMono.cs

@@ -624,10 +624,8 @@ namespace Airship.DevConsole
         /// <summary>
         ///     Open the dev console - making it visible.
         /// </summary>
-        internal void OpenConsole()
-        {
-            if (!_init && (!ConsoleIsEnabled || ConsoleIsShowing))
-            {
+        internal void OpenConsole() {
+            if (!_init && (!ConsoleIsEnabled || ConsoleIsShowing)) {
                 return;
             }
 
@@ -644,6 +642,7 @@ namespace Airship.DevConsole
             // _canvasGroup.blocksRaycasts = true;
             this.canvas.enabled = true;
             ConsoleIsShowing = true;
+            this._inputField.gameObject.SetActive(true);
             _focusInputField = true;
 
             if (this.firstOpen) {
@@ -658,26 +657,27 @@ namespace Airship.DevConsole
         /// <summary>
         ///     Close the dev console - hiding it in the background.
         /// </summary>
-        public void CloseConsole()
-        {
-            if (!_init && (!ConsoleIsEnabled || !ConsoleIsShowing))
-            {
+        public void CloseConsole() {
+            if (!_init && (!ConsoleIsEnabled || !ConsoleIsShowing)) {
                 return;
             }
 
+            ConsoleIsShowing = false;
 
             // _canvasGroup.alpha = 0f;
             // _canvasGroup.interactable = false;
             // _canvasGroup.blocksRaycasts = false;
             this.canvas.enabled = false;
-            ConsoleIsShowing = false;
+            this._inputField.gameObject.SetActive(false);
             _repositioning = false;
             _resizing = false;
             _focusInputField = false;
-            if (_inputField.isFocused && EventSystem.current != null)
-            {
+            _inputField.textComponent.alignment = TextAnchor.MiddleLeft;
+           
+            if (EventSystem.current != null) {
+                // if (_inputField.isFocused)
+                print("setting to null");
                 EventSystem.current.SetSelectedGameObject(null);
-                this._inputField.textComponent.alignment = TextAnchor.MiddleLeft;
             }
 
             DevConsole.InvokeOnConsoleClosed();
@@ -1384,8 +1384,8 @@ namespace Airship.DevConsole
             }
 
             // Force the input field to be focused by the event system
-            if (_focusInputField && !Application.isMobilePlatform)
-            {
+            if (_focusInputField && !Application.isMobilePlatform) {
+                Debug.Log("Selecting input field.");
                 EventSystem.current.SetSelectedGameObject(_inputField.gameObject);
                 _focusInputField = false;
             }

package/ThirdParty/Mirror/Core/NetworkClient.cs

@@ -1045,7 +1045,7 @@ namespace Mirror
         // the players object for example.
         public static bool Ready()
         {
-            // Debug.Log($"NetworkClient.Ready() called with active scene: " + SceneManager.GetActiveScene().name);
+            Debug.Log($"NetworkClient.Ready() called with active scene: " + SceneManager.GetActiveScene().name);
             if (ready)
             {
                 Debug.LogError("NetworkClient is already ready. It shouldn't be called twice.");

package/ThirdParty/Mirror/Core/NetworkManager.cs

@@ -1155,7 +1155,7 @@ namespace Mirror
         {
             // debug message is very important. if we ever break anything then
             // it's very obvious to notice.
-            //Debug.Log("Finished loading scene in client-only mode.");
+            Debug.Log("Finished loading scene in client-only mode.");
 
             if (clientReadyConnection != null)
             {
@@ -1165,6 +1165,7 @@ namespace Mirror
 
             if (NetworkClient.isConnected)
                 OnClientSceneChanged();
+            else Debug.LogWarning("Not sending client ready: not connected");
         }
 
         /// <summary>
@@ -1529,6 +1530,8 @@ namespace Mirror
         public virtual void OnClientSceneChanged()
         {
             // always become ready.
+            if (!NetworkClient.connection.isAuthenticated) Debug.LogWarning("Not sending client ready: not authenticated");
+            if (NetworkClient.ready) Debug.LogWarning("Not sending client ready: already ready");
             if (NetworkClient.connection.isAuthenticated && !NetworkClient.ready) NetworkClient.Ready();
 
             // Only call AddPlayer for normal scene changes, not additive load/unload

package/package.json

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