修复 场景景点中的物体生成逻辑

Assets/2.0/User/Model/ModelItem.cs

@@ -82,6 +82,9 @@ public class ModelItem
 
     Vector3 getInfoPos()
     {
+        if (prefabModel == null || objectTransform.nowPos==null)
+            return Vector3.zero;
+
         Debug.Log("获取modelItem坐标==》"+prefabModel.name+ objectTransform.nowPos);
         //return Vector3.zero;
         if (objectTransform.nowPos == Vector3.zero&& prefabModel.transform.localPosition!=Vector3.zero)
@@ -91,6 +94,9 @@ public class ModelItem
     }
     Vector3 getInfoEul()
     {
+        if (prefabModel == null || objectTransform.nowPos == null)
+            return Vector3.zero;
+
         if (objectTransform.nowRot == Vector3.zero && prefabModel.transform.localEulerAngles != Vector3.zero)
             return objectTransform.startRot;
         else
@@ -100,6 +106,9 @@ public class ModelItem
 
     Vector3 getInfoScale()
     {
+        if ( objectTransform.nowPos == null)
+            return Vector3.one;
+
         if (objectTransform.nowScale == Vector3.zero)
             return objectTransform.startScale;
         else

Assets/2.0/User/Model/ModelList.cs

@@ -75,6 +75,15 @@ public class ModelList: System.ICloneable
             {
                materialList[i].init();
             }
+            _model.transform.parent = spotsItem.SpotsObj.transform;
+            if (getInfoPos() != Vector3.zero)
+            {
+                _model.transform.localPosition = getInfoPos();
+            }
+            if (getInfoEul() != Vector3.zero)
+            {
+                _model.transform.localEulerAngles = getInfoPos();
+            }
         }
     }
 

Assets/2.0/User/Model/ModelManager.cs

@@ -47,7 +47,7 @@ public class ModelManager : Singleton<ModelManager>
             int len = Models.Count;
             for (int i = 0; i < len; i++)
             {
-                if (Models.Count - 1 < len && Models[i].type == 0)
+                if (Models.Count - 1 < len && (Models[i].type == 0))
                     Models.Remove(Models[i]);
 
 

Assets/Scripts/UI/GameManager.cs

@@ -306,21 +306,20 @@ public class GameManager : MonoSingleton<GameManager>
         //  }
         if (avplayer && !avplayer.IsPlaying()&& !TemplateVideo.isPlayLock)
         {
+            Debug.Log("HJJVideo  创建锁解开 并且播放完毕");
             TemplateVideo.isPlaying = false;
             avplayer = null;
         }
-        if(TemplateVideo.isPlayLock)
-        {
-            lockTime += Time.time;
-            if(lockTime>1)
-            {
-                TemplateVideo.isPlayLock = false;
-                lockTime = 0;
-            }
-        }
         if (TemplateVideo.temQueue.Count>0&&!TemplateVideo.isPlaying &&!TemplateVideo.isPlayLock)
         {
+            Debug.Log("HJJVideo  开始播放");
             TemplateVideo.isPlaying = true;
+            TimerMgr.Instance.CreateTimer(()=> {
+
+                Debug.Log("HJJVideo  播放的创建锁  创建锁解开");
+                TemplateVideo.isPlayLock = false;
+
+            },3);
             TemplateVideo video = TemplateVideo.temQueue.Dequeue();
 #if !UNITY_EDITOR
             video.m_Video.SetUrl("file://"+ video.localSavePath);

Assets/Scripts/UI/LoginPanel.cs

@@ -310,7 +310,7 @@ public class LoginPanel : BaseUI
         m_AccountStr = "jiajun.hu@ghz-tech.com";
       //  m_AccountStr = "1768147286@qq.com";
         m_AccountStr = "bactest1@1.com";
-        m_AccountStr = "1768147286@qq.com";
+      //  m_AccountStr = "1768147286@qq.com";
         //  m_AccountStr = "advtest1@1.com";
 #endif