Merge branch 'F/0710_2.1+2.0' of https://gogs.ghz-tech.com:8843/GHzGlass/GHZMRNavigatorProXR into F/0710_2.1+2.0

# Conflicts:
#	Assets/2.0/Tools/DownLoadItem.cs

Assets/2.0/Tools/DownLoadItem.cs

@@ -245,12 +245,12 @@ public class DownLoadItem : MonoBehaviour
         data.downLoadPath = downLoadPath;
         data.localLoadPath = Application.persistentDataPath + "/Material/" + Path.GetFileName(downLoadPath);
         if(type == ModelType.vuforial)
-        {
-
-            Debug.Log("downLoadPath===>" + downLoadPath);
             data.localLoadPath = Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia." + downLoadPath.Split('.')[1];
-        }
-        data.updataTime = 0;
+  
+        if(UserInfo.Instance.is20)
+            data.updataTime = long.Parse( GameManager.Instance.m_scene.updateTime);
+        else
+            data.updataTime = GameManager.Instance.SceneValue.updateTime;
         data.type = ((int)type).ToString();
 
         

Assets/2.0/User/UserScene/UserSceneManager.cs

@@ -68,6 +68,7 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
     void CreateItem(JsonData msg,string id)
     {
      //   JsonConvert.DeserializeObject<UserSceneItem>(msg.ToJson());
+
         UserSceneItem usi = new UserSceneItem();//
         usi.id = id;
         usi.name = msg["name"].ToString();
@@ -87,7 +88,7 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
             usi.map = msg["map"].ToString();
         if (msg["sandTable"] != null)
             usi.sandTable = msg["sandTable"].ToString();
-
+        GameManager.Instance.m_scene = usi;
         if (msg["listSpoit"] != null)
         {
             if(msg["listSpoit"].IsArray)
@@ -151,7 +152,7 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
         //  usi.vufroiaTrigger.init(msg);
         usi.vufroiaTrigger.msg = msg;
         usi.vufroiaTrigger.usi = usi;
-
+      
         SceneList.Add(usi.id, usi);
         Debug.Log("UI   Data   添加场景===>"+ usi.id);
         now++;

Assets/Scripts/UI/GameManager.cs

@@ -155,6 +155,11 @@ public class GameManager : MonoSingleton<GameManager>
         set { m_SpoitIndex = value; }
     }
 
+    /// <summary>
+    ///  2.0  场景数据
+    /// </summary>
+    public UserSceneItem m_scene;
+
     /// <summary>
     /// 当前场景数据
     /// </summary>

ProjectSettings/ProjectSettings.asset

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