修改2.1的接口参数

Assets/MRNavigatorPro.unity

@@ -2202,7 +2202,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 412869839}
+  m_Mesh: {fileID: 769211957}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2273,170 +2273,6 @@ Transform:
   m_Father: {fileID: 210725851}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!43 &412869839
-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 &493550942 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 3134174762876500542, guid: 697420e71aa8bea4b938e2f3986965a6,
@@ -3701,6 +3537,170 @@ 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 +6643,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0051100454
+      value: -0.0051131058
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6773,7 +6773,7 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0019259547
+      value: -0.0018952474
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -9916,7 +9916,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0012504301
+      value: 0.0005653854
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -13762,7 +13762,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.0051504904}
+  m_AnchoredPosition: {x: 0, y: -0.0051230555}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Assets/Scripts/Blue/Command/PointFileGetUrlCommand.cs

@@ -1,6 +1,9 @@
 using Blue;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
+using LitJson;
+using System.IO;
+using UnityEngine;
 
 /// <summary>
 /// 获取点云文件（json、bytes）的Url下载地址命令
@@ -26,6 +29,7 @@ public class PointFileGetUrlCommand : ICommand
         this.GetService<IPointService>().GetPointFileDownloadUrl(methodName, sceneID.ToString(), fileType, GetPointFileUrlSuccess);
     }
 
+    string PointName;
     private void GetPointFileUrlSuccess(string message)
     {
         if (!string.IsNullOrWhiteSpace(message))
@@ -33,14 +37,43 @@ public class PointFileGetUrlCommand : ICommand
             JObject jobject = JObject.Parse(message);
             if (jobject["code"].ToString() == "200")
             {
-                message = jobject["data"].ToString();
-                if (!string.IsNullOrWhiteSpace(message))
-                {
-                    PointFileData PointFile = JsonConvert.DeserializeObject<PointFileData>(message);
+                Debug.Log("Hjj   message====>"+ message);
+                    JsonData dataJ = JsonMapper.ToObject(message);
+                    string downLoadPath = "";
+                    if (fileType==PointFileType.bytes)
+                    {
+                        downLoadPath = dataJ["data"]["bytesFile"]["path"].ToString();
 
-                    this.GetService<IPointService>().DownloadPointFile(PointFile.url, fileType);
-                }
+                    }
+                    else
+                    {
+                        downLoadPath = dataJ["data"]["jsonFile"]["path"].ToString();
+
+                    }
+
+                    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);
+                data.updataTime = 0;// GameManager.Instance.m_SceneValue.updateTime;
+                    data.type = "3";
+                    MsgHandler.AddListener(downLoadPath, HandleMsg);
+
+
+
+
+                    DownloadResManager.Instance.DownLoad(data);
+                  //  Debug.Log(" SetData " + updateTime);
+
+                //    PointFileData PointFile = JsonConvert.DeserializeObject<PointFileData>(message);
+
+                   //  this.GetService<IPointService>().DownloadPointFile(PointFile.url, fileType);
             }
         }
     }
+    private void HandleMsg(Msg msg)
+    {
+        if (fileType == PointFileType.bytes)
+            this.SendEvent(new LoadMapFileEvent() { fileName = PointName });
+    }
 }

Assets/Scripts/Blue/Service/IPointService.cs

@@ -44,8 +44,8 @@ public class PointService : IPointService
     public void OnInit()
     {
       //UrlPointCloud = "https://pro.qulivr.com/mr-navigator/v1";
-        UrlPointCloud = "https://api-cs.ghz-tech.com/mr-navigator/v1";
-        UrlObjOfReference = "https://api-fat3.ghz-tech.com/mr-navigator/v1/project/unityReference";
+        UrlPointCloud = "https://api-fat2.ghz-tech.com/mr-navigator/v1";
+        UrlObjOfReference = "https://api-fat2.ghz-tech.com/mr-navigator/v1/project/unityReference";
     }
 
     public void GetPoint(string methodName, Action<string> callback)
@@ -54,16 +54,26 @@ public class PointService : IPointService
     }
     public void GetPointFileDownloadUrl(string methodName, string projectId, PointFileType fileType, Action<string> callback)
     {
-        string url = UrlPointCloud + methodName;
-        // 创建URL
-        UriBuilder uriBuilder = new UriBuilder(url);
-        // 添加查询参数
-        uriBuilder.Query = "projectId=" + projectId + "&fileType=" + fileType.ToString();
+        string url = "https://api-fat2.ghz-tech.com/mr-navigator/v1/project/pointcloudInfo";// UrlPointCloud + methodName;
+
         // 创建UnityWebRequest
-        UnityWebRequest webRequest = UnityWebRequest.Get(uriBuilder.Uri);
-        webRequest.SetRequestHeader("Authorization", UserInfo.Instance.Token);
+      //  UnityWebRequest request = new UnityWebRequest(url, "POST");
+
+        // 设置请求头，指定数据类型为 JSON
+       // request.SetRequestHeader("Content-Type", "application/json");
+      //  request.SetRequestHeader("Authorization", UserInfo.Instance.Token);
+        JsonData data = new JsonData();
+        data["projectId"] = int.Parse(projectId);
+        Debug.Log("Hjj  url  " + url);
+        Debug.Log("Hjj  Authorization  " + UserInfo.Instance.Token);
+        Debug.Log("Hjj   ToJson " + data.ToJson());
+        HttpTool.Instance.Post(url, data.ToJson(), callback);
+        // 设置请求体，即包含 JSON 数据的字符串
+      //  byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(data.ToJson());
+      //  request.uploadHandler = new UploadHandlerRaw(bodyRaw);
+
         // 发送请求
-        CoroutineSystem.Instance.Start_Coroutine(GetPointGetPointFileRequest(webRequest, callback));
+     //   CoroutineSystem.Instance.Start_Coroutine(GetPointGetPointFileRequest(request, callback));
     }
     public void DownloadPointFile(string downloadingUrl, PointFileType fileType)
     {
@@ -100,7 +110,9 @@ public class PointService : IPointService
     {
         yield return webRequest.SendWebRequest();
 
-        if( webRequest.result == UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
+        Debug.Log("Hjj  Back  GetPointFileDownloadUrl : ");
+        Debug.Log("Hjj  Back  GetPointFileDownloadUrl : ");
+        if ( webRequest.result == UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
             Debug.LogError("GetPointFileDownloadUrl failed: " + webRequest.error);
         else
             callback?.Invoke(webRequest.downloadHandler.text);

Assets/Scripts/Blue/Service/IUpOrDownloadService.cs

@@ -25,15 +25,15 @@ public class UpOrDownloadService : IUpOrDownloadService
     public void OnInit()
     {
        // UrlPointCloudPosRot = "http://192.168.50.114:8888/mr-navigator/v1/project/position";
-        UrlPointCloudPosRot = "https://api-fat3.ghz-tech.com/mr-navigator/v1/project/position";
+        UrlPointCloudPosRot = "https://api-fat2.ghz-tech.com/mr-navigator/v1/project/position";
 
     }
 
     void IUpOrDownloadService.GetScenePosRot(int projectID)
     {
-      //  TimerMgr.Instance.CreateTimer(()=> {
+        TimerMgr.Instance.CreateTimer(()=> {
         CoroutineSystem.Instance.StartCoroutine(GetScenePosRotRequest(projectID));
-     //   },3,-1);
+       },1,1);
     }
 
     void IUpOrDownloadService.UploadScenePosRot(string Url, string JsonString)
@@ -70,17 +70,27 @@ public class UpOrDownloadService : IUpOrDownloadService
                     JObject jobject = JObject.Parse(message);
                     if (jobject["code"].ToString() == "200")
                     {
-                        message = jobject["data"].ToString();
+                        message = jobject["data"]["position"].ToString();
+                        Debug.Log("Hjj   message===>"+ message);
                         if (!string.IsNullOrWhiteSpace(message))
                         {
                            // TimerMgr.Instance.CreateTimer(() => {
                                 List<ScenePosRotInfo> ScenePosRotInfoList = JsonConvert.DeserializeObject<List<ScenePosRotInfo>>(message);
 
                             //  GongShi2.F2Dto3D(ScenePosRotInfoList[0].x, ScenePosRotInfoList[0].y, 643f, 1920f, ScenePosRotInfoList[1].x, ScenePosRotInfoList[1].y, 51f, 17.1f);
-                            
+                            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
+                            {
+
+                                Debug.Log("Hjj   message=1==>" + ScenePosRotInfoList[0].x);
+                                Debug.Log("Hjj   message=2==>" + DataManager.Instance.CurrentScene.width);
+                                Debug.Log("Hjj   message=3==>" + GameManager.Instance.WebMapSize.x);
                                 GongShi2.F2Dto3D(ScenePosRotInfoList[0].x, ScenePosRotInfoList[0].y, GameManager.Instance.WebMapSize.y, GameManager.Instance.WebMapSize.x, ScenePosRotInfoList[1].x, ScenePosRotInfoList[1].y, DataManager.Instance.CurrentScene.length, DataManager.Instance.CurrentScene.width);
-                 
-                         //  },0.03f,-1);
+
+                            }
+                            //  },0.03f,-1);
                         }
                     }
                 }

Assets/Scripts/UI/GameManager.cs

@@ -717,7 +717,7 @@ public class GameManager : MonoSingleton<GameManager>
         downLoadMaterial.localLoadPath = Application.persistentDataPath + "/Material/" + MapPicUrl;
         downLoadMaterial.updataTime = scene.updateTime;
         downLoadMaterial.type = "1";
-
+        Debug.Log("Hjj   下载小地图");
         MsgHandler.AddListener(downLoadMaterial.downLoadPath, HandleMsg);
 
         DownloadResManager.Instance.DownLoad(downLoadMaterial);
@@ -759,8 +759,9 @@ public class GameManager : MonoSingleton<GameManager>
 
     private void HandleMsg(Msg msg)
     {
-       // MsgHandler.RemoveListener()
-       if(msg.Value!=null)
+        Debug.Log("Hjj   下载小地图完成");
+        // MsgHandler.RemoveListener()
+        if (msg.Value!=null)
         {
 
             Texture2D tex = new Texture2D(1, 1);
@@ -787,6 +788,8 @@ public class GameManager : MonoSingleton<GameManager>
             CalMapSize();
             m_MinMap.Map.GetComponent<RectTransform>().sizeDelta = new Vector2(width * 150, height * 150);
 
+            Debug.Log("Hjj   下载小地图完成 获取 " + tex.width);
+            Debug.Log("Hjj   下载小地图完成 获取 " + tex.height);
             //获取网页端
             WebMapSize = new Vector2((float)tex.width, (float)tex.height);
             if (SceneValue != null)
@@ -847,6 +850,11 @@ public class GameManager : MonoSingleton<GameManager>
         {
             //Debug.LogFormat("{0}{1}", spoit.name, "景点存在");
             SpoitPos trans = spoit.SpoitTransform[0];
+
+            Debug.Log("Hjj pointRelativeX  " + (float)trans.pointRelativeX);
+            Debug.Log("Hjj pointRelativeY  " + (float)trans.pointRelativeY);
+            Debug.Log("Hjj WebMapSize  " + WebMapSize.x);
+            Debug.Log("Hjj WebMapSize  " + WebMapSize.y);
             spoitPos = new Vector3((float)trans.pointRelativeX / WebMapSize.x * MapSize.x, -1f, -(float)trans.pointRelativeY / WebMapSize.y * MapSize.y);
             //创建水晶点
             var obj = Instantiate(CrystalItem, CrystalsParent);

Assets/Scripts/UI/SceneChoose.cs

@@ -138,26 +138,29 @@ public class SceneChoose : BaseUI
             Debug.Log("通过SN获取场景数据:" + message);
             if (!string.IsNullOrWhiteSpace(message))
             {
-                JObject jobject = JObject.Parse(message);
+                Debug.Log("Hjj   当前选择场景数据 1： " + message);
+                JsonData jobject = JsonMapper.ToObject(message);
 
-                if (jobject.GetValue("code") != null)
+                if (!jobject.Keys.Contains("code") ||jobject["code"].ToJson() == "400")
                 {
-                    if (jobject["code"].ToString() == "400")
-                    {
                         UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
                         //Module_Notice.getInstance.SetNoticeInfo("场景数据获取失败", jobject["data"].ToString(), NoticeType.Normal, 1.7f);
                         //Module_Notice.getInstance._Follower.WindowAnchor = TextAnchor.UpperCenter;
                         //Module_Notice.getInstance.StartNotice(3f);
-                    }
                 }
                 else
                 {
-                    message = jobject["data"].ToString();
-                    GameManager.Instance.text.text = message;
-                  //  SceneValue scene = JsonMapper.ToObject<SceneValue>(message);
+                    message = jobject["data"]["info"].ToJson();
+                  //  GameManager.Instance.text.text = message;
+                    //  SceneValue scene = JsonMapper.ToObject<SceneValue>(message);
 
+                    Debug.Log("Hjj   当前选择场景数据 ： " + message);
                     SceneValue scene = JsonConvert.DeserializeObject<SceneValue>(message);
+                    Debug.Log("Hjj   当前选择场景数据： " + scene.width);
+                    Debug.Log("Hjj   当前选择场景数据： " + scene.length);
                     DataManager.Instance.CurrentScene = scene;
+                    Debug.Log("Hjj   当前选择场景数据： " + DataManager.Instance.CurrentScene.width);
+                    Debug.Log("Hjj   当前选择场景数据： " + DataManager.Instance.CurrentScene.length);
                     DataManager.Instance.ProjectID = m_CurrentData.id;
                     UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.createScene);
                     StartCoroutine(GetSpoitValueDetail(scene));
@@ -191,43 +194,48 @@ public class SceneChoose : BaseUI
                 if (jObject["code"].ToString() == "200")
                 {
                     message = jObject["data"].ToString();
+                    Debug.Log("Hjj  jObjectjObjectjObject " + message);
                     SpoitValueDetail spoit = JsonConvert.DeserializeObject<SpoitValueDetail>(message);
                     GameManager.Instance.SpoitsValueDetail.Add(spoit.id, spoit);
                 }
             }));
         }
-        Debug.Log(scene.vuforiaXML);
-        string xmlName = Path.GetFileName(scene.vuforiaXML);
-
-        if (xmlName != null)
+        Debug.Log("Hjj  scene.vuforiaXML" + scene.vuforiaXML);
+        if(UserInfo.Instance.is20)
         {
-            xmlName = xmlName.Substring(0, xmlName.Length - 4);
-            AppConfigConst.IMAGE_TARGET_FILE_NAME = xmlName;
-        }
 
+            string xmlName = Path.GetFileName(scene.vuforiaXML);
 
-      
+            if (xmlName != null)
+            {
+                xmlName = xmlName.Substring(0, xmlName.Length - 4);
+                AppConfigConst.IMAGE_TARGET_FILE_NAME = xmlName;
+            }
 
-        if (scene.vuforiaXML != null)
-        {
-            DownloadData xml = new DownloadData();
-            string filename = Path.GetFileName(scene.vuforiaXML);
-            xml.name = filename;
-            xml.type = 8;
-            xml.downloadPath = scene.vuforiaXML;
-            xml.updateTime = (int)scene.updateTime;
-            xml.localSavePath = Application.persistentDataPath + "/StreamingAssets/Vuforia/" + filename;
-            DownloadManager.Instance.AddDownloadData(xml);
-
-            DownloadData dat = new DownloadData();
-            string filename2 = Path.GetFileName(scene.vuforiaDat);
-            dat.name = filename2;
-            dat.type = 8;
-            dat.downloadPath = scene.vuforiaDat;
-            dat.updateTime = (int)scene.updateTime;
-            dat.localSavePath = Application.persistentDataPath + "/StreamingAssets/Vuforia/" + filename2;
-
-            DownloadManager.Instance.AddDownloadData(dat);
+
+
+
+            if (scene.vuforiaXML != null)
+            {
+                DownloadData xml = new DownloadData();
+                string filename = Path.GetFileName(scene.vuforiaXML);
+                xml.name = filename;
+                xml.type = 8;
+                xml.downloadPath = scene.vuforiaXML;
+                xml.updateTime = (int)scene.updateTime;
+                xml.localSavePath = Application.persistentDataPath + "/StreamingAssets/Vuforia/" + filename;
+                DownloadManager.Instance.AddDownloadData(xml);
+
+                DownloadData dat = new DownloadData();
+                string filename2 = Path.GetFileName(scene.vuforiaDat);
+                dat.name = filename2;
+                dat.type = 8;
+                dat.downloadPath = scene.vuforiaDat;
+                dat.updateTime = (int)scene.updateTime;
+                dat.localSavePath = Application.persistentDataPath + "/StreamingAssets/Vuforia/" + filename2;
+
+                DownloadManager.Instance.AddDownloadData(dat);
+            }
         }
 
         yield return new WaitForSeconds(1f);