gg.easy.airship 0.1.2206 → 0.1.2207

package/Runtime/Code/AirshipConst.cs

@@ -17,6 +17,7 @@ namespace Code {
 #if UNITY_IOS
             "PushNotifications",
 #endif
+            "VideoPlayer",
         };
 
         public static bool HasFlag(string flag) {

package/Runtime/Code/Bundles/SystemRoot.cs

@@ -507,9 +507,6 @@ public class SystemRoot : Singleton<SystemRoot> {
 
 		files.Remove(br.m_path);
 		files.Add(br.m_path, br);
-#if AIRSHIP_STAGING
-		Debug.Log($"Added shared lua file {br.m_path}");
-#endif
 	}
 
 	public static string GetLoadedAssetBundleKey(AirshipPackage package, string assetBundleFile) {

package/Runtime/Code/CoreUI/Components/AirshipVersionOverlay.cs

@@ -7,6 +7,8 @@ namespace Code.CoreUI.Components {
         public TMP_Text versionText;
 
         private void Start() {
+            this.versionText.enabled = false;
+            return;
 #if !AIRSHIP_PLAYER
             if (Application.isEditor) {
                 this.versionText.gameObject.SetActive(false);

package/Runtime/Code/CoreUI/CoreLoadingScreen.prefab

@@ -199,7 +199,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
   m_Color: {r: 0.1764706, g: 0.1764706, b: 0.1764706, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -303,7 +303,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: -5, y: -5, z: -5, w: -5}
@@ -902,6 +902,7 @@ RectTransform:
   m_LocalScale: {x: 0.92927, y: 0.92927, z: 0.92927}
   m_ConstrainProportionsScale: 1
   m_Children:
+  - {fileID: 3150721537713762228}
   - {fileID: 4779218538534976006}
   - {fileID: 119913748507233629}
   - {fileID: 1580868800969815117}
@@ -935,16 +936,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.1764706, g: 0.1764706, b: 0.1764706, a: 1}
+  m_Material: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
+  m_Color: {r: 0.15686275, g: 0.17254902, b: 0.22352941, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 0}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -965,7 +966,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ec18a89aa0caf4669ae44f413c827581, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  radius: 40
+  radius: 10
   image: {fileID: 6904609107978231724}
 --- !u!1 &4572541668520597265
 GameObject:
@@ -1612,7 +1613,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: -5, y: -5, z: -5, w: -5}
@@ -1758,7 +1759,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.09411765, g: 0.09803922, b: 0.101960786, a: 1}
+  m_Color: {r: 0.07058824, g: 0.078431375, b: 0.101960786, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1836,7 +1837,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
   m_Color: {r: 0.74074405, g: 0.751691, b: 0.7735849, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: -5, y: -5, z: -5, w: -5}
@@ -2113,6 +2114,74 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &6635855963037703408
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3150721537713762228}
+  - component: {fileID: 3185627290722957685}
+  - component: {fileID: 5690351040481940385}
+  m_Layer: 5
+  m_Name: Outline
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3150721537713762228
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6635855963037703408}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2046571341396879633}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3185627290722957685
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6635855963037703408}
+  m_CullTransparentMesh: 1
+--- !u!114 &5690351040481940385
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6635855963037703408}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c280d1ddc7af1a04e8f71ea529d0c27f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.050980393}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Texture: {fileID: 0}
+  _outlineWidth: 2
+  _cornerRadius: 10
+  _cornerSegments: 18
+  _mappingBias: 0.5
+  _slightlyThickerCorners: 0
+  _fillCenter: 0
 --- !u!1 &6903882144118719595
 GameObject:
   m_ObjectHideFlags: 0
@@ -2416,7 +2485,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: -5, y: -5, z: -5, w: -5}
@@ -2685,7 +2754,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7631553834785869233}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
   m_Name: 
@@ -2768,7 +2837,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
   m_Color: {r: 1, g: 0.9607843, b: 0.9607843, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -2858,7 +2927,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -2950,7 +3019,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
   m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -3297,7 +3366,7 @@ PrefabInstance:
     - target: {fileID: 8404357530465985221, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
       propertyPath: m_Material
       value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

package/Runtime/Code/CoreUI/MainMenu/MainMenuLoadingScreen.prefab

@@ -907,7 +907,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.09411765, g: 0.09803922, b: 0.101960786, a: 1}
+  m_Color: {r: 0.07058824, g: 0.078431375, b: 0.101960786, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1252,7 +1252,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
   m_Color: {r: 1, g: 0.9607843, b: 0.9607843, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -1519,7 +1519,7 @@ PrefabInstance:
     - target: {fileID: 8404357530465985221, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
       propertyPath: m_Material
       value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 2100000, guid: 517dcfc7bf08549efa5108b97eb2e6cc, type: 2}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

package/Runtime/Code/Luau/ReflectionList.cs

@@ -21,6 +21,7 @@ using UnityEngine.UIElements;
 using LightType = UnityEngine.LightType;
 using UnityEngine.Tilemaps;
 using UnityEngine.VFX;
+using UnityEngine.Video;
 using Slider = UnityEngine.UI.Slider;
 
 #if UNITY_EDITOR
@@ -163,6 +164,7 @@ namespace Luau {
             [typeof(Text)] = LuauContextAll,
             [typeof(RectMask2D)] = LuauContextAll,
             [typeof(WheelFrictionCurve)] = LuauContextAll,
+            [typeof(VideoPlayer)] = LuauContextAll,
 
             // Particles
             [typeof(ParticleSystem)] = LuauContextAll,

package/Runtime/Code/TSCodeGen/TypeGenerator.cs

@@ -55,6 +55,7 @@ using Code.Voice;
 using Unity.Mathematics;
 using UnityEngine.InputSystem;
 using UnityEngine.Splines;
+using UnityEngine.Video;
 using TouchPhase = UnityEngine.TouchPhase;
 
 public class TypeGenerator : MonoBehaviour
@@ -231,6 +232,8 @@ public class TypeGenerator : MonoBehaviour
             typeof(UniversalRenderPipelineAsset),
             typeof(WheelFrictionCurve),
             typeof(WheelHit),
+            typeof(VideoPlayer),
+            typeof(RenderTexture),
 
             // Mirror
             typeof(NetworkServer),

package/Runtime/Code/UI/UIOutline.cs

@@ -7,16 +7,16 @@ using UnityEngine.UI;
 public class UIOutline : Graphic
 {
     [SerializeField] Texture m_Texture;
-    [SerializeField, Range(0f, 500f)] float _outlineWidth = 100f;
-    [SerializeField, Range(0f, 500f)] float _cornerRadius = 50f;
-    [SerializeField, Range(1, 20)] int _cornerSegments = 1;
+    [SerializeField, Range(0f, 500f)] float _outlineWidth = 1f;
+    [SerializeField, Range(0f, 500f)] float _cornerRadius = 10f;
+    [SerializeField, Range(1, 20)] int _cornerSegments = 18;
     [SerializeField, Range(0f, 1f)] float _mappingBias = 0.5f;
     [SerializeField, Tooltip("This should be enabled for very thin outlines that won't render well on low res monitors.")]
     bool _slightlyThickerCorners = false;
     [SerializeField] bool _fillCenter;
 
-    private Vector3[] _corners = new Vector3[4];
-    private List<UIVertex> _verts = new List<UIVertex>();
+    private readonly Vector3[] _corners = new Vector3[4];
+    private readonly List<UIVertex> _verts = new List<UIVertex>();
 
     public override Texture mainTexture => m_Texture == null ? s_WhiteTexture : m_Texture;
 
@@ -31,22 +31,38 @@ public class UIOutline : Graphic
     {
         vh.Clear();
 
-        // Clamp corner radius
         var rect = rectTransform.rect;
-        var clampedCornerRadius = Mathf.Min((Mathf.Min(rect.width, rect.height) / 2f), _cornerRadius);
 
-        // Offset corner based on clamped corner radius
+        // Clamp corner radius so arcs make sense
+        var clampedCornerRadius = Mathf.Min(Mathf.Min(rect.width, rect.height) * 0.5f, _cornerRadius);
+
+        // Clamp outline so inner radius doesn't go negative
+        var clampedOutlineWidth = Mathf.Min(_outlineWidth, clampedCornerRadius);
+
+        // For INNER stroke:
+        // Outer boundary is the rect itself (rounded).
+        // Inner boundary is inset by outline width.
+        var outerRadius = clampedCornerRadius;
+        var innerRadius = clampedCornerRadius - clampedOutlineWidth;
+
+        // Get rect corners
         rectTransform.GetLocalCorners(_corners);
-        _corners[0] += new Vector3(clampedCornerRadius, clampedCornerRadius, 0f);
-        _corners[1] += new Vector3(clampedCornerRadius, -clampedCornerRadius, 0f);
-        _corners[2] += new Vector3(-clampedCornerRadius, -clampedCornerRadius, 0f);
-        _corners[3] += new Vector3(-clampedCornerRadius, clampedCornerRadius, 0f);
-
-        // Calculate dimensions
-        var height = _corners[1].y - _corners[0].y;
-        var width = _corners[2].x - _corners[1].x;
+
+        // Move corners to arc centers (inset by outer radius)
+        _corners[0] += new Vector3(outerRadius, outerRadius, 0f);     // bottom-left
+        _corners[1] += new Vector3(outerRadius, -outerRadius, 0f);    // top-left
+        _corners[2] += new Vector3(-outerRadius, -outerRadius, 0f);   // top-right
+        _corners[3] += new Vector3(-outerRadius, outerRadius, 0f);    // bottom-right
+
+        // Calculate dimensions along the OUTER boundary (since that's what we draw first)
+        var height = (_corners[1].y - _corners[0].y);
+        var width = (_corners[2].x - _corners[1].x);
         var edgeLengths = new[] { height, width, height, width };
-        var circumference = 2f * Mathf.PI * Mathf.Lerp(clampedCornerRadius, clampedCornerRadius + _outlineWidth, _mappingBias);
+
+        // Use bias between outer and inner radius for UV mapping around the shape
+        var mappedRadius = Mathf.Lerp(innerRadius, outerRadius, _mappingBias);
+        var circumference = 2f * Mathf.PI * mappedRadius;
+
         var around = height * 2f + width * 2f + circumference;
         var cornerLength = circumference / 4f;
         var segmentLength = cornerLength / _cornerSegments;
@@ -54,25 +70,33 @@ public class UIOutline : Graphic
         var vert = new UIVertex { color = color };
         _verts.Clear();
 
-        // Create corners
         var u = 0f;
+
         for (var c = 0; c < 4; c++)
         {
-            // Create verts
             var origin = _corners[c];
+
             for (var i = 0; i < _cornerSegments + 1; i++)
             {
-                var angle = (float)i / _cornerSegments * Mathf.PI / 2f + Mathf.PI * 0.5f - Mathf.PI * c * 1.5f;
+                var t = (float)i / _cornerSegments;
+                var angle = t * Mathf.PI / 2f + Mathf.PI * 0.5f - Mathf.PI * c * 1.5f;
                 var direction = new Vector3(Mathf.Cos(-angle), Mathf.Sin(-angle), 0f);
 
-                vert.position = origin + direction * clampedCornerRadius;
+                // OUTER edge (at rect boundary)
+                vert.position = origin + direction * outerRadius;
                 vert.uv0 = new Vector2(u, 0f);
                 _verts.Add(vert);
 
-                var effectiveOutline = _outlineWidth;
-                if (i < _cornerSegments && i > 0 && _slightlyThickerCorners) effectiveOutline = 1.2f * effectiveOutline;
-                
-                vert.position = origin + direction * (clampedCornerRadius + effectiveOutline);
+                // INNER edge (inset)
+                var effectiveOutline = clampedOutlineWidth;
+                if (i < _cornerSegments && i > 0 && _slightlyThickerCorners)
+                {
+                    effectiveOutline = Mathf.Min(outerRadius, 1.2f * effectiveOutline);
+                }
+
+                var effectiveInnerRadius = Mathf.Max(0f, outerRadius - effectiveOutline);
+
+                vert.position = origin + direction * effectiveInnerRadius;
                 vert.uv0 = new Vector2(u, 1f);
                 _verts.Add(vert);
 
@@ -84,13 +108,17 @@ public class UIOutline : Graphic
                 }
 
                 if (i < _cornerSegments)
+                {
                     u += segmentLength / around;
+                }
                 else
+                {
                     u += edgeLengths[c] / around;
+                }
             }
         }
 
-        // Add end verts
+        // Close the loop (duplicate first outer+inner)
         vert = _verts[0];
         vert.uv0 = new Vector2(1f, 0f);
         _verts.Add(vert);
@@ -106,11 +134,11 @@ public class UIOutline : Graphic
             _verts.Add(vert);
         }
 
-        // Add verts to VertexHelper
         foreach (var vertex in _verts)
+        {
             vh.AddVert(vertex);
+        }
 
-        // Add triangles to VertexHelper 
         if (_fillCenter)
         {
             for (var v = 0; v < vh.currentVertCount - 3; v += 3)
@@ -131,4 +159,4 @@ public class UIOutline : Graphic
             }
         }
     }
-}
+}

package/package.json

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