diff --git a/Basis/Packages/com.basis.bundlemanagement/BasisBeeManagement.cs b/Basis/Packages/com.basis.bundlemanagement/BasisBeeManagement.cs index 4c3c9ce63..b1da0d386 100644 --- a/Basis/Packages/com.basis.bundlemanagement/BasisBeeManagement.cs +++ b/Basis/Packages/com.basis.bundlemanagement/BasisBeeManagement.cs @@ -52,7 +52,7 @@ public static async Task HandleBundleAndMetaLoading(BasisTrackedBundleWrapper wr if (output.Item1 == null || output.Item3 != string.Empty) { - throw new Exception($"missing Bundle Bytes Array Error Message {output.Item3}"); + throw new Exception($"Bundle load failed for {wrapper?.LoadableBundle?.BasisRemoteBundleEncrypted?.RemoteBeeFileLocation ?? "unknown"}: {output.Item3}"); } IEnumerable AssetBundles = AssetBundle.GetAllLoadedAssetBundles(); foreach (AssetBundle assetBundle in AssetBundles) @@ -112,6 +112,7 @@ public static async Task HandleBundleAndMetaLoading(BasisTrackedBundleWrapper wr catch (Exception ex) { BasisDebug.LogError(ex); + throw; } } /// diff --git a/Basis/Packages/com.basis.framework/Networking/BasisNetworkSpawnItem.cs b/Basis/Packages/com.basis.framework/Networking/BasisNetworkSpawnItem.cs index 43b8ea3f7..41673a5fb 100644 --- a/Basis/Packages/com.basis.framework/Networking/BasisNetworkSpawnItem.cs +++ b/Basis/Packages/com.basis.framework/Networking/BasisNetworkSpawnItem.cs @@ -208,7 +208,7 @@ public static async Task SpawnGameObject(LocalLoadResource localLoad if (reference == null) { - BasisDebug.LogError($"Unable to load {loadBundle.BasisLocalEncryptedBundle.DownloadedBeeFileLocation}", BasisDebug.LogTag.Networking); + BasisDebug.LogError($"Unable to load content from {localLoadResource.CombinedURL}. This may be caused by the bundle not having a build for the current platform ({UnityEngine.Application.platform}). Check earlier log messages for details.", BasisDebug.LogTag.Networking); BasisProgressReport.OnProgressReport -= BasisUILoadingBar.ProgressReport; return null; } diff --git a/Basis/Packages/com.basis.openlipsync/Plugins/Managed/Microsoft.ML.OnnxRuntime.dll.meta b/Basis/Packages/com.basis.openlipsync/Plugins/Managed/Microsoft.ML.OnnxRuntime.dll.meta index 602f8b7d3..86c4e04da 100644 --- a/Basis/Packages/com.basis.openlipsync/Plugins/Managed/Microsoft.ML.OnnxRuntime.dll.meta +++ b/Basis/Packages/com.basis.openlipsync/Plugins/Managed/Microsoft.ML.OnnxRuntime.dll.meta @@ -27,6 +27,11 @@ PluginImporter: second: enabled: 1 settings: {} + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64.meta b/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64.meta new file mode 100644 index 000000000..861434f9b --- /dev/null +++ b/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4e5f6a7b8c9d0e1f2a3b4c5d6a7b8c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64/native.meta b/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64/native.meta new file mode 100644 index 000000000..b5a9d7fed --- /dev/null +++ b/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64/native.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5f6a7b8c9d0e1f2a3b4c5d6a7b8c9d0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64/native/libonnxruntime.dylib b/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64/native/libonnxruntime.dylib new file mode 100644 index 000000000..02372a9a2 Binary files /dev/null and b/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64/native/libonnxruntime.dylib differ diff --git a/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64/native/libonnxruntime.dylib.meta b/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64/native/libonnxruntime.dylib.meta new file mode 100644 index 000000000..22ad35f1d --- /dev/null +++ b/Basis/Packages/com.basis.openlipsync/Plugins/osx-arm64/native/libonnxruntime.dylib.meta @@ -0,0 +1,35 @@ +fileFormatVersion: 2 +guid: f6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: ARM64 + DefaultValueInitialized: true + OS: OSX + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: ARM64 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64.meta b/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64.meta new file mode 100644 index 000000000..5195928ec --- /dev/null +++ b/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64/native.meta b/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64/native.meta new file mode 100644 index 000000000..fc05fbf04 --- /dev/null +++ b/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64/native.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2a3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64/native/libonnxruntime.dylib b/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64/native/libonnxruntime.dylib new file mode 100644 index 000000000..8d3e10f02 Binary files /dev/null and b/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64/native/libonnxruntime.dylib differ diff --git a/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64/native/libonnxruntime.dylib.meta b/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64/native/libonnxruntime.dylib.meta new file mode 100644 index 000000000..ba305eaf4 --- /dev/null +++ b/Basis/Packages/com.basis.openlipsync/Plugins/osx-x64/native/libonnxruntime.dylib.meta @@ -0,0 +1,35 @@ +fileFormatVersion: 2 +guid: c9d0e1f2a3b4c5d6a7b8c9d0e1f2a3b4 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: x86_64 + DefaultValueInitialized: true + OS: OSX + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: x86_64 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/Packages/com.unity.3rdpersondemo/Jump--Jump.anim.fbx.meta b/Basis/Packages/com.unity.3rdpersondemo/Jump--Jump.anim.fbx.meta index 364c5ca0e..019d6538f 100644 --- a/Basis/Packages/com.unity.3rdpersondemo/Jump--Jump.anim.fbx.meta +++ b/Basis/Packages/com.unity.3rdpersondemo/Jump--Jump.anim.fbx.meta @@ -100,14 +100,7 @@ ModelImporter: mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 curves: [] - events: - - time: 0.1615599 - functionName: OnLand - data: - objectReferenceParameter: {instanceID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + events: [] transformMask: [] maskType: 3 maskSource: {instanceID: 0} diff --git a/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Run_N.anim.fbx.meta b/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Run_N.anim.fbx.meta index b2a72fdef..b8c799014 100644 --- a/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Run_N.anim.fbx.meta +++ b/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Run_N.anim.fbx.meta @@ -58,21 +58,7 @@ ModelImporter: mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 curves: [] - events: - - time: 0.3221903 - functionName: OnFootstep - data: - objectReferenceParameter: {instanceID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 - - time: 0.8077375 - functionName: OnFootstep - data: - objectReferenceParameter: {instanceID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + events: [] transformMask: [] maskType: 3 maskSource: {instanceID: 0} diff --git a/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Run_S.anim.fbx.meta b/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Run_S.anim.fbx.meta index dc6cda7be..1b5dcb4e7 100644 --- a/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Run_S.anim.fbx.meta +++ b/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Run_S.anim.fbx.meta @@ -65,21 +65,7 @@ ModelImporter: mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 curves: [] - events: - - time: 0.4519231 - functionName: OnFootstep - data: - objectReferenceParameter: {instanceID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 - - time: 0.9519231 - functionName: OnFootstep - data: - objectReferenceParameter: {instanceID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + events: [] transformMask: [] maskType: 3 maskSource: {instanceID: 0} diff --git a/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Walk_N.anim.fbx.meta b/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Walk_N.anim.fbx.meta index 0ae6f737d..eb4314466 100644 --- a/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Walk_N.anim.fbx.meta +++ b/Basis/Packages/com.unity.3rdpersondemo/Locomotion--Walk_N.anim.fbx.meta @@ -58,21 +58,7 @@ ModelImporter: mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 curves: [] - events: - - time: 0.31872225 - functionName: OnFootstep - data: - objectReferenceParameter: {instanceID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 - - time: 0.7970205 - functionName: OnFootstep - data: - objectReferenceParameter: {instanceID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + events: [] transformMask: [] maskType: 3 maskSource: {instanceID: 0}