修改 加载模块

Assets/2.0/Resources/Template/Prefab/Video.prefab

@@ -2181,8 +2181,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c7d817848393db44c8e1668eb60b40d8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Icon: {fileID: 7783334408191734234}
-  m_IsPlaying: 0
 --- !u!114 &1721331326262511666
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2215,7 +2213,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8554676593696482102
 Transform:
   m_ObjectHideFlags: 0
@@ -2298,7 +2296,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8554676594980255613
 Transform:
   m_ObjectHideFlags: 0
@@ -2382,7 +2380,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7230691857059115727
 RectTransform:
   m_ObjectHideFlags: 0

Assets/2.0/Tools/DownLoadItem.cs

@@ -244,8 +244,12 @@ public class DownLoadItem : MonoBehaviour
         DownLoadMaterial data = new DownLoadMaterial();
         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.updataTime = 0;
-        data.type = type.ToString();
+        data.type = ((int)type).ToString();
+
+        
 
         Debug.LogError("DownloadFileMsg");
         DownloadResManager.Instance.DownLoad(data);

Assets/2.0/Tools/LoadManager.cs

@@ -15,7 +15,7 @@ public class LoadManager : Singleton<LoadManager>
             if (downloadQueueList.Count>0&& nowLoad< maxLoad)
             {
                 int ct = downloadQueueList.Count;
-                Debug.LogError("  downloadQueueList =====>   " + ct);
+           //     Debug.LogError("  downloadQueueList =====>   " + ct);
                 for (int i = 0; i < ct; i++)
                 {
                     DownLoadItem item = downloadQueueList.Dequeue();
@@ -109,7 +109,7 @@ public class LoadManager : Singleton<LoadManager>
 
         GameObject xmlFileDownObj = new GameObject("VufroiaTriggerDownLoad_xmlFile");
         DownLoadItem xmlFileItem = xmlFileDownObj.AddComponent<DownLoadItem>();
-        xmlFileItem.Init(xmlFile, "VufroiaTriggerDownLoad_xmlFile",ModelType.Text);
+        xmlFileItem.Init(xmlFile, "VufroiaTriggerDownLoad_xmlFile",ModelType.vuforial);
 
         xmlFileItem.onProgress += (float f) => {
 
@@ -129,7 +129,7 @@ public class LoadManager : Singleton<LoadManager>
 
         GameObject datFileObj = new GameObject("VufroiaTriggerDownLoad_datFile");
         DownLoadItem datFileItem = datFileObj.AddComponent<DownLoadItem>();
-        datFileItem.Init(datFile, "VufroiaTriggerDownLoad_xmlFile",ModelType.Text);
+        datFileItem.Init(datFile, "VufroiaTriggerDownLoad_xmlFile",ModelType.vuforial);
 
         datFileItem.onProgress += (float f) => {
 

Assets/2.0/User/Model/ModelItem.cs

@@ -11,7 +11,9 @@ public enum ModelType
 
     ABModel,
 
-    Text
+    Text,
+    scene = -1,
+    vuforial = -2,
 
 }
 public class ModelItem 
@@ -45,7 +47,7 @@ public class ModelItem
     public void init()
     {
         Debug.LogError("ModelItem Init");
-       // if (modelType != ModelType.Video)
+       if (modelType != ModelType.Text)
             LoadManager.Instance.load(this, (float f) =>
             {
 

Assets/2.0/User/Trigger/VufroiaTrigger.cs

@@ -43,7 +43,7 @@ public class VufroiaTrigger
     IEnumerator loadVuforia()
     {
 
-        Debug.Log("¼ÓÔØDatabase");
+        Debug.Log("加载Database");
         IEnumerable<ObserverBehaviour> observer = VuforiaBehaviour.Instance.ObserverFactory.CreateBehavioursFromDatabase(LoaclxmlFile);
         // Create an Image Target from the database.
         yield return observer;
@@ -63,5 +63,8 @@ public class VufroiaTrigger
                 usi.SpotsList[item].setObVuforia(list[count]);
             count++;
         }
+
+        UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
+        UserSceneUI.Instance.obj.GetComponent<UserChooseScene>().st.SetActive(true);
     }
 }

Assets/2.0/User/UserScene/UserSceneManager.cs

@@ -115,6 +115,7 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
                             if(ModelManager.Instance.modellist.ContainsKey(int.Parse(msg["listSpoit"][i]["material"][j]["id"].ToString())))
                             {
                                 ModelList modellist = ModelManager.Instance.GetModelList(int.Parse(msg["listSpoit"][i]["material"][j]["id"].ToString()));
+                                Debug.Log("DGJ   ====> " +(msg["listSpoit"][i]["material"][j]["objectTransform"].ToJson()));
                                 modellist.objectTransform = JsonConvert.DeserializeObject<ObjectTransform>(msg["listSpoit"][i]["material"][j]["objectTransform"].ToJson());
                            
                                 modellist.spotsItem = si;

Assets/COSScripts/COSDownLoad.cs

@@ -163,6 +163,7 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
         TransferManager transferManager;  // 初始化 TransferManager
         String bucket; //存储桶，格式：BucketName-APPID
 
+
         Debug.Log("Hjj   TransferDownloadObject===>"+ downloadMaterial.type);
         switch (downloadMaterial.type)
         {
@@ -174,6 +175,7 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
                 transferManager = new TransferManager(imageCosXml, transferConfig);
                 bucket = imageSuccessCos.bucket;
                 break;
+           
 
             default:
                 transferManager = new TransferManager(materialCosXml, transferConfig);
@@ -197,10 +199,10 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
         //downloadTask.SetMaxTasks(10);
         downloadTask.progressCallback = delegate (long completed, long total)
         {
-            Debug.Log(String.Format("Hjj    download"+downloadMaterial.downLoadPath+"progress = {0:##.##}%", completed * 100.0 / total));
+          //  Debug.Log(String.Format("Hjj    download"+downloadMaterial.downLoadPath+"progress = {0:##.##}%", completed * 100.0 / total));
             showDownLoadPre = completed * 100.0f / total;
         };
-        Debug.Log(downloadMaterial.downLoadPath);
+        Debug.Log(downloadMaterial.downLoadPath +"|||||||||  DGJ");
         downloadTask.onState += OnState;
         listDownLoadTask.Add(downloadTask);
         try
@@ -295,28 +297,6 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
         }
     }
 
-    public  string GetVideoUrl(DownloadManager downloadMaterial)
-    {
-
-        try
-        {
-            string requestURL =  materialCosXml.GetObjectUrl(materialSuccessCos.bucket, downloadMaterial.LocaDataPath);
-            return requestURL;
-        }
-        catch (COSXML.CosException.CosClientException clientEx)
-        {
-            //请求失败
-
-            return null;
-        }
-        catch (COSXML.CosException.CosServerException serverEx)
-        {
-            //请求失败
-            return null;
-        }
-
-
-    }
     public Queue<TaskState> taskQueue = new Queue<TaskState>();
     private void OnState(TaskState state)
     {

Assets/COSScripts/DownloadResManager.cs

@@ -24,9 +24,13 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
     public List<DownLoadMaterial> listFaildMaterial;
 
     public Queue<DownLoadMaterial> qDownload;
+
+  //  private Queue<DownLoadMaterial> orderDownload;
     private int maxDownLoad = 1;
     private int nowDownLoad = 0;
     private string path;
+
+    private bool state = false;
     // Start is called before the first frame update
     void Start()
     {
@@ -35,14 +39,15 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
         listFaildMaterial = new List<DownLoadMaterial>();
         qDownload = new Queue<DownLoadMaterial>();
         //先判断是否存在，再创建
-        if (!File.Exists(path))
+        if (!File.Exists(path + "CompletedMaterial.txt"))
         {
-            Directory.CreateDirectory(path);
+            Directory.CreateDirectory(Application.persistentDataPath + "/Material");
         }
         else
         {
-            string msg = File.ReadAllText(path + "/CompletedMaterial.txt");
-            listCompletedMaterial = JsonConvert.DeserializeObject<List<DownLoadMaterial>>(msg);
+            string msg = File.ReadAllText(path + "CompletedMaterial.txt");
+            Debug.Log("DGJ  CompletedMaterial ==>" + msg);
+           // listCompletedMaterial = JsonConvert.DeserializeObject<List<DownLoadMaterial>>(msg);
         }
         if (listCompletedMaterial == null)
             listCompletedMaterial = new List<DownLoadMaterial>();
@@ -54,7 +59,7 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
                 listCompletedMaterial.RemoveAt(i);
             }
         }
-        StartCoroutine(DownLoad());
+       // StartCoroutine(DownLoadFile());
     }
 
     /// <summary>
@@ -83,6 +88,8 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
         //List<DownLoadMaterial> list = new List<DownLoadMaterial>();
         //list.Add(downloadMaterial);
         // COSDownLoad.Instance.TransferBatchDownloadObjects(list, path);
+        if(downloadMaterial.type=="-9")
+            LocalLoadManager.Instance.LocalLoadMaterial(downloadMaterial);
 
         if (Screen(downloadMaterial) == false)
         {
@@ -98,31 +105,50 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
 
     public void StartDownLoad()
     {
-       // StartCoroutine(DownLoad());
+        Debug.Log("DGJ  ====> StartDownLoad ");
+        StartCoroutine(DownLoadFile());
+       // state = true;
     }
 
-    private IEnumerator DownLoad()
+    private IEnumerator DownLoadFile()
     {
-      
+        Debug.Log("DGJ  ====> DownLoadFile ");
 
-        while(true)
+        while (true)
         {
+
             yield return new WaitForFixedUpdate();
-            if (qDownload.Count>0 && nowDownLoad<maxDownLoad)
+            Debug.Log("DGJ  ====> DownLoadFile 2");
+            if (qDownload.Count > 0 && nowDownLoad < maxDownLoad)
             {
                 nowDownLoad++;
                 COSDownLoad.Instance.TransferDownloadObject(qDownload.Dequeue(), path);
             }
+
         }
 
     }
 
-    /// <summary>
-    /// 检测
-    /// </summary>
-    /// <param name="downloadMaterial"></param>
-    /// <returns></returns>
-    private bool Screen(DownLoadMaterial downloadMaterial)
+    private IEnumerator DownLoadOK()
+    {
+        if (qDownload.Count <= 0 )
+        {
+           // SaveLocaData();
+            //loadUI.ProgressStr = "";
+            UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.updateEnd);
+            yield break;
+        }
+      //  loadUI.ProgressStr = ((float)(m_Downloaded.Count + m_FiledDownload.Count) / count).ToString("P");
+        yield return null;
+    }
+     
+
+/// <summary>
+/// 检测
+/// </summary>
+/// <param name="downloadMaterial"></param>
+/// <returns></returns>
+private bool Screen(DownLoadMaterial downloadMaterial)
     {
        bool  finish = false;
         for (int j = 0; j < listCompletedMaterial.Count; j++)
@@ -162,6 +188,7 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
                 listCompletedMaterial.Add(listNotMaterial[i]);
                 LocalLoadManager.Instance.LocalLoadMaterial(listNotMaterial[i]);
                 listNotMaterial.RemoveAt(i);
+                Save();
                 break;
             }
         }
@@ -180,25 +207,31 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
             if (Path.GetFileName(listNotMaterial[i].downLoadPath) == localFilePath)
             {
                 listFaildMaterial.Add(listNotMaterial[i]);
-                MsgHandler.SendMsg(listNotMaterial[i].downLoadPath, null);
+                MsgHandler.SendMsg(listNotMaterial[i].downLoadPath, new Msg(listNotMaterial[i].downLoadPath,null));
                 listNotMaterial.RemoveAt(i);
+                Save();
                 break;
             }
         }
     }
 
     private void OnDisable()
+    {
+        Save();
+    }
+
+    private void Save()
     {
         string msg = JsonConvert.SerializeObject(listCompletedMaterial);
-        Debug.Log(msg);
-        System.IO.Directory.CreateDirectory(path);
-       // string NowTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss").Replace(" ", "_").Replace("/", "_").Replace(":", "_");
-        Debug.Log(path);
+       // Debug.Log(msg);
+        //  System.IO.Directory.CreateDirectory(path);
+        // string NowTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss").Replace(" ", "_").Replace("/", "_").Replace(":", "_");
+        Debug.Log("DGJ   =====》 保存 "+ msg);
         using (System.IO.StreamWriter writer = System.IO.File.CreateText(path + "CompletedMaterial.txt"))
         {
             writer.Write(msg);
             //writer.
-        }  
+        }
     }
 }
 

Assets/COSScripts/LocalLoadManager.cs

@@ -1,5 +1,7 @@
+using LitJson;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using UnityEngine;
 using UnityEngine.Networking;
 
@@ -18,16 +20,17 @@ public class LocalLoadManager : MonoSingleton<LocalLoadManager>
     public void LocalLoadMaterial(DownLoadMaterial downloadMaterial)
     {
 
-        Debug.Log("Hjj   LocalLoadMaterial :" + downloadMaterial.localLoadPath + "    " + downloadMaterial.type);
+        //Debug.Log("Hjj   LocalLoadMaterial :" + downloadMaterial.localLoadPath + "    " + downloadMaterial.type);
         if (dicLoaclData.ContainsKey(downloadMaterial.downLoadPath))
         {
-            Debug.Log("Hjj   LocalLoadMaterial 1 :" + downloadMaterial.localLoadPath + "    ");
+         //   Debug.Log("Hjj   LocalLoadMaterial 1 :" + downloadMaterial.localLoadPath + "    ");
             MsgHandler.SendMsg(downloadMaterial.downLoadPath, new Msg(downloadMaterial.downLoadPath, dicLoaclData[downloadMaterial.downLoadPath]));
         }
         else
         {
-            Debug.Log("Hjj   LocalLoadMaterial 2 :" + downloadMaterial.localLoadPath + "    ");
-            StartCoroutine(DownloadFile(downloadMaterial));
+          //  Debug.Log("Hjj   LocalLoadMaterial 2 :" + downloadMaterial.localLoadPath + "    ");
+           // StartCoroutine(DownloadFile(downloadMaterial));
+            StartCoroutine(DownloadFileIO(downloadMaterial));
         }
     }
 
@@ -77,4 +80,47 @@ public class LocalLoadManager : MonoSingleton<LocalLoadManager>
         }
 
     }
+
+
+    /// <summary>
+    /// 读取本地数据
+    /// </summary>
+    private void ReadLocaData(DownLoadMaterial downloadMaterial)
+    {
+       
+    }
+
+    IEnumerator DownloadFileIO(DownLoadMaterial downloadMaterial)
+    {
+
+        if (!File.Exists(downloadMaterial.localLoadPath))
+        {
+            Debug.Log("DGJ  ====》 文件不存在 " + downloadMaterial.localLoadPath);
+            MsgHandler.SendMsg(downloadMaterial.downLoadPath, new Msg(downloadMaterial.downLoadPath, null));
+        }
+        else
+        {
+            using (FileStream fs = new FileStream(downloadMaterial.localLoadPath, FileMode.Open))
+            {
+                long fileSize = new FileInfo(downloadMaterial.localLoadPath).Length;
+
+                byte[] buffer = new byte[fileSize]; // 设置一个读取缓冲区
+
+                int bytesRead;
+                while ((bytesRead = fs.Read(buffer, 0, buffer.Length)) > 0)
+                {
+                    // 在这里处理读取到的数据
+                    // Console.WriteLine("Read " + bytesRead + " bytes.");
+                }
+
+                yield return bytesRead == 0;
+                dicLoaclData.Add(downloadMaterial.downLoadPath, buffer);
+                // isDownLoad = true;
+                MsgHandler.SendMsg(downloadMaterial.downLoadPath, new Msg(downloadMaterial.downLoadPath, buffer));
+
+            }
+        }
+          
+    }
+
 }

Assets/ImmersalSDK/Core/Scripts/AR/ARMap.cs

@@ -1,4 +1,4 @@
-/*===============================================================================
+/*===============================================================================
 Copyright (C) 2022 Immersal - Part of Hexagon. All Rights Reserved.
 
 This file is part of the Immersal SDK.
@@ -347,8 +347,8 @@ namespace Immersal.AR
                 //TextAsset textAsset = new TextAsset(System.Text.Encoding.UTF8.GetString(bytesArray));
 
                 //mapFile = Resources.Load<TextAsset>("Map Data/81060-0515GHz");
-                byte[] s = File.ReadAllBytes(Application.persistentDataPath + "/Map Data/" + e.fileName);
-                await LoadMap(s);
+              //  byte[] s = File.ReadAllBytes(Application.persistentDataPath + "/Map Data/" + e.fileName);
+                await LoadMap(e.bytes);
                 this.GetComponent<ARMap>().enabled = true;
                 this.SendCommand(new StartImmersalLocalizerCommand());
             });

Assets/MRNavigatorPro.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -2202,7 +2202,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 769211957}
+  m_Mesh: {fileID: 2145807336}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2739,6 +2739,7 @@ MonoBehaviour:
   immser: {fileID: 1327983565}
   m_IsRuning: 0
   m_UIAnchorsPanel: {fileID: 1180406930700069014}
+  isShowDownTip: 0
 --- !u!4 &588301977
 Transform:
   m_ObjectHideFlags: 0
@@ -3537,170 +3538,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   RouteItem: {fileID: 275096928}
   m_CalMap: {fileID: 210725852}
---- !u!43 &769211957
-Mesh:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 10
-  m_SubMeshes:
-  - serializedVersion: 2
-    firstByte: 0
-    indexCount: 0
-    topology: 5
-    baseVertex: 0
-    firstVertex: 0
-    vertexCount: 0
-    localAABB:
-      m_Center: {x: 0, y: 0, z: 0}
-      m_Extent: {x: 0, y: 0, z: 0}
-  m_Shapes:
-    vertices: []
-    shapes: []
-    channels: []
-    fullWeights: []
-  m_BindPose: []
-  m_BoneNameHashes: 
-  m_RootBoneNameHash: 0
-  m_BonesAABB: []
-  m_VariableBoneCountWeights:
-    m_Data: 
-  m_MeshCompression: 0
-  m_IsReadable: 1
-  m_KeepVertices: 0
-  m_KeepIndices: 0
-  m_IndexFormat: 1
-  m_IndexBuffer: 
-  m_VertexData:
-    serializedVersion: 3
-    m_VertexCount: 0
-    m_Channels:
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    m_DataSize: 0
-    _typelessdata: 
-  m_CompressedMesh:
-    m_Vertices:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UV:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Normals:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Tangents:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Weights:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_NormalSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_TangentSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_FloatColors:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_BoneIndices:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Triangles:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UVInfo: 0
-  m_LocalAABB:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
-  m_MeshUsageFlags: 0
-  m_BakedConvexCollisionMesh: 
-  m_BakedTriangleCollisionMesh: 
-  m_MeshMetrics[0]: 1
-  m_MeshMetrics[1]: 1
-  m_MeshOptimizationFlags: 1
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
 --- !u!114 &783368682 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 6404663699496963397, guid: 6693e68f506a6c944b1783fb7e52a498,
@@ -6643,7 +6480,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0051131058
+      value: -0.0051227747
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6773,37 +6610,37 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0018952474
+      value: -0.0019149864
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -101.5
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714058937656, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6813,62 +6650,62 @@ PrefabInstance:
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -35.5
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -35.5
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3e8996c442fe40541beb734ca45f2bf6, type: 3}
@@ -9742,6 +9579,170 @@ Transform:
   m_Father: {fileID: 210725851}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!43 &2145807336
+Mesh:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 10
+  m_SubMeshes:
+  - serializedVersion: 2
+    firstByte: 0
+    indexCount: 0
+    topology: 5
+    baseVertex: 0
+    firstVertex: 0
+    vertexCount: 0
+    localAABB:
+      m_Center: {x: 0, y: 0, z: 0}
+      m_Extent: {x: 0, y: 0, z: 0}
+  m_Shapes:
+    vertices: []
+    shapes: []
+    channels: []
+    fullWeights: []
+  m_BindPose: []
+  m_BoneNameHashes: 
+  m_RootBoneNameHash: 0
+  m_BonesAABB: []
+  m_VariableBoneCountWeights:
+    m_Data: 
+  m_MeshCompression: 0
+  m_IsReadable: 1
+  m_KeepVertices: 0
+  m_KeepIndices: 0
+  m_IndexFormat: 1
+  m_IndexBuffer: 
+  m_VertexData:
+    serializedVersion: 3
+    m_VertexCount: 0
+    m_Channels:
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    m_DataSize: 0
+    _typelessdata: 
+  m_CompressedMesh:
+    m_Vertices:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UV:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Normals:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Tangents:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Weights:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_NormalSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_TangentSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_FloatColors:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_BoneIndices:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Triangles:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UVInfo: 0
+  m_LocalAABB:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
+  m_MeshUsageFlags: 0
+  m_BakedConvexCollisionMesh: 
+  m_BakedTriangleCollisionMesh: 
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 1
+  m_MeshOptimizationFlags: 1
+  m_StreamData:
+    serializedVersion: 2
+    offset: 0
+    size: 0
+    path: 
 --- !u!114 &133946727104219357
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -9916,7 +9917,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.0005653854
+      value: -0.0012644395
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -13762,7 +13763,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.0051230555}
+  m_AnchoredPosition: {x: 0, y: -0.0051430142}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Assets/Resources/Template/Prefab/Video.prefab

@@ -2229,7 +2229,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8554676593696482102
 Transform:
   m_ObjectHideFlags: 0
@@ -2312,7 +2312,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8554676594980255613
 Transform:
   m_ObjectHideFlags: 0
@@ -2396,7 +2396,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7230691857059115727
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Resources/UI/LoginPanel.prefab

@@ -111,8 +111,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -155, y: 2}
-  m_SizeDelta: {x: -73.7822, y: 19.680033}
+  m_AnchoredPosition: {x: -58.849976, y: 2}
+  m_SizeDelta: {x: 442.4872, y: 19.68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6849887845183846663
 CanvasRenderer:
@@ -592,8 +592,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -151.89998, y: -0.49998474}
-  m_SizeDelta: {x: 570.324, y: 87.3}
+  m_AnchoredPosition: {x: -48.277664, y: -0.49998474}
+  m_SizeDelta: {x: 1126.7148, y: 87.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7274417172833375389
 CanvasRenderer:
@@ -672,8 +672,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -155, y: 2}
-  m_SizeDelta: {x: -73.7822, y: 19.680033}
+  m_AnchoredPosition: {x: -58.849976, y: 2}
+  m_SizeDelta: {x: 442.4872, y: 19.68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4375368535877485930
 CanvasRenderer:
@@ -4031,8 +4031,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -151.9, y: -0.49998474}
-  m_SizeDelta: {x: 570.324, y: 87.3}
+  m_AnchoredPosition: {x: -48.2778, y: -0.49998474}
+  m_SizeDelta: {x: 1126.7148, y: 87.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4329891549141700274
 CanvasRenderer:

Assets/Resources/VuforiaConfiguration.asset

@@ -49,4 +49,4 @@ MonoBehaviour:
   webcam:
     renderTextureLayer: 30
   packageInformation:
-    ARFoundationVersion: 
+    ARFoundationVersion: 4.2.7

Assets/Scripts/Blue/Command/PointFileGetUrlCommand.cs

@@ -32,6 +32,7 @@ public class PointFileGetUrlCommand : ICommand
     string PointName;
     private void GetPointFileUrlSuccess(string message)
     {
+        Debug.Log(message);
         if (!string.IsNullOrWhiteSpace(message))
         {
             JObject jobject = JObject.Parse(message);
@@ -52,20 +53,23 @@ public class PointFileGetUrlCommand : ICommand
                     }
 
                     PointName = dataJ["data"]["bytesFile"]["name"].ToString() + "." + dataJ["data"]["bytesFile"]["ext"].ToString();
-                    DownLoadMaterial data = new DownLoadMaterial();
-                    data.downLoadPath = downLoadPath;
-                    data.localLoadPath = Application.persistentDataPath + "/Map Data/" + dataJ["data"]["bytesFile"]["name"].ToString()+"." + dataJ["data"]["bytesFile"]["ext"].ToString(); //Application.persistentDataPath + "/Material/" + Path.GetFileName(value.DownloadPath);
-                Debug.Log("DGJ    byte   "+data.localLoadPath);
-                    data.updataTime = 0;// GameManager.Instance.m_SceneValue.updateTime;
-                    data.type = "-1";
-                    MsgHandler.AddListener(downLoadPath, HandleMsg);
+                 
+                //  Debug.Log(" SetData " + updateTime);
 
-                    DownloadResManager.Instance.DownLoad(data);
-                  //  Debug.Log(" SetData " + updateTime);
+              //  PointFileData PointFile = JsonConvert.DeserializeObject<PointFileData>(message);
 
-                //    PointFileData PointFile = JsonConvert.DeserializeObject<PointFileData>(message);
+              //  this.GetService<IPointService>().DownloadPointFile(PointFile.url, fileType);
 
-                   //  this.GetService<IPointService>().DownloadPointFile(PointFile.url, fileType);
+
+                DownLoadMaterial data = new DownLoadMaterial();
+                data.downLoadPath = downLoadPath;
+                data.localLoadPath = Application.persistentDataPath + "/Map Data/" + Path.GetFileName(downLoadPath);
+                Debug.Log("DGJ    byte   " + data.downLoadPath);
+                data.updataTime = 0;// GameManager.Instance.m_SceneValue.updateTime;
+                data.type = "-1";
+                MsgHandler.AddListener(downLoadPath, HandleMsg);
+
+                DownloadResManager.Instance.DownLoad(data);
             }
         }
     }
@@ -75,6 +79,6 @@ public class PointFileGetUrlCommand : ICommand
 
       if(msg.Value!=null)
         if (fileType == PointFileType.bytes)
-            this.SendEvent(new LoadMapFileEvent() { fileName = PointName });
+            this.SendEvent(new LoadMapFileEvent() { fileName = PointName ,bytes = (byte[])msg.Value});
     }
 }

Assets/Scripts/Blue/Controller/LoadReference.cs

@@ -18,6 +18,8 @@ public class LoadReference : AbstractController
 
     private void GetObjOfRefrencePosRotSuccess(GetReferencePosEvent e)
     {
+
+        Debug.Log("DGJ GetObjOfRefrencePosRotSuccess ===>  " + e.PosRot.x + "  " + e.PosRot.y + "  " + e.PosRot.z) ;
         bool_GetReferencePosEvent = true;
         pos = new Vector3(e.PosRot.x, e.PosRot.y, e.PosRot.z);
 
@@ -28,6 +30,7 @@ public class LoadReference : AbstractController
     }
     private void InitEventSuccess(InitEvent e)
     {
+        Debug.Log("DGJ InitEventSuccess ===>  ");
         bool_InitEvent = true;
         if(bool_GetReferencePosEvent && bool_InitEvent)
         {

Assets/Scripts/Blue/Event/LoadMapFileEvent.cs

@@ -6,4 +6,6 @@ using Blue;
 public class LoadMapFileEvent : IEvent
 {
     public string fileName;
+
+    public byte[] bytes;
 }

Assets/Scripts/Blue/ScriptableObject/BlueObject.cs

@@ -8,4 +8,5 @@ public class BlueObject : ScriptableObject
     public string NetErrorText;
     public string SuccessText;
     public GameObject SpoitName;
+    public string DGJ;
 }

Assets/Scripts/Blue/ScriptableObject/PrefabsAsset.asset

@@ -18,3 +18,4 @@ MonoBehaviour:
   SuccessText: "\u4FDD\u5B58\u6210\u529F"
   SpoitName: {fileID: 8948373300025855900, guid: 72554938046c0d249b1bed4c59fb8d71,
     type: 3}
+  DGJ: "\u6A21\u578B\u4E0B\u8F7D\u5931\u8D25"

Assets/Scripts/Blue/Service/IMinMapService.cs

@@ -68,7 +68,7 @@ public class MinMapService : IMinMapService
                         if (!string.IsNullOrWhiteSpace(message))
                         {
                             GetUserInfo getUserInfo =  JsonConvert.DeserializeObject<GetUserInfo>(message);
-                            //Debug.LogError("值："+getUserInfo.minMap);
+                            Debug.LogError("CY  值："+getUserInfo.minMap);
                             setMinMap.Value = getUserInfo.minMap;
                         }
                     }

Assets/Scripts/Blue/Service/IPointService.cs

@@ -178,24 +178,33 @@ public class PointService : IPointService
             webRequest.SetRequestHeader("Content-Type", "application/json;charset=utf-8");
             webRequest.SetRequestHeader("authorization", UserInfo.Instance.Token);
 
+            Debug.LogError("DGJ  Post  GetObjectOfRefrence");
+
             yield return webRequest.SendWebRequest();
 
             if (webRequest.result== UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
                 Debug.LogError("UnityWebRequest Error:"+webRequest.downloadHandler.text);
             else
             {
+
+                Debug.LogError("DGJ  Post  GetObjectOfRefrenceelse");
                 if (!string.IsNullOrWhiteSpace(webRequest.downloadHandler.text))
                 {
                     string message = webRequest.downloadHandler.text;
                     JObject jobject = JObject.Parse(message);
                     if (jobject["code"].ToString() == "200")
                     {
-                        message = jobject["data"].ToString();
+                        message = jobject["data"]["position"].ToString();
                         if (!string.IsNullOrWhiteSpace(message))
                         {
-                            // Debug.LogError("message:"+message);
+                             Debug.LogError("DGJ  Post  message:"+message);
                             ScenePosRotInfo ScenePosRotInfoList = JsonConvert.DeserializeObject<ScenePosRotInfo>(message);
                             PosRot = ScenePosRotInfoList;
+
+                            PosRot.x = (float)PosRot.x / GameManager.Instance.WebMapSize.x * GameManager.Instance.MapSize.x;                   
+                            PosRot.z = (GameManager.Instance.WebMapSize.y - (float)PosRot.y) / GameManager.Instance.WebMapSize.y * GameManager.Instance.MapSize.y;
+                            PosRot.y = -1;
+                            //   Vector3  PosRot2 = new Vector3((float)PosRot.x / GameManager.Instance.WebMapSize.x * GameManager.Instance.MapSize.x, -1f, );
                             this.SendEvent(new GetReferencePosEvent() { PosRot = PosRot });
                         }
                     }

Assets/Scripts/Blue/Service/IUpOrDownloadService.cs

@@ -81,7 +81,9 @@ public class UpOrDownloadService : IUpOrDownloadService
                             if(ScenePosRotInfoList[0].x==0 && ScenePosRotInfoList[0].y == 0 && ScenePosRotInfoList[0].z == 0&& ScenePosRotInfoList[1].x == 0 && ScenePosRotInfoList[1].y == 0 && ScenePosRotInfoList[1].z == 0)
                             {
 
-                            }else
+                                CommandSystem.Instance.Send(new InitSuccessCommand());
+                            }
+                            else
                             {
 
                                 Debug.Log("Hjj   message=1==>" + ScenePosRotInfoList[0].x);

Assets/Scripts/LayoutTemplate/TemplateImage.cs

@@ -58,22 +58,33 @@ public class TemplateImage : BaseTemPlate
         else
         {
             // DownloadManager.Instance.GetImage(Data, m_Image);
-            DownLoadMaterial data = new DownLoadMaterial();
-            data.downLoadPath = value.DownloadPath;
-            data.localLoadPath = Application.persistentDataPath + "/Material/" + Path.GetFileName(value.DownloadPath);
-            data.updataTime = GameManager.Instance.m_SceneValue.updateTime;
-            data.type = "1";
-            MsgHandler.AddListener(data.downLoadPath, HandleMsg);
-            DownloadResManager.Instance.DownLoad(data);
+          
         }
+
+        DownLoadMaterial data = new DownLoadMaterial();
+        data.downLoadPath = value.DownloadPath;
+        data.localLoadPath = Application.persistentDataPath + "/Material/" + Path.GetFileName(value.DownloadPath);
+        data.updataTime = GameManager.Instance.m_SceneValue.updateTime;
+        data.type = "1";
+        MsgHandler.AddListener(data.downLoadPath, HandleMsg);
+        DownloadResManager.Instance.DownLoad(data);
+        if (Data == null)
+            Data = data;
     }
 
     private void HandleMsg(Msg msg)
     {
-        Texture2D texture = new Texture2D(1, 1);
-        texture.LoadImage((byte[])msg.Value);
-        Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.one * 0.5f);
-        m_Image.sprite = sprite;
+        if(msg.Value!=null)
+        {
+            Texture2D texture = new Texture2D(1, 1);
+            texture.LoadImage((byte[])msg.Value);
+            Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.one * 0.5f);
+            m_Image.sprite = sprite;
+        }
+        else
+        {
+            Debug.LogError("DGJ  Image  下载失败  ：" + Data.downLoadPath);
+        }
     }
 
     public void SetLocaImageData(MaterialObjValue value)

Assets/Scripts/LayoutTemplate/TemplateModel.cs

@@ -2,6 +2,7 @@ using SC.XR.Unity.Module_InputSystem;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using TriLibCore;
 using UnityEngine;
 
 public class TemplateModel : BaseTemPlate
@@ -19,7 +20,7 @@ public class TemplateModel : BaseTemPlate
         if (GameManager.Instance.IsRuning && m_ModelObj == null)
         {
             //Debug.Log(Data.name);
-            //Debug.Log(Data.localSavePath);
+            Debug.Log("DGJ ==>>   "+Data.localLoadPath);
             AssetBundle ab = AssetBundle.LoadFromFile(Data.localLoadPath);
             if (ab == null)
             {
@@ -169,7 +170,7 @@ public class TemplateModel : BaseTemPlate
         //    Destroy(gameObject.GetComponent<Collider>());
         //}
         //下载列表中加入数据
-        if (!GameManager.Instance.IsRuning)
+        if (!GameManager.Instance.IsRuning|| Data == null)
         {
          //   DownloadManager.Instance.AddDownloadData(Data);
 
@@ -182,21 +183,27 @@ public class TemplateModel : BaseTemPlate
             MsgHandler.AddListener(value.DownloadPath, HandleMsg);
             DownloadResManager.Instance.DownLoad(data);
             Debug.Log(" SetData " + updateTime);
+            this.Data = data;
         }
         else
         {
-            AssetBundle ab = AssetBundle.LoadFromFile(Data.localLoadPath);
-            if (ab == null)
-            {
-                Debug.Log("Failed to load AssetBundle!");
-                return;
-            }
-            var prefab = ab.LoadAsset<GameObject>(ab.LoadAllAssets<GameObject>()[0].name);
-            m_ModelObj = Instantiate(prefab, transform);
-            ab.Unload(false);
 
-            gameObject.AddComponent<ManipulationHandler>();
-            gameObject.AddComponent<BoundingBox>();
+            if (IsAB())
+                LoadABModel();
+            else
+                TriLibModel();
+            //AssetBundle ab = AssetBundle.LoadFromFile(Data.localLoadPath);
+            //if (ab == null)
+            //{
+            //    Debug.Log("Failed to load AssetBundle!");
+            //    return;
+            //}
+            //var prefab = ab.LoadAsset<GameObject>(ab.LoadAllAssets<GameObject>()[0].name);
+            //m_ModelObj = Instantiate(prefab, transform);
+            //ab.Unload(false);
+
+            //gameObject.AddComponent<ManipulationHandler>();
+            //gameObject.AddComponent<BoundingBox>();
             //var obj = DownloadManager.Instance.GetAbObj(Util.MD5Encrypt(Data.downloadPath));
             //if (obj != null)
             //{
@@ -204,10 +211,49 @@ public class TemplateModel : BaseTemPlate
             //    m_ModelObj.transform.localPosition = Vector3.zero;
             //    m_ModelObj.gameObject.SetActive(true);
             //}
+
         }
+       
     }
 
     private void HandleMsg(Msg msg)
+    {
+        Debug.Log("DGJ   TemplateModel ");
+
+        if(msg.Value!=null)
+        {
+            if (IsAB())
+                LoadABModel();
+            else
+                TriLibModel();
+        }
+        else
+        {
+            InstantiateCommand Command = new InstantiateCommand(
+               InstantiateSystem.Instance.BlueObject.WarningPopUp,
+               InstantiateSystem.Instance.BlueObject.NetErrorText);
+            CommandSystem.Instance.Send(Command);
+            Debug.LogError("  模型下载失败 ");
+        }
+
+
+    }
+
+    private bool IsAB()
+    {
+        bool finish = false;
+
+        string fileName = Path.GetFileName(Data.localLoadPath);
+
+        if(fileName.Contains(".ghb") ||!fileName.Contains("."))
+        {
+            finish = true;
+        }
+
+        return finish;
+    }
+
+    private void LoadABModel()
     {
         AssetBundle ab = AssetBundle.LoadFromFile(Data.localLoadPath);
         if (ab == null)
@@ -223,6 +269,27 @@ public class TemplateModel : BaseTemPlate
         gameObject.AddComponent<BoundingBox>();
     }
 
+    private void TriLibModel()
+    {
+
+        TriLibModelLoad.Load(Data.localLoadPath, (AssetLoaderContext ac) => {
+            Debug.Log("模型加载完成");
+        }, (AssetLoaderContext ac) => {
+            Debug.Log("载材质加完成");
+          //  ac.RootGameObject.transform.position = Camera.main.transform.forward;
+            m_ModelObj = Instantiate(ac.RootGameObject, transform);
+            gameObject.AddComponent<ManipulationHandler>();
+            gameObject.AddComponent<BoundingBox>();
+            ac.RootGameObject.SetActive(false);
+        }, (AssetLoaderContext ac, float f) => {
+
+            Debug.Log("加载中==》" + f);
+        }, (IContextualizedError error) => {
+
+            Debug.Log("加载失败" + error);
+        });
+    }
+
     public override void HideCollider()
     {
         base.HideCollider();

Assets/Scripts/LayoutTemplate/TemplateVideo.cs

@@ -58,7 +58,7 @@ public class TemplateVideo : BaseTemPlate
     public override void SetData(MaterialObjValue value, int updateTime)
     {
         base.SetData(value, updateTime);
-        if (!GameManager.Instance.IsRuning)
+        if (!GameManager.Instance.IsRuning|| Data == null)
         {
             localSavePath = Application.persistentDataPath + "/Material/" + Path.GetFileName(value.DownloadPath);
             // DownloadManager.Instance.AddDownloadData(Data);
@@ -70,6 +70,7 @@ public class TemplateVideo : BaseTemPlate
             MsgHandler.AddListener(value.DownloadPath, HandleMsg);
             DownloadResManager.Instance.DownLoad(data);
             Debug.Log(" SetData " + updateTime);
+            Data = data;
         }
         else
         {
@@ -103,7 +104,7 @@ public class TemplateVideo : BaseTemPlate
 
     private void HandleMsg(Msg msg)
     {
-       
+        Debug.Log("DGJ ===>   TemplateVideo");  
         if (File.Exists(localSavePath))
         {
             //  m_VideoCtr.VideoURL = Data.localSavePath;

Assets/Scripts/MultiPlayer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec876a05a4c8c6840aa607467a037e5f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/MultiPlayer/MultiPlayerManager.cs

@@ -0,0 +1,80 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MultiPlayerManager : MonoSingleton<MultiPlayerManager>
+{
+
+    public delegate void JoinRoom(SyncObject sycObj);
+
+    public delegate void QuitRoom(SyncObject sycObj);
+
+    public delegate void SynObject(SyncObject sycObj);
+
+    public delegate void SynVideo(SyncVideo sycVideo);
+
+    public JoinRoom OnJoinRoom;
+    public QuitRoom OnQuitRoom;
+    public SynObject OnSynObject;
+    public SynVideo OnSynVideo;
+
+    public Queue<SyncObject> qSyncObject;
+    public Queue<SyncVideo> qSyncVideo;
+
+
+    public void MessageCallBack(string message)
+    {
+
+    }
+
+    public void RoomCallBack()
+    {
+
+    }
+
+    public IEnumerator SendMessage()
+    {
+         while(true)
+        {
+            yield return new WaitForSeconds(0.4f);
+
+            // 发送同步信息
+             
+            if(qSyncObject.Count>0)
+            {
+
+            }
+
+            if(qSyncVideo.Count>0)
+            {
+                 
+            }
+        }
+    }
+
+
+}
+
+public class SyncObject
+{
+    public string id { get; set; }
+    public bool isSelect { get; set; }
+    public bool objAction { get; set; }
+    public Vector3 pos { get; set; }
+    public Vector3 rot { get; set; }
+
+
+}
+
+public class SyncVideo
+{
+    public string id { get; set; }
+    public bool isPlay { get; set; }
+    public float times { get; set; }
+}
+
+public enum SyncObjectType
+{
+    Object,
+    Video
+}

Assets/Scripts/MultiPlayer/MultiPlayerManager.cs.meta

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

Assets/Scripts/MultiPlayer/SynchronizationObject.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SynchronizationObject : MonoBehaviour
+{
+
+    private void Start()
+    {
+        MultiPlayerManager.Instance.OnSynObject += OnSyncObject;
+    }
+
+    private void OnSyncObject(SyncObject obj)
+    {
+
+    }
+}

Assets/Scripts/MultiPlayer/SynchronizationObject.cs.meta

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

Assets/Scripts/MultiPlayer/SynchronizationVideo.cs

@@ -0,0 +1,49 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SynchronizationVideo : MonoBehaviour
+{
+
+    private AVProVideoPlayer AvideoPlayer;
+
+
+    private void Start()
+    {
+        AvideoPlayer = GetComponent<AVProVideoPlayer>();
+        MultiPlayerManager.Instance.OnSynVideo += OnSyncVideo;
+    }
+
+    private void OnSyncVideo(SyncVideo syncVideo)
+    {
+        if (syncVideo.isPlay)
+            AvideoPlayer.Play();
+        else
+            AvideoPlayer.Pause();
+
+        if (syncVideo.times != -1)
+            AvideoPlayer.SetSeek(syncVideo.times);
+
+
+    }
+
+    public void SendSyncVideo()
+    {
+
+    }
+
+    public void IsPlay()
+    {
+
+    }
+
+    public void isPause()
+    {
+
+    }
+
+    public void SetSeek( float times)
+    {
+
+    }
+}

Assets/Scripts/MultiPlayer/SynchronizationVideo.cs.meta

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

Assets/Scripts/Net/HttpSocket.cs

@@ -1,4 +1,4 @@
-using LitJson;
+using LitJson;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -47,7 +47,7 @@ public class HttpSocket : MonoSingleton<HttpSocket>
     {
         while (true)
         {
-            CalElectric();
+           // CalElectric();
             yield return new WaitForSeconds(60f);
         }
     }
@@ -143,16 +143,16 @@ public class Position
     /// <summary>
     /// 
     /// </summary>
-    public double x { get; set; }
+    public float x { get; set; }
 
     /// <summary>
     /// 
     /// </summary>
-    public double y { get; set; }
+    public float y { get; set; }
     /// <summary>
     /// 
     /// </summary>
-    public double z { get; set; }
+    public float z { get; set; }
 }
 
 public class SendNetConnectElectricity

Assets/Scripts/UI/EdirPanel/SingleMaterialItem.cs

@@ -56,7 +56,7 @@ public class SingleMaterialItem : MonoBehaviour
         DownLoadMaterial data = new DownLoadMaterial();
         string filename = Path.GetFileName(m_Data.icon);
       //  data.name = filename;
-        data.type = "1";
+        data.type = "-9";
         data.downLoadPath = m_Data.icon;
         data.localLoadPath =Application.persistentDataPath + "/Material/" + filename;
         data.updataTime = m_Data.updateTime;

Assets/Scripts/UI/GameManager.cs

@@ -253,7 +253,7 @@ public class GameManager : MonoSingleton<GameManager>
         Map.SetActive(false);
 
 
-        TimerMgr.Instance.CreateTimer(()=> {
+        var t = TimerMgr.Instance.CreateTimer(()=> {
             if(isShowDownTip)
             {
 
@@ -264,7 +264,7 @@ public class GameManager : MonoSingleton<GameManager>
                         downLoadCount = COSDownLoad.showDownEndLoadCount;
                     }
 
-                    string str = string.Format("{0}/{1}正在下载，{2}%", (COSDownLoad.showDownEndLoadCount - downLoadCount), COSDownLoad.showDownLoadCount - downLoadCount, COSDownLoad.showDownLoadPre);
+                    string str = string.Format("{0}/{1}正在下载，{2}%", (COSDownLoad.showDownEndLoadCount - downLoadCount), COSDownLoad.showDownLoadCount - downLoadCount, COSDownLoad.showDownLoadPre.ToString("F2"));
                     UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.download);
                     ((LoadingPanel)UIManager.Instance.GetUI(UINameConfig.LoadingPanel)).TextStr = str;
 
@@ -275,8 +275,20 @@ public class GameManager : MonoSingleton<GameManager>
                     {
                         UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
                         downLoadCount = 0;
+                        UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.updateEnd);
+                      //  isShowDownTip = false;
+                       // TimerMgr.Instance.DestroyTimer(t);
                     }
                 }
+
+                if(COSDownLoad.showDownLoadCount==0&& downLoadCount ==0)
+                {
+                    Debug.Log("DGJ   updateEnd  ");
+                    UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.updateEnd);
+                    isShowDownTip = false;
+                    //  TimerMgr.Instance.DestroyTimer(t);
+
+                }
             }
         },1,-1);
     }
@@ -699,7 +711,7 @@ public class GameManager : MonoSingleton<GameManager>
             SetRouteValue(scene.navLines);
         else
             Debug.LogError(" 当前场景未设置路径");
-
+        Debug.Log("DGJ ====>  " + JsonConvert.SerializeObject(scene));
         if (scene.listSpoit != null && scene.listSpoit.Count > 0)
             SetSpoitValue(scene.listSpoit);
         else
@@ -710,11 +722,11 @@ public class GameManager : MonoSingleton<GameManager>
         else
             Debug.LogError(" 当前场景未创建锚点");
         //设置小地图景点
-      //  m_CalMap.SettingMapPoint(ListCrystals);
-
+        //  m_CalMap.SettingMapPoint(ListCrystals);
+       
         UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.download);
         //  DownloadManager.Instance.UpdataData();
-        DownloadResManager.Instance.StartDownLoad();
+      
     }
     Action<bool> GetMinMapBack;
     /// <summary>
@@ -789,6 +801,8 @@ public class GameManager : MonoSingleton<GameManager>
         //        }
         //    }
         //});
+
+        DownloadResManager.Instance.StartDownLoad();
     }
 
     private void HandleMsg(Msg msg)
@@ -846,6 +860,7 @@ public class GameManager : MonoSingleton<GameManager>
     /// <param name="spoits"></param>
     public void SetSpoitValue(List<SpoitValue> spoits)
     {
+      
         SpoitValue spoitValue;
         for (int i = 0; i < spoits.Count-1; i++)
         {
@@ -888,7 +903,7 @@ public class GameManager : MonoSingleton<GameManager>
         var spoitPos = Vector3.zero;
         if (spoit.SpoitTransform.Count > 0)
         {
-            //Debug.LogFormat("{0}{1}", spoit.name, "景点存在");
+            Debug.LogFormat("{0}{1}", spoit.name, " DGJ ===>  景点存在");
             SpoitPos trans = spoit.SpoitTransform[0];
             spoitPos = new Vector3((float)trans.pointRelativeX / WebMapSize.x * MapSize.x, -1f, -(float)trans.pointRelativeY / WebMapSize.y * MapSize.y);
             //创建水晶点
@@ -976,7 +991,7 @@ public class GameManager : MonoSingleton<GameManager>
     {
         var spoitValues = ObjectValues[spoit.id];
         var spoitObj = spoitValues.Object;
-
+        Debug.Log("DGJ ===> 创建整体素材  "+ spoit.material.Count);
         //生成素材组合
         for (int i = 0; i < spoit.material.Count; i++)
         {
@@ -1014,17 +1029,21 @@ public class GameManager : MonoSingleton<GameManager>
                 case (int)MaterialType.Model:
                 case (int)MaterialType.Text:
                 case (int)MaterialType.LocaImage:
+                    Debug.Log("DGJ  ===>  LocalImage " + material.name);
                     objsvalue = CreateSuCaiObj(material, matObj, out newmaterial);
                     break;
                 case (int)MaterialType.Image_Video_Text:
+                    Debug.Log("DGJ  ===>  Image_Video_Text " + material.name);
                     objsvalue = CreateImage_Video_Text(material, matObj, out newmaterial);
                     break;
                 case (int)MaterialType.Model_Text:
+                    Debug.Log("DGJ  ===>  Model_Text " + material.name);
                     objsvalue = CreateModel_Text(material, matObj, out newmaterial);
                     break;
                 default:
                     break;
             }
+         
             spoit.material[i] = newmaterial;
             spoitValue.ChildrenObj.AddRange(objsvalue);
             spoitValues.ChildrenObj.Add(spoitValue);
@@ -1492,7 +1511,7 @@ public class GameManager : MonoSingleton<GameManager>
                     ListLocalShowObjs[i].gameObject.SetActive(true);
                 // 进入景点通知后台
 
-                HttpSocket.Instance.SendIpToPointTrigger(" ",other.name, CallBack);
+             //   HttpSocket.Instance.SendIpToPointTrigger(" ",other.name, CallBack);
 
                 if (SpoitIndex == i)
                 {

Assets/Scripts/UI/LoginPanel.cs

@@ -259,6 +259,12 @@ public class LoginPanel : BaseUI
     /// </summary>
     private void OnClickLogin()
     {
+#if UNITY_EDITOR
+        m_AccountStr = "4444@qq.com";
+        m_AccountStr = "jiajun.hu@ghz-tech.com";
+      //  m_AccountStr = "1768147286@qq.com";
+#endif
+
         if (string.IsNullOrWhiteSpace(m_AccountStr))
         {
             //m_AccountError.gameObject.SetActive(true);
@@ -595,7 +601,7 @@ public class LoginPanel : BaseUI
                 data1.downLoadPath = mat.icon;
                 data1.updataTime = mat.updateTime;
 
-                data1.localLoadPath = Application.persistentDataPath + "/Materail/" + filename;
+                data1.localLoadPath = Application.persistentDataPath + "/Material/" + filename;
                 listMaterail.Add(data1);
             }
             if (mat.materialList != null)
@@ -609,7 +615,7 @@ public class LoginPanel : BaseUI
                         string filename = Path.GetFileName(matObj.DownloadPath);
                         data1.downLoadPath = matObj.DownloadPath;
                         data1.updataTime = mat.updateTime;
-                        data1.localLoadPath = Application.persistentDataPath + "/Materail/" + filename;
+                        data1.localLoadPath = Application.persistentDataPath + "/Material/" + filename;
                         listMaterail.Add(data1);
                     }
                 }

Assets/Scripts/UI/SceneChoose.cs

@@ -83,14 +83,13 @@ public class SceneChoose : BaseUI
             this.SendCommand(new PointFileGetUrlCommand(detail.id, PointFileType.json));
             this.SendCommand(new PointFileGetUrlCommand(detail.id, PointFileType.bytes));
             this.SendCommand(new PointPosRotDownloadCommand(detail.id));
-            this.SendCommand(new GetReferencePosCommand(detail.id));
             this.SendCommand(new MinMapGetSetCommand());
 
             HttpTool.Instance.PostTest("/project/detail", str, (mes) =>
             {
                 if (mes == "UnityWebRequest Error") return;
                 JObject jObject = JObject.Parse(mes);
-                
+               
                 if (jObject["code"].ToString() == "200")
                 {
                     mes = jObject["data"].ToString();
@@ -104,6 +103,7 @@ public class SceneChoose : BaseUI
                         if (back)
                         {
                             GetSNInit();
+                            this.SendCommand(new GetReferencePosCommand(detail.id));
                         }
                         else
                         {
@@ -184,6 +184,7 @@ public class SceneChoose : BaseUI
                     DataManager.Instance.ProjectID = m_CurrentData.id;
                     UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.createScene);
                     StartCoroutine(GetSpoitValueDetail(scene));
+                  
                     GameManager.Instance.text.text = JsonConvert.SerializeObject(scene);
                     Debug.Log("当前选择场景数据： " + JsonConvert.SerializeObject(scene));
                 }
@@ -280,6 +281,7 @@ public class SceneChoose : BaseUI
         }
 
         yield return new WaitForSeconds(1f);
+    
         //创建场景
         GameManager.Instance.CreateScene(scene);
         Hide();

Assets/UserChooseScene.cs

@@ -17,7 +17,7 @@ public class UserChooseScene : MonoBehaviour
     }
     public void initList()
     {
-        Debug.Log("µ±Ç°³¡¾°===¡·" + UserSceneManager.Instance.SceneList.Count) ;
+        Debug.Log("当�场景===》" + UserSceneManager.Instance.SceneList.Count) ;
         foreach(var i in UserSceneManager.Instance.SceneList.Values)
         {
             UserChooseSceneItem go = GameObject.Instantiate(item, item.transform.parent);
@@ -32,8 +32,9 @@ public class UserChooseScene : MonoBehaviour
 
     public void gotoScene()
     {
+        UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.download);
         cs.SetActive(false);
-        st.SetActive(true);
+       
         for (int i = 0; i < list.Count; i++)
         {
             if(list[i].tg.isOn)

Packages/manifest.json

@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "com.ghz.avideoplayer": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git",
+    "com.ghz.mqtt": "file:G:/GHZPackageSDK/GHZMQTTXR",
     "com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.15.4.tgz",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.rider": "3.0.18",

Packages/packages-lock.json

@@ -7,6 +7,12 @@
       "dependencies": {},
       "hash": "0c10eb2d941902e3b5ff389c956ee49fd8d19f54"
     },
+    "com.ghz.mqtt": {
+      "version": "file:G:/GHZPackageSDK/GHZMQTTXR",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {}
+    },
     "com.ptc.vuforia.engine": {
       "version": "file:com.ptc.vuforia.engine-10.15.4.tgz",
       "depth": 0,

ProjectSettings/ProjectSettings.asset

@@ -185,7 +185,7 @@ PlayerSettings:
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
   ForceInternetPermission: 1
-  ForceSDCardPermission: 0
+  ForceSDCardPermission: 1
   CreateWallpaper: 0
   APKExpansionFiles: 0
   keepLoadedShadersAlive: 0
@@ -924,7 +924,6 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
-      EnterpriseAuthentication: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -937,6 +936,7 @@ PlayerSettings:
       InternetClientServer: False
       VideosLibrary: False
       Objects3D: False
+      InternetClient: True
       RemoteSystem: False
       BlockedChatMessages: False
       PhoneCall: False
@@ -957,10 +957,10 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
-      InternetClient: True
+      Proximity: False
       CodeGeneration: False
       BackgroundMediaPlayback: False
-      Proximity: False
+      EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False