gg.easy.airship 0.1.2123 → 0.1.2125

package/Editor/CreateAssetBundles.cs

@@ -311,14 +311,24 @@ public static class CreateAssetBundles {
 		foreach (var assetBundleFile in AirshipPackagesWindow.assetBundleFiles) {
 			var assetBundleName = assetBundleFile.ToLower();
 			if (assetBundleName == "shared/scenes") {
-				string[] assetPaths = gameConfig.gameScenes
-					.Select((s) => AssetDatabase.GetAssetPath((SceneAsset)s))
+				var assetGuids = gameConfig.gameScenes
+					.Select((s) => AssetDatabase.GetAssetPath((SceneAsset)s)).ToHashSet();
+
+				var explicitlyAddedPaths = AssetDatabase.GetAssetPathsFromAssetBundle("scenes");
+				Debug.Log($"Found {explicitlyAddedPaths.Length} explicit assets for scenes bundle.");
+				foreach (var path in explicitlyAddedPaths) {
+					// Debug.Log("  - " + path);
+					assetGuids.Add(AssetDatabase.AssetPathToGUID(path));
+				}
+
+				string[] assetPaths = assetGuids
 					.Where((path) => !(path.EndsWith(".lua") || path.EndsWith(".json~")))
 					.ToArray();
-				// Debug.Log("Including scenes: ");
-				// foreach (var p in assetPaths) {
-				// 	Debug.Log("  - " + p);
-				// }
+				Debug.Log("Including assets in scenes bundle:");
+				foreach (var p in assetPaths) {
+					Debug.Log("  - " + p);
+				}
+
 				var addressableNames = assetPaths.Select((p) => p.ToLower())
 					.ToArray();
 				var build = new AssetBundleBuild() {

package/Runtime/Code/DeveloperTooling/EasyTransformAnchor.cs

@@ -1,18 +1,20 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
-public class EasyTransformAnchor : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
+public class EasyTransformAnchor : MonoBehaviour {
+    public Transform anchor;
+    public bool matchPosition = true;
+    public bool matchRotation = true;
+    public bool matchScale = false;
 
-    // Update is called once per frame
-    void Update()
+    void LateUpdate()
     {
-        
+        if(matchPosition)
+            this.transform.position = anchor.position;
+
+        if(matchRotation)
+            this.transform.rotation = anchor.rotation;
+
+        if(matchScale)  
+            this.transform.localScale = anchor.localScale;
     }
 }

package/Runtime/Code/Luau/LuauPlugin.cs

@@ -241,12 +241,10 @@ public static class LuauPlugin {
 #else
 	[DllImport("LuauPlugin", CallingConvention = CallingConvention.Cdecl)]
 #endif
-	private static extern bool Reset(LuauContext context);
-	public static bool LuauReset(LuauContext context) {
+	private static extern void Reset(LuauContext context);
+	public static void LuauReset(LuauContext context) {
         ThreadSafetyCheck();
-
-        bool returnValue = Reset(context);
-        return returnValue;
+        Reset(context);
 	}
 
 #if UNITY_IPHONE

package/Runtime/Code/UserInput/KeyboardInput.cs

@@ -6,11 +6,13 @@ public class KeyboardInput : IDisposable {
     public event Action<Key> KeyDown;
     public event Action<Key> KeyUp;
     
-    private readonly InputActionMap _inputMap = new InputActionMap("keyboard");
+    private InputActionMap _inputMap = new InputActionMap("keyboard");
     
     public KeyboardInput() {
         // Capture all keys and bind them to the input action map:
         foreach (var keyControl in Keyboard.current.allKeys) {
+            if (keyControl == null) continue;
+            
             var action = _inputMap.AddAction(keyControl.name);
             action.AddBinding($"<Keyboard>/{keyControl.name}");
         }

package/Runtime/Plugins/Mac/LuauPlugin.bundle/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>23H420</string>
+	<string>23H527</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>

package/package.json

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