Merge branch 'main' into doolys-branch

BasisVR · Jan 4, 2025 · 2b2b6e9 · 2b2b6e9
2 parents 542ceb9 + 51bce35
commit 2b2b6e9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/Basis/Packages/com.basis.sdk/Scripts/BasisScene.cs b/Basis/Packages/com.basis.sdk/Scripts/BasisScene.cs
@@ -13,10 +13,16 @@ public class BasisScene : BasisContentBase
         public static BasisScene Instance;
         public static UnityEvent<BasisScene> Ready = new UnityEvent<BasisScene>();
         public Camera MainCamera;
+        public bool IsReady;
         public void Awake()
         {
             Instance = this;
             Ready?.Invoke(this);
+            IsReady = true;
+        }
+        public void OnDestroy()
+        {
+            IsReady = false;
         }
         public static SceneNetworkMessageReceiveEvent OnNetworkMessageReceived;
         public static SceneNetworkMessageSendEvent OnNetworkMessageSend;

diff --git a/Basis/Packages/com.basis.sdk/Scripts/Editor/AssetBundleBuilder/BasisAssetBundleBuilder.cs b/Basis/Packages/com.basis.sdk/Scripts/Editor/AssetBundleBuilder/BasisAssetBundleBuilder.cs
@@ -183,6 +183,10 @@ public static string SetAssetBundleName(string assetPath, string uniqueID, Basis
             assetImporter.assetBundleName = assetBundleName;
             return assetBundleName;
         }
+        else
+        {
+            Debug.LogError("Missing Asset Import for path " + assetPath);
+        }
 
         return null;
     }

diff --git a/Basis/Packages/com.basis.sdk/Scripts/Editor/ScriptableObject/BasisAssetBundleObject.cs b/Basis/Packages/com.basis.sdk/Scripts/Editor/ScriptableObject/BasisAssetBundleObject.cs
@@ -3,7 +3,7 @@
 [CreateAssetMenu(fileName = "NewBasisAssetBundleObject", menuName = "Basis/ScriptableObjects/BasisAssetBundleObject", order = 1)]
 public class BasisAssetBundleObject : ScriptableObject
 {
-    public static string AssetBundleObject = "Assets/Settings/AssetBundleBuildSettings.asset";
+    public static string AssetBundleObject = "Packages/com.basis.sdk/Settings/AssetBundleBuildSettings.asset";
     public string TemporaryStorage = "Packages/com.basis.basisdk/TemporaryStorage";
     public string BundleExtension = ".bundle";
     public string hashExtension = ".hash";
@@ -15,4 +15,4 @@ public class BasisAssetBundleObject : ScriptableObject
     public BuildTarget BuildTarget = BuildTarget.StandaloneWindows;
     public BuildAssetBundleOptions BuildAssetBundleOptions;
     public string AssetBundleDirectory = "./AssetBundles";
-}
+}
diff --git a/Basis/Packages/com.basis.sdk/Settings/AssetBundleBuildSettings.asset b/Basis/Packages/com.basis.sdk/Settings/AssetBundleBuildSettings.asset
@@ -12,11 +12,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b719066808df17f4580ce2b537d91c90, type: 3}
   m_Name: AssetBundleBuildSettings
   m_EditorClassIdentifier: 
-  TemporaryStorage: Packages/com.basis.basisdk/TemporaryStorage
+  TemporaryStorage: Assets/TemporaryStorage
   BundleExtension: .bundle
   hashExtension: .hash
   BasisMetaExtension: .BasisMeta
-  BasisBundleCompressedExtension: .BasisEncyptedBundle
+  BasisBundleEncyptedExtension: .BasisEncyptedBundle
+  BasisMetaEncyptedExtension: .BasisEncyptedMeta
   useCompression: 1
   GenerateImage: 1
   BuildTarget: 19