Vuforia 下载命名修改

Assets/2.0/Tools/DownLoadItem.cs

@@ -245,7 +245,7 @@ public class DownLoadItem : MonoBehaviour
         data.downLoadPath = downLoadPath;
         data.localLoadPath = Application.persistentDataPath + "/Material/" + Path.GetFileName(downLoadPath);
         if(type == ModelType.vuforial)
-            data.localLoadPath = Application.persistentDataPath + "/StreamingAssets/Vuforia/" + Path.GetFileName(downLoadPath);
+            data.localLoadPath = Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia." + downLoadPath.Split('.')[1];
         data.updataTime = 0;
         data.type = ((int)type).ToString();
 

Assets/2.0/User/Trigger/VufroiaTrigger.cs

@@ -20,8 +20,8 @@ public class VufroiaTrigger
     {
         xmlFile = msg["vuforiaXML"].ToString();
         datFile = msg["vuforiaDat"].ToString();
-        LoaclxmlFile = Application.persistentDataPath + "/StreamingAssets/Vuforia/" + Path.GetFileName(xmlFile);
-        LoacldatFile = Application.persistentDataPath + "/StreamingAssets/Vuforia/" + Path.GetFileName(datFile);
+        LoaclxmlFile = Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia.xml";
+        LoacldatFile = Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia.dat";
         LoadManager.Instance.loadVuforia(xmlFile, datFile,(bool b)=> {
 
             isXML = true;
@@ -44,9 +44,10 @@ public class VufroiaTrigger
     {
         Debug.Log("DGJ ===> 加载Database  " + LoaclxmlFile);
         IEnumerable<ObserverBehaviour> observer = null;
+        observer = VuforiaBehaviour.Instance.ObserverFactory.CreateBehavioursFromDatabase(LoaclxmlFile);
         try
         {
-           observer = VuforiaBehaviour.Instance.ObserverFactory.CreateBehavioursFromDatabase(LoaclxmlFile);
+        
          
 
         }

Assets/2.0/User/UserScene/UserSceneItem.cs

@@ -36,6 +36,7 @@ public class UserSceneItem
 
     public void load()
     {
+        Debug.Log("DGJ  load ====> ");
         vufroiaTrigger.init();
         foreach (var v in SpotsList.Values)
         {

Assets/COSScripts/COSDownLoad.cs

@@ -272,7 +272,7 @@ private void Start()
                                            // string localDir = System.IO.Path.GetTempPath();//本地文件夹
                                            // string localFileName = "my-local-temp-file"; //指定本地保存的文件名
 
-        string localFileName = Path.GetFileName(downloadMaterial.downLoadPath);
+        string localFileName = Path.GetFileName(downloadMaterial.localLoadPath);
 
         localDir = downloadMaterial.localLoadPath.Substring(0, downloadMaterial.localLoadPath.Length - localFileName.Length);
         // 下载对象

Assets/Scripts/UI/LoginPanel.cs

@@ -306,10 +306,10 @@ public class LoginPanel : BaseUI
     {
 #if UNITY_EDITOR
         m_AccountStr = "4444@qq.com";
-     //   m_AccountStr = "jiajun.hu@ghz-tech.com";
-        m_AccountStr = "1768147286@qq.com";
-       // m_AccountStr = "bactest1@1.com";
-      //  m_AccountStr = "advtest1@1.com";
+        m_AccountStr = "jiajun.hu@ghz-tech.com";
+      //  m_AccountStr = "1768147286@qq.com";
+        m_AccountStr = "bactest1@1.com";
+       // m_AccountStr = "advtest1@1.com";
 #endif
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))
@@ -441,7 +441,6 @@ public class LoginPanel : BaseUI
                 Debug.Log(jobect["data"]["type"].ToString());
                StartCoroutine( LoginCallBack2YS(2));
                 UserInfo.Instance.is20 = true;
-                GameManager.Instance.IsRuning = true;
             }
             else if (int.Parse(jobect["data"]["type"].ToString()) == 1)
             {
@@ -640,7 +639,7 @@ public class LoginPanel : BaseUI
         //    if (mat.materialList != null)
         //    {
         //        for (int m = 0; m < mat.materialList.Count; m++)
-        //        {
+        //        {  
         //            var matObj = mat.materialList[m];
         //            if (int.Parse(matObj.type) != 4)
         //            {
@@ -760,8 +759,7 @@ public class LoginPanel : BaseUI
         }
 #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/Scripts/UI/SceneChoose.cs

@@ -311,7 +311,7 @@ public class SceneChoose : BaseUI
                 xml.type = "-2";
                 xml.downLoadPath = scene.vuforiaXML;
                 xml.updataTime = scene.updateTime;
-                xml.localLoadPath = Application.persistentDataPath + "/StreamingAssets/Vuforia/" + filename;
+                xml.localLoadPath = Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia." + filename.Split('.')[1];
                 // DownloadManager.Instance.AddDownloadData(xml);
                 DownloadResManager.Instance.DownLoad(xml);
 
@@ -321,7 +321,7 @@ public class SceneChoose : BaseUI
                 dat.type = "-2";
                 dat.downLoadPath = scene.vuforiaDat;
                 dat.updataTime = (int)scene.updateTime;
-                dat.localLoadPath = Application.persistentDataPath + "/StreamingAssets/Vuforia/" + filename2;
+                dat.localLoadPath = Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia." + filename2.Split('.')[1];
                 DownloadResManager.Instance.DownLoad(dat);
 
             }

ProjectSettings/ProjectSettings.asset

@@ -960,10 +960,10 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
+      Proximity: False
       InternetClient: True
       CodeGeneration: False
       BackgroundMediaPlayback: False
-      Proximity: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False