Update to 0.15.12

mtion-tv · Nov 20, 2024 · 2c968e5 · 2c968e5
1 parent 53e630a
commit 2c968e5
Show file tree

Hide file tree

Showing 42 changed files with 48 additions and 47 deletions.
diff --git a/Editor/ControlPanels/MTIONSDKToolsWindow.cs b/Editor/ControlPanels/MTIONSDKToolsWindow.cs
@@ -33,7 +33,6 @@ public enum WarningType
             ERROR
         }
 
-        private static bool _authenticated;
         private static Task<bool> _authenticateTask;
 
         private static string _remoteSdkVersion;
@@ -159,7 +158,7 @@ private void OnGUI()
                 return;
             }
 
-            if (!_authenticated)
+            if (SDKServerManager.AuthState != service.api.auth.AuthState.AUTHENTICATED)
             {
                 GUILayout.Space(150);
                 if (_authenticateTask != null)
@@ -280,7 +279,7 @@ private void InitializeStyles()
 
         private void TryAuthenticate()
         {
-            if (_authenticated || _authenticateTask != null)
+            if (SDKServerManager.AuthState == service.api.auth.AuthState.AUTHENTICATED || _authenticateTask != null)
             {
                 return;
             }
@@ -289,7 +288,6 @@ private void TryAuthenticate()
             _authenticateTask = SDKServerManager.Authenticate();
             _authenticateTask.ContinueWith(t =>
             {
-                _authenticated = _authenticateTask.Result;
                 _authenticateTask = null;
             });
         }

diff --git a/Plugins/ThirdParty/Draco.dll b/Plugins/ThirdParty/Draco.dll
diff --git a/Plugins/ThirdParty/DracoEditor.dll b/Plugins/ThirdParty/DracoEditor.dll
diff --git a/Plugins/ThirdParty/DracoEncoder.dll b/Plugins/ThirdParty/DracoEncoder.dll
diff --git a/Plugins/ThirdParty/FastSpringBone.dll b/Plugins/ThirdParty/FastSpringBone.dll
diff --git a/Plugins/ThirdParty/FastSpringBone10.dll b/Plugins/ThirdParty/FastSpringBone10.dll
diff --git a/Plugins/ThirdParty/GLTFSerialization.dll b/Plugins/ThirdParty/GLTFSerialization.dll
diff --git a/Plugins/ThirdParty/Ktx.Editor.dll b/Plugins/ThirdParty/Ktx.Editor.dll
diff --git a/Plugins/ThirdParty/Ktx.dll b/Plugins/ThirdParty/Ktx.dll
diff --git a/Plugins/ThirdParty/MTIONServerAPI_Public.dll b/Plugins/ThirdParty/MTIONServerAPI_Public.dll
diff --git a/Plugins/ThirdParty/MTIONStudioSDK_Public_Compiled.dll b/Plugins/ThirdParty/MTIONStudioSDK_Public_Compiled.dll
diff --git a/Plugins/ThirdParty/MTIONStudioSDK_Public_Compiled_Editor.dll b/Plugins/ThirdParty/MTIONStudioSDK_Public_Compiled_Editor.dll
diff --git a/Plugins/ThirdParty/MTIONUtilityClasses.dll b/Plugins/ThirdParty/MTIONUtilityClasses.dll
diff --git a/Plugins/ThirdParty/MToon.Editor.dll b/Plugins/ThirdParty/MToon.Editor.dll
diff --git a/Plugins/ThirdParty/MToon.dll b/Plugins/ThirdParty/MToon.dll
diff --git a/Plugins/ThirdParty/UniGLTF.Editor.dll b/Plugins/ThirdParty/UniGLTF.Editor.dll
diff --git a/Plugins/ThirdParty/UniGLTF.Utils.dll b/Plugins/ThirdParty/UniGLTF.Utils.dll
diff --git a/Plugins/ThirdParty/UniGLTF.dll b/Plugins/ThirdParty/UniGLTF.dll
diff --git a/Plugins/ThirdParty/UniHumanoid.Editor.dll b/Plugins/ThirdParty/UniHumanoid.Editor.dll
diff --git a/Plugins/ThirdParty/UniHumanoid.dll b/Plugins/ThirdParty/UniHumanoid.dll
diff --git a/Plugins/ThirdParty/UniTask.dll b/Plugins/ThirdParty/UniTask.dll
diff --git a/Plugins/ThirdParty/UniVRM.Editor.dll b/Plugins/ThirdParty/UniVRM.Editor.dll
diff --git a/Plugins/ThirdParty/UnityGLTFEditor.dll b/Plugins/ThirdParty/UnityGLTFEditor.dll
diff --git a/Plugins/ThirdParty/UnityGLTFScripts.dll b/Plugins/ThirdParty/UnityGLTFScripts.dll
diff --git a/Plugins/ThirdParty/VRM.dll b/Plugins/ThirdParty/VRM.dll
diff --git a/Plugins/ThirdParty/VRM10.Editor.dll b/Plugins/ThirdParty/VRM10.Editor.dll
diff --git a/Plugins/ThirdParty/VRM10.dll b/Plugins/ThirdParty/VRM10.dll
diff --git a/Plugins/ThirdParty/VRMShaders.GLTF.IO.Editor.dll b/Plugins/ThirdParty/VRMShaders.GLTF.IO.Editor.dll
diff --git a/Plugins/ThirdParty/VRMShaders.GLTF.IO.Runtime.dll b/Plugins/ThirdParty/VRMShaders.GLTF.IO.Runtime.dll
diff --git a/Plugins/ThirdParty/VRMShaders.GLTF.UniUnlit.Editor.dll b/Plugins/ThirdParty/VRMShaders.GLTF.UniUnlit.Editor.dll
diff --git a/Plugins/ThirdParty/VRMShaders.GLTF.UniUnlit.Runtime.dll b/Plugins/ThirdParty/VRMShaders.GLTF.UniUnlit.Runtime.dll
diff --git a/Plugins/ThirdParty/VRMShaders.VRM.IO.Runtime.dll b/Plugins/ThirdParty/VRMShaders.VRM.IO.Runtime.dll
diff --git a/Plugins/ThirdParty/VRMShaders.VRM10.Format.Runtime.dll b/Plugins/ThirdParty/VRMShaders.VRM10.Format.Runtime.dll
diff --git a/Plugins/ThirdParty/VRMShaders.VRM10.MToon10.Editor.dll b/Plugins/ThirdParty/VRMShaders.VRM10.MToon10.Editor.dll
diff --git a/Plugins/ThirdParty/VRMShaders.VRM10.MToon10.Runtime.dll b/Plugins/ThirdParty/VRMShaders.VRM10.MToon10.Runtime.dll
diff --git a/Plugins/ThirdParty/VrmLib.dll b/Plugins/ThirdParty/VrmLib.dll
diff --git a/Plugins/ThirdParty/glTFast.Editor.dll b/Plugins/ThirdParty/glTFast.Editor.dll
diff --git a/Plugins/ThirdParty/glTFast.Export.dll b/Plugins/ThirdParty/glTFast.Export.dll
diff --git a/Plugins/ThirdParty/glTFast.dll b/Plugins/ThirdParty/glTFast.dll
diff --git a/Plugins/ThirdParty/glTFast.dots.dll b/Plugins/ThirdParty/glTFast.dots.dll
diff --git a/Scripts/ActionSystem/Internal/MActionBehaviour.cs b/Scripts/ActionSystem/Internal/MActionBehaviour.cs
@@ -3,11 +3,14 @@
 using System.Collections.Generic;
 using System.Reflection;
 using mtion.room.sdk.compiled;
-using UnityEditor;
 using UnityEngine;
 using UnityEngine.Serialization;
 using Object = UnityEngine.Object;
 
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
 namespace mtion.room.sdk.action
 {
     [Serializable]

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "com.mtion.sdk",
     "description": "Tools to create assets and clubhouses for mtion studio.",
-    "version": "0.15.11",
+    "version": "0.15.12",
     "supportedVersion": "2021.3.25f1",
     "unity": "2021.3",
     "displayName": "Mtion SDK",