修复视频播放

Assets/2.0/User/Spots/SpotsItem.cs

@@ -97,6 +97,7 @@ public class SpotsItem
             if(obVuforia.TargetName == behaviour.TargetName)
             {
                 VuforiaItem.SetActive(true);
+                Debug.Log("OnTargetStatusChanged ·¢ÏÖ VuforiaItem " + VuforiaItem.name);
 
                 TimerMgr.Instance.CreateTimer(()=> {
                     VuforiaItem.transform.position = obj.transform.position;

Assets/Resources/VuforiaConfiguration.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: VuforiaConfiguration
   m_EditorClassIdentifier: 
   vuforia:
-    vuforiaLicenseKey: 
+    vuforiaLicenseKey: AVdaifr/////AAABmTxtN/ZN0Eg+uuJIO4iBD7dsw2+y7PFk/RTJIeK591PAPZFHjA0YUX2pybiHDZk+xm0fFr2tLCDPOwMR8S/wxajuVOXUYDkGA8NlzQiNbSfQyFSEFLS92UNrOQO0dnMwsTnZKS0VUhk+Xh9bYy4Iv7lfQ8fPvG6/DSQ/qfSrn8IbZsQ3Dl2MomN1VAO5YPXSQwjCyY8Lncu6XwJXfrxZoDvBJkDDnp5NiWhlqdiYi/ZewaJyrhAE1tImEkTKR4B4bu2VE1n8qaXCEFmRGtX2SLYiCchylxYXzYnF9DwTlLOVvY/3vXnuJ8VPhaUtAM8xIrk072ZL5lvBnVJ508LHC5vzzWJcLBI8pDmS9p6BcU1D
     ufoLicenseKey: QWRvTlZRYi8vLy8vQUFBQUtFUlVmMFlNSUUyWG5CbzJUQ2JlazFZSXptZnlBb29UdzVkdGg2bmdRWjQyWjM4eEphZjZPa2VFcDlSb2xoekRPeXZCcVlKbXQvZjduby9xbjVjNVMxVnlxZ2VhNVBiVzlBTVpJRVU5TmJCaVNxcGc4QzVXdWpySEJWOVcvT1JJZGdxbmowUVp2OHR5UytzQk9CWWlMbVJaZXErTE5MWXJSUEhlNjMzWWh0NnR3Q2RxTFRVVzFtSjNacUIwYW5pYnk3S2FhK241UDVtTXZoRzUyWkZKM2VKZk9JTXZEV05WU05wOFVOY0tyalZwRDRkeEw2Y3d5cFpDWjJub09IOUxUNVNEV2xqMDRYUnZRYXZ2UTJjVlFqUkdvc2E1NjY3TFNjQ0JqTUJFaXlFRTFtbDNhbERnQUtldllOalpoVkpadVkydnl3NzU5eVhYUXl3STZIZXFsYUh2aWxwV05EaTcrZCtFZE04bTlVanI=
     delayedInitialization: 0
     cameraFocusModeSetting: 2

Assets/Scripts/UI/GameManager.cs

@@ -318,10 +318,13 @@ public class GameManager : MonoSingleton<GameManager>
                 lockTime = 0;
             }
         }
-        if (TemplateVideo.temQueue.Count>0&&!TemplateVideo.isPlaying)
+        if (TemplateVideo.temQueue.Count>0&&!TemplateVideo.isPlaying &&!TemplateVideo.isPlayLock)
         {
             TemplateVideo.isPlaying = true;
             TemplateVideo video = TemplateVideo.temQueue.Dequeue();
+#if !UNITY_EDITOR
+            video.m_Video.SetUrl("file://"+ video.localSavePath);
+#endif
             video.m_Video.transform.GetComponent<VideoPlayBtn>().m_IsPlaying = false;
             video.m_Video.transform.GetComponent<VideoPlayBtn>().PlayVideoAuto();
             avplayer = video.m_Video;
@@ -482,7 +485,7 @@ public class GameManager : MonoSingleton<GameManager>
     //}
 
 
-    #region 设置功能
+#region 设置功能
 
     public void OnEditorBtnValueChanged(bool ison)
     {
@@ -659,9 +662,9 @@ public class GameManager : MonoSingleton<GameManager>
         }
 
     }
-    #endregion
+#endregion
 
-    #region 获取景点信息--素材编辑模式下
+#region 获取景点信息--素材编辑模式下
     /// <summary>
     /// 获取当前景点对应的物体信息
     /// </summary>
@@ -709,9 +712,9 @@ public class GameManager : MonoSingleton<GameManager>
         m_UIAnchorsPanel.SaveAnchors(name);
 
     }
-    #endregion
+#endregion
 
-    #region 创建水晶点、触发器范围、显示物体
+#region 创建水晶点、触发器范围、显示物体
 
     public void CreateScene(SceneValue scene)
     {
@@ -1473,9 +1476,9 @@ public class GameManager : MonoSingleton<GameManager>
         return objectValue;
     }
 
-    #endregion
+#endregion
 
-    #region 路径
+#region 路径
 
     /// <summary>
     /// 设置路线数据
@@ -1490,9 +1493,9 @@ public class GameManager : MonoSingleton<GameManager>
         }
         RouteCtr.SetRouteValue(navLines);
     }
-    #endregion
+#endregion
 
-    #region 锚点
+#region 锚点
 
     /// <summary>
     ///  设置场景锚点
@@ -1562,10 +1565,10 @@ public class GameManager : MonoSingleton<GameManager>
 
         return mesh;
     } 
-    #endregion
+#endregion
 
 
-    #region 触发器判定
+#region 触发器判定
 
     /// <summary>
     /// 当人物进入触发器范围
@@ -1718,7 +1721,7 @@ public class GameManager : MonoSingleton<GameManager>
 
     
 
-    #endregion
+#endregion
 
     public ObjectValue GetCurrentColliderValue()
     {

Assets/Scripts/UI/LoginPanel.cs

@@ -309,7 +309,8 @@ public class LoginPanel : BaseUI
         m_AccountStr = "jiajun.hu@ghz-tech.com";
       //  m_AccountStr = "1768147286@qq.com";
         m_AccountStr = "bactest1@1.com";
-      //  m_AccountStr = "advtest1@1.com";
+        m_AccountStr = "1768147286@qq.com";
+        //  m_AccountStr = "advtest1@1.com";
 #endif
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))
@@ -758,8 +759,8 @@ public class LoginPanel : BaseUI
             m_IsRemberPwd = n > 0 ? true : false;
         }
 #if UNITY_EDITOR
-        //   m_AccountStr = "1768147286@qq.com";
-        m_AccountStr = "jiajun.hu@ghz-tech.com";
+           m_AccountStr = "1768147286@qq.com";
+      //  m_AccountStr = "jiajun.hu@ghz-tech.com";
         m_PasswordStr = "123456Aa";
 #endif
         //m_AccountStr = "2463951@qq.com";

Assets/VuforiaLicense.cs

@@ -1,12 +0,0 @@
-
-            //This class is auto-generated, please do not overwrite
-
-            public class VuforiaLicense
-            {
-const string license = "QVZkYWlmci8vLy8vQUFBQm1UeHROL1pOMEVnK3V1SklPNGlCRDdkc3cyK3k3UEZrL1JUSkllSzU5MVBBUFpGSGpBMFlVWDJweWJpSERaayt4bTBmRnIydExDRFBPd01SOFMvd3hhanVWT1hVWURrR0E4Tmx6UWlOYlNmUXlGU0VGTFM5MlVOck9RTzBkbk13c1RuWktTMFZVaGsrWGg5Yll5NEl2N2xmUThmUHZHNi9EU1EvcWZTcm44SWJac1EzRGwyTW9tTjFWQU81WVBYU1F3akN5WThMbmN1Nlh3Slhmcnhab0R2QkprRERucDVOaVdobHFkaVlpL1pld2FKeXJoQUUxdEltRWtUS1I0QjRidTJWRTFuOHFhWENFRm1SR3RYMlNMWWlDY2h5bHhZWHpZbkY5RHdUbExPVnZZLzN2WG51SjhWUGhhVXRBTTh4SXJrMDcyWkw1bHZCblZKNTA4TEhDNXZ6eldKY0xCSThwRG1TOXA2QmNVMUQ=";
-
-                static string GetLicenseKey()
-                {
-                    return license;
-                }
-            }

Assets/VuforiaLicense.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3022418932f4de747b176769fcc130a2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: