Merge branch 'master' of ssh://gogs.ghz-tech.com:30979/GHZ/MRSpace_Action

Assets/Studio/Scripts/Room/Container/Component/VideoComponent.cs

@@ -32,8 +32,26 @@ namespace ShadowStudio.Model
                 }
                 return moviesPlayer;
             }
+        }
+        void Start()
+        {
+            StartCoroutine(PlayerFirstFrame());
         }
 
+        /// <summary>
+        /// 第一次打开加载时无缩略图，为生成缩略图
+        /// </summary>
+        /// <returns></returns>
+        IEnumerator PlayerFirstFrame()
+        {
+            int temp = 0;
+            yield return new WaitForSeconds(0.3f);
+            while (temp < 2)
+            {
+                playVideoManager();
+                temp++;
+            }
+        }
 
         private void OnTransferSelect(bool isSelect)
         {

Assets/Studio/XRLib/Codes/TestMVC/LoginDlg.cs

@@ -178,12 +178,10 @@ namespace ShadowStudio.UI
         }
         private void OnClickLogin()
         {
-            //userInputField.text = "HBKC217147";
-            //passwordInputField.text = "HBKC217147";
-
-            userInputField.text = "ycst0007";
+#if UNITY_EDITOR
+            userInputField.text = "ycst0003";
             passwordInputField.text = "yc123456";
-
+#endif
             if (userInputField.text == "" || passwordInputField.text == "")
             {
                 if (userInputField.text == "")

Assets/Studio/_4ShowScene/_ShowSceneCommonScripts/ShowViewMgr.cs

@@ -9,6 +9,7 @@ using ShadowStudio.Model;
 using ShadowStudio.UI;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using UnityEngine.UI;
 using XRTool.Util;
 
 public class ShowViewMgr : UnitySingleton<ShowViewMgr>
@@ -95,7 +96,15 @@ public class ShowViewMgr : UnitySingleton<ShowViewMgr>
         ArtInfoMgr.Instance.ListenUser();
         roomId = CommonMethod.roomConfig.Id;
         //WSHandler.User.OnRoomChange += roomChange;
-        TimerMgr.Instance.CreateTimer(Init, 0.5f);
+        TimerMgr.Instance.CreateTimer(Init, 0.5f);
+
+        if (CommonMethod.roomConfig.Is_created == "0")
+        {
+            GameObject.Find("CreateSenceBtn").GetComponent<Button>().enabled = false;
+            Debug.LogError("非房主进入房间");
+        }
+        else
+            Debug.LogError("房主进入房间");
     }
 
     private void CreateSuccess(ArtContainer artContainer)

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: shadowcreator
-  productName: MRSpace(Server)
+  productName: MRSpace
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}