修改获取上传点坐标方式

Assets/MRNavigatorPro.unity

@@ -1116,7 +1116,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 1183460939}
+  m_Mesh: {fileID: 417977061}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1332,6 +1332,170 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 378545992}
   m_PrefabAsset: {fileID: 0}
+--- !u!43 &417977061
+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,
@@ -3068,170 +3232,6 @@ Transform:
   m_Father: {fileID: 1813820188}
   m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!43 &1183460939
-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!1 &1265688324
 GameObject:
   m_ObjectHideFlags: 0
@@ -3417,8 +3417,7 @@ MonoBehaviour:
   m_UseGeoPoseLocalizer: 0
   m_UseServerLocalizer: 0
   m_MapIds: []
-  webTex: {fileID: 0}
-  deviceName: 
+  m_UseYUV: 0
 --- !u!1 &1330922971
 GameObject:
   m_ObjectHideFlags: 0
@@ -4058,7 +4057,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0014267211
+      value: -0.006425712
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -4188,7 +4187,7 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.005905939
+      value: -0.0012434178
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -5959,6 +5958,11 @@ PrefabInstance:
       propertyPath: m_RootOrder
       value: 10
       objectReference: {fileID: 0}
+    - target: {fileID: 5142388695032135296, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: isHand
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6007065485426161915, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_Name
@@ -6510,7 +6514,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.00096586207
+      value: 0.00034712514
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -10325,7 +10329,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.0017395174}
+  m_AnchoredPosition: {x: 0, y: -0.0016866012}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Assets/Scripts/Blue/Command/DownloadCommand.cs

@@ -1,19 +1,19 @@
 using Blue;
-using System;
-using System.Collections.Generic;
 
 /// <summary>
-/// 下载移动场景的Postion、Rotatiuon
+/// 涓嬭浇绉诲姩鍦烘櫙鐨凱ostion銆丷otatiuon
 /// </summary>
 public class DownloadCommand : ICommand
 {
     private string Url;
-    public DownloadCommand(string Url )
+    private int projectID;
+    public DownloadCommand(string Url ,int projectID)
     {
         this.Url = Url;
+        this.projectID = projectID;
     }
     public void OnExcute()
     {
-        this.GetService<IUpOrDownloadService>().GetScenePosRot(Url);
+        this.GetService<IUpOrDownloadService>().GetScenePosRot(Url,projectID);
     }
 }

Assets/Scripts/Blue/Controller/SavePanel.cs

@@ -30,6 +30,7 @@ public class SavePanel : AbstractController
         cancleBtn.onClick.AddListener(Cancle);
     }
 
+    private string URL = "https://api-fat1.ghz-tech.com/mr-navigator/v1/project/createposition";
     private void Save()
     {
         meshTest.transform.parent = parent;
@@ -41,7 +42,7 @@ public class SavePanel : AbstractController
         posRotlist[1].y = meshTest.localEulerAngles.y;
         posRotlist[1].z = meshTest.localEulerAngles.z;
         string jsonString = JsonConvert.SerializeObject(posRotlist);
-        this.SendCommand(new UploadCommand(this.GetService<IUpOrDownloadService>().URL, jsonString));
+        this.SendCommand(new UploadCommand(URL, jsonString));
         sCToggleSwitch3D.isOn = false;
         gameObject.SetActive(false);
     }

Assets/Scripts/Blue/Controller/SetPos/MinMapPos.cs

@@ -3,10 +3,9 @@ using UnityEngine;
 public class MinMapPos : MonoBehaviour
 {
     [SerializeField] private GameObject MinMapCanvas;
-    void Awake()
+    void Start()
     {
-        MinMapCanvas = GameObject.Find("MinMapCanvas");
-        if (MinMapCanvas != null)
+        if (MinMapCanvas != null && OpenXRCamera.Instance.head!=null)
         {
             MinMapCanvas.transform.parent = OpenXRCamera.Instance.head;
         }

Assets/Scripts/Blue/Controller/SetPos/SetBtnPos.cs

@@ -3,12 +3,11 @@ using UnityEngine;
 public class SetBtnPos : MonoBehaviour
 {
     [SerializeField] private GameObject SetBtn;
-    void Awake()
+    void Start()
     {
-        SetBtn = GameObject.Find("SetBtn");
-        if (SetBtn != null)
+        if (SetBtn != null && OpenXRCamera.Instance.head != null)
         {
-           // SetBtn.transform.parent = OpenXRCamera.Instance.head;
+           SetBtn.transform.parent = OpenXRCamera.Instance.head;
         }
     }
 }

Assets/Scripts/Blue/Other/ScenePointBodyInfo.cs

@@ -0,0 +1,5 @@
+public class ScenePointBodyInfo
+{
+    public int id { get; set; }
+    public bool unity { get; set; }
+}

Assets/Scripts/Blue/Other/ScenePointBodyInfo.cs.meta

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

Assets/Scripts/Blue/Service/IUpOrDownloadService.cs

@@ -2,7 +2,6 @@ using Blue;
 using LitJson;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
@@ -12,24 +11,23 @@ using UnityEngine.Networking;
 public interface IUpOrDownloadService : IService
 {
     List<ScenePosRotInfo> PosRot { get; }
-    string URL { get; }
-    void GetScenePosRot(string Url);
+    void GetScenePosRot(string Url,int projectID);
     void UploadScenePosRot(string Url, string JsonString);
 }
 
 public class UpOrDownloadService : IUpOrDownloadService
 {
     public List<ScenePosRotInfo> PosRot { get; private set; }
-    public string URL { get; private set; }
+    public int ProjectID { get; private set; }
 
     public void OnInit()
     {
 
     }
 
-    void IUpOrDownloadService.GetScenePosRot(string Url)
+    void IUpOrDownloadService.GetScenePosRot(string Url,int projectID)
     {
-        RootSystem.Instance.StartCoroutine(GetScenePosRotRequest(Url));
+        RootSystem.Instance.StartCoroutine(GetScenePosRotRequest(Url,projectID));
     }
 
     void IUpOrDownloadService.UploadScenePosRot(string Url, string JsonString)
@@ -37,21 +35,27 @@ public class UpOrDownloadService : IUpOrDownloadService
         RootSystem.Instance.StartCoroutine(RequestUpload(Url,JsonString));
     }
 
-    private IEnumerator GetScenePosRotRequest(string Url)
+    private IEnumerator GetScenePosRotRequest(string Url,int projectID)
     {
-        using (UnityWebRequest webRequest = UnityWebRequest.Get(Url))
+        using (UnityWebRequest webRequest = new UnityWebRequest(Url, "POST"))
         {
+            ProjectID = projectID;
+            ScenePointBodyInfo TestGet = new ScenePointBodyInfo();
+            TestGet.id = projectID;
+            TestGet.unity = true;
+            string jsonData = JsonConvert.SerializeObject(TestGet);
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonData);
+
+            webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
+            webRequest.downloadHandler = new DownloadHandlerBuffer();
+
+            webRequest.SetRequestHeader("Content-Type", "application/json;charset=utf-8");
             webRequest.SetRequestHeader("authorization", HttpTool.Instance.Token);
 
-            //??header
-            foreach (var v in HttpTool.Instance.RequestHeader)
-            {
-                webRequest.SetRequestHeader(v.Key, v.Value);
-            }
             yield return webRequest.SendWebRequest();
 
             if (webRequest.result== UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
-                Debug.LogError("UnityWebRequest Error");
+                Debug.LogError("UnityWebRequest Error:"+webRequest.downloadHandler.text);
             else
             {
                 if (!string.IsNullOrWhiteSpace(webRequest.downloadHandler.text))
@@ -65,7 +69,6 @@ public class UpOrDownloadService : IUpOrDownloadService
                         {
                             List<ScenePosRotInfo> ScenePosRotInfoList = JsonConvert.DeserializeObject<List<ScenePosRotInfo>>(message);
                             PosRot = ScenePosRotInfoList;
-                            URL = Url;
                             this.TriggerEvent(new GetScenePosRotEvent() { PosRot = PosRot });
                         }
                     }
@@ -81,6 +84,9 @@ public class UpOrDownloadService : IUpOrDownloadService
             JsonData data = JsonMapper.ToObject(jsonString);
             JsonData d2 = new JsonData();
             d2["position"] = data;
+            d2["id"] = ProjectID;
+            d2["unity"] = true;
+            Debug.LogError("d2.ToJson():" + d2.ToJson());
             byte[] bodyRaw = Encoding.UTF8.GetBytes(d2.ToJson());
 
             webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);

Assets/Scripts/UI/GameManager.cs

@@ -544,8 +544,14 @@ public class GameManager : MonoSingleton<GameManager>
         {
             StartCreateScene(scene);
         }
+        Invoke("MoveScenePatch",1);
+    }
+    private void MoveScenePatch()
+    {
+        Vector3 temp = ObjsParent.parent.localPosition;
+        temp.z += MapSize.y;
+        ObjsParent.parent.localPosition = temp;
     }
-
     private void StartCreateScene(SceneValue scene)
     {
         if (scene.navLines != null && scene.navLines.Count > 0)

Assets/Scripts/UI/LoginPanel.cs

@@ -250,12 +250,8 @@ public class LoginPanel : BaseUI
     private void OnClickLogin()
     {
 
-#if UNITY_EDITOR
-       // m_AccountStr = "ghztest2@ghz-tech.com";
-       // m_PasswordStr = "123456Aa";
         m_AccountStr = "ghztest2@ghz-tech.com";
         m_PasswordStr = "123456Aa";
-#endif
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))
         {

Assets/Scripts/UI/SceneChoose.cs

@@ -157,9 +157,9 @@ public class SceneChoose : BaseUI
 
     private void GetScenePosRot(int projectId,string fileType)
     {
-        string url = "https://api-fat1.ghz-tech.com/mr-navigator/v1/project/position/"+ projectId.ToString();
+        string url = "https://api-fat1.ghz-tech.com/mr-navigator/v1/project/position";
 
-        this.SendCommand(new DownloadCommand(url));
+        this.SendCommand(new DownloadCommand(url,projectId));
     }
 
     private void GetSNInit()
@@ -277,9 +277,9 @@ public class SceneChoose : BaseUI
         //创建场景
         GameManager.Instance.CreateScene(scene);
         Hide();
+        
     }
 
-
     private void UpdateSceneItem()
     {
         if (m_SceneData == null)