添加简单的UI逻辑

Assets/2.0/GameScene.cs

@@ -2,6 +2,18 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class GameScene : XRTool.Util.UnitySingleton<GameScene>
+public class GameScene : MonoSingleton<GameScene>
 {
+
+    public List<UserBaseUI> UIList = new List<UserBaseUI>();
+    public void ShowScenes()
+    {
+        //»ñÈ¡ËùÓг¡¾° ²¢³õʼ»¯UI
+        (UserSceneUI.Instance as UserSceneUI).show();
+    }
+
+    public void gotoScenes()
+    {
+
+    }
 }

Assets/2.0/Tools/HttpAction.cs

@@ -14,12 +14,14 @@ public class HttpAction :Singleton<HttpAction>
     public const string client_snInfo = "/client/snInfo";
 
     public const string project_detail = "/project/detail";
+    public const string sn_init = "/sn/init";
 
     public const string file_download = "/file/download";
 
     public const string material_init = "/material/init";
-    
-    public const string project_init = "/project/index";
 
+    public const string project_init = "/project/index";
+    public const string viewpoint_init = "/viewpoint/init";
 
+    
 }

Assets/2.0/User/Spots/SpotsItem.cs

@@ -7,10 +7,35 @@ public class SpotsItem
 {
     public string id;
 
-    //景点中的模型
-    public Dictionary<string, ModelItem> modelList = new Dictionary<string, ModelItem>();
+    public string name;
+
+    public Vector3 pos;
+
+    public Vector3 eul;
 
+    public string updateTime;
+
+    public string triggerImage;
+
+    public UserSceneItem usi;
+    //景点中的模型
+    public Dictionary<string, ModelList> modelList = new Dictionary<string, ModelList>();
 
+    GameObject _spotsObj;
+    public GameObject SpotsObj
+    {
+        get
+        {
+            if (_spotsObj == null)
+            {
+                _spotsObj = new GameObject(id);
+                _spotsObj.transform.parent = usi.SceneModel.transform;
+                _spotsObj.transform.localPosition = Vector3.zero;
+                _spotsObj.transform.localEulerAngles = Vector3.zero;
+            }
+            return _spotsObj;
+        }
+    }
     public ObserverBehaviour obVuforia;
 
 
@@ -21,6 +46,14 @@ public class SpotsItem
 
         this.obVuforia.OnTargetStatusChanged += OnTargetStatusChanged;
 
+        foreach(var i in ModelManager.Instance.modellist.Keys)
+        {
+            if(i==int.Parse( id))
+            {
+                modelList.Add(id,ModelManager.Instance.modellist[i]);
+                ModelManager.Instance.modellist[i].materalLibrary.parent = SpotsObj.transform;
+            }
+        }
     }
 
 

Assets/2.0/User/UserBaseUI.cs

@@ -0,0 +1,35 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using XRTool.Util;
+
+public class UserBaseUI : SingletonMono<UserBaseUI>
+{
+    // Start is called before the first frame update
+    void Awake()
+    {
+        this.transform.parent = GameScene.Instance.transform;
+        this.transform.localPosition = Vector3.zero;
+        this.transform.localEulerAngles = Vector3.zero;
+        this.transform.localScale = Vector3.one;
+        GameScene.Instance.UIList.Add(this);
+        this.gameObject.SetActive(false);
+    }
+
+
+    public virtual void show()
+    {
+        int ct =GameScene.Instance.UIList.Count;
+        for (int i = 0; i < ct; i++)
+        {
+            GameScene.Instance.UIList[i].gameObject.SetActive(false);
+        }
+        this.gameObject.SetActive(false);
+    }
+
+
+    public virtual void hide()
+    {
+
+    }
+}

Assets/2.0/User/UserBaseUI.cs.meta

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

Assets/2.0/User/UserManager.cs

@@ -8,20 +8,25 @@ public class UserManager : SingletonMono<UserManager>
     {
         if (isLogin)
         {
-
             HttpTool.Instance.GetAllMaterials(HttpAction.material_init, "", (string msg)=> {
 
                 Debug.Log("/material/init===>" + msg);
                 ModelManager.Instance.init(msg);
-            
+
+                HttpTool.Instance.Get(HttpAction.project_init, (string msg) => {
+
+                    Debug.Log("/project/index===>" + msg);
+                    UserSceneManager.Instance.initScene(msg);
+                    GameScene.Instance.ShowScenes();
+                });
             });
+            /*
+            HttpTool.Instance.Get(HttpAction.viewpoint_init, (string msg) => {
 
-            HttpTool.Instance.Get(HttpAction.project_init, (string msg) => {
+                Debug.Log("/project/viewpoint_init===>" + msg);
 
-                Debug.Log("/project/index===>" + msg);
-                UserSceneManager.Instance.initScene(msg);
+            });*/
 
-            });
         }
 
     }

Assets/2.0/User/UserScene/UserSceneItem.cs

@@ -40,14 +40,12 @@ public class UserSceneItem
 
     public string sentiment;
     public string updateTime;
-    public string backgroundImages;
     public string navLines;
     public string status;
-    public string belong;
     public string describe;
     public string image;
     public string map;
     public string sandTable;
-    public string xmlFile;
-    public string datFile;
+    public string vuforiaXML;
+    public string vuforiaDat;
 }

Assets/2.0/User/UserScene/UserSceneManager.cs

@@ -32,41 +32,39 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
         string jsonData = JsonMapper.ToJson(sendNet);
         GameScene.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpAction.client_snInfo, jsonData, (message) =>
         {
-            SendSceneDetail detail = new SendSceneDetail();
-            detail.id = int.Parse(id);
+            Debug.Log(" ³õʼ»¯³¡¾° client_snInfo==¡·" + message);
+            SendInit detail = new SendInit();
+            detail.projectId = int.Parse(id);
+            detail.sn = SendSN.GetSN();
             string str = JsonConvert.SerializeObject(detail);
             HttpTool
-            .Instance.PostTest(HttpAction.project_detail, str, (mes) =>
+            .Instance.PostTest(HttpAction.sn_init, str, (mes) =>
             {
+                Debug.Log(" ³õʼ»¯³¡¾° sn_init==¡·" + mes+"===>id"+ detail.projectId.ToString());
                 JsonData data = JsonMapper.ToObject(mes);
                 if (data["data"].ToString() != null)
                 {
-                    CreateItem(data["data"]);
+                    CreateItem(data["data"], detail.projectId.ToString());
                 }
 
             });
 
         }));
     }
-    void CreateItem(JsonData msg)
+    void CreateItem(JsonData msg,string id)
     {
-
-        Debug.Log(" ³õʼ»¯³¡¾° msg==¡·" + msg.ToJson());
-        UserSceneItem usi = new UserSceneItem();//JsonConvert.DeserializeObject<UserSceneItem>(msg.ToJson());
-        usi.id = msg["id"].ToString();
+       // JsonConvert.DeserializeObject<UserSceneItem>(msg.ToJson());
+        UserSceneItem usi = new UserSceneItem();//
+        usi.id = id;
         usi.name = msg["name"].ToString();
         if(msg["sentiment"]!=null)
             usi.sentiment = msg["sentiment"].ToString();
         if (msg["updateTime"] != null)
             usi.updateTime = msg["updateTime"].ToString();
-        if (msg["backgroundImages"] != null)
-            usi.backgroundImages = msg["backgroundImages"].ToString();
         if (msg["navLines"] != null)
             usi.navLines = msg["navLines"].ToString();
         if (msg["status"] != null)
             usi.status = msg["status"].ToString();
-        if (msg["belong"] != null)
-            usi.belong = msg["belong"].ToString();
         if (msg["describe"] != null)
             usi.describe = msg["describe"].ToString();
         if (msg["image"] != null)
@@ -75,11 +73,88 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
             usi.map = msg["map"].ToString();
         if (msg["sandTable"] != null)
             usi.sandTable = msg["sandTable"].ToString();
+
+        if (msg["listSpoit"] != null)
+        {
+            if(msg["listSpoit"].IsArray)
+            {
+                for (int i = 0; i < msg["listSpoit"].Count; i++)
+                {
+                    SpotsItem si = new SpotsItem();
+                    si.usi = usi;
+                    si.id = msg["listSpoit"][i]["id"].ToString();
+                    si.name = msg["listSpoit"][i]["name"].ToString();
+                    if(msg["listSpoit"][i]["spoitTf"]!=null)
+                    {
+                        if(msg["listSpoit"][i]["spoitTf"]["nowScale"]!=null&& (msg["listSpoit"][i]["spoitTf"]["nowScale"]["x"].ToString()!="0"|| msg["listSpoit"][i]["spoitTf"]["nowScale"]["y"].ToString() != "0"|| msg["listSpoit"][i]["spoitTf"]["nowScale"]["z"].ToString() != "0"))
+                        {
+
+                            si.SpotsObj.transform.localScale = new Vector3(float.Parse(msg["listSpoit"][i]["spoitTf"]["nowScale"]["x"].ToString()), float.Parse(msg["listSpoit"][i]["spoitTf"]["nowScale"]["y"].ToString()), float.Parse(msg["listSpoit"][i]["spoitTf"]["nowScale"]["z"].ToString()));
+                   
+                        }
+                        else
+                        {
+                            si.SpotsObj.transform.localScale = Vector3.one;
+
+                        }
+
+                        if (msg["listSpoit"][i]["spoitTf"]["nowPos"] != null && (msg["listSpoit"][i]["spoitTf"]["nowPos"]["x"].ToString() != "0" || msg["listSpoit"][i]["spoitTf"]["nowPos"]["y"].ToString() != "0" || msg["listSpoit"][i]["spoitTf"]["nowPos"]["z"].ToString() != "0"))
+                        {
+                            si.SpotsObj.transform.localPosition = new Vector3(float.Parse(msg["listSpoit"][i]["spoitTf"]["nowPos"]["x"].ToString()), float.Parse(msg["listSpoit"][i]["spoitTf"]["nowPos"]["y"].ToString()), float.Parse(msg["listSpoit"][i]["spoitTf"]["nowPos"]["z"].ToString()));
+
+                        }else
+                        {
+                            si.SpotsObj.transform.localPosition = Vector3.zero;
+
+                        }
+
+                        if (msg["listSpoit"][i]["spoitTf"]["nowRot"] != null && (msg["listSpoit"][i]["spoitTf"]["nowRot"]["x"].ToString() != "0" || msg["listSpoit"][i]["spoitTf"]["nowRot"]["y"].ToString() != "0" || msg["listSpoit"][i]["spoitTf"]["nowRot"]["z"].ToString() != "0"))
+                        {
+                            si.SpotsObj.transform.localEulerAngles = new Vector3(float.Parse(msg["listSpoit"][i]["spoitTf"]["nowRot"]["x"].ToString()), float.Parse(msg["listSpoit"][i]["spoitTf"]["nowRot"]["y"].ToString()), float.Parse(msg["listSpoit"][i]["spoitTf"]["nowRot"]["z"].ToString()));
+
+                        }else
+                        {
+                            si.SpotsObj.transform.localEulerAngles = Vector3.zero;
+
+                        }
+                    }
+                    else
+                    {
+                        si.SpotsObj.transform.localPosition = Vector3.zero;
+                        si.SpotsObj.transform.localEulerAngles = Vector3.zero;
+                        si.SpotsObj.transform.localScale = Vector3.one;
+                    }
+                    si.updateTime = msg["listSpoit"][i]["updateTime"].ToString();
+                    si.triggerImage = msg["listSpoit"][i]["triggerImage"].ToString();
+                    if(msg["listSpoit"][i]["triggerImage"]["material"]!=null&& msg["listSpoit"][i]["triggerImage"]["material"].IsArray)
+                    {
+                        for (int j = 0; j < msg["listSpoit"][i]["triggerImage"]["material"][j].Count; j++)
+                        {
+                            if(ModelManager.Instance.modellist.ContainsKey(int.Parse(msg["listSpoit"][i]["triggerImage"]["material"][j]["id"].ToString())))
+                            {
+                              //  ModelList ModelList = JsonConvert.DeserializeObject<ModelList>(msg["listSpoit"][i]["triggerImage"]["material"][j].ToString());
+                                si.modelList.Add(msg["listSpoit"][i]["triggerImage"]["material"][j]["id"].ToString(), ModelManager.Instance.modellist[int.Parse(msg["listSpoit"][i]["triggerImage"]["material"][j]["id"].ToString())]);
+                            }
+                        }
+                    }
+
+                    usi.SpotsList.Add(si.id,si);
+                }
+            }
+        }
+
         usi.vufroiaTrigger = new VufroiaTrigger();
-        usi.vufroiaTrigger.init(msg);
-        usi.vufroiaTrigger.init(msg);
+      //  usi.vufroiaTrigger.init(msg);
 
 
         SceneList.Add(usi.id, usi);
     }
+
+
+    public Dictionary<string, UserSceneItem> GetScenes()
+    {
+        return SceneList;
+    }
+
+    
 }

Assets/2.0/User/UserScene/UserSceneUI.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using XRTool.Util;
+
+public class UserSceneUI : UserBaseUI
+{
+    GameObject obj;
+
+    public override void show()
+    {
+        base.show();
+        Debug.Log("UserSceneManager===>"+UserSceneManager.Instance.GetScenes().Count);
+
+        if(!obj)
+            LoadResources();
+
+    }
+
+    void LoadResources()
+    {
+        //¼ÓÔØÔ¤ÖÆÌå
+    }
+
+
+    private void OnDestroy()
+    {
+
+    }
+}

Assets/2.0/User/UserScene/UserSceneUI.cs.meta

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

Assets/MRNavigatorPro.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1116,7 +1116,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 1928056566}
+  m_Mesh: {fileID: 848319946}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2175,6 +2175,170 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 838631559}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!43 &848319946
+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!43 &864122651
 Mesh:
   m_ObjectHideFlags: 0
@@ -3253,7 +3417,8 @@ MonoBehaviour:
   m_UseGeoPoseLocalizer: 0
   m_UseServerLocalizer: 0
   m_MapIds: []
-  m_UseYUV: 0
+  webTex: {fileID: 0}
+  deviceName: 
 --- !u!1 &1330922971
 GameObject:
   m_ObjectHideFlags: 0
@@ -3893,7 +4058,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.00073341385
+      value: -0.0027428926
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -4023,37 +4188,37 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0049713547
+      value: -0.0018883708
       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}
@@ -4063,62 +4228,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}
@@ -5408,170 +5573,6 @@ PrefabInstance:
         type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7f34641aa9b798d4980647aff233a880, type: 3}
---- !u!43 &1928056566
-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 &1942196189
 GameObject:
   m_ObjectHideFlags: 0
@@ -6231,6 +6232,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8a3fd997b64a3f24cb6c3b1b39af8fcd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  global: 1
 --- !u!4 &2066434262
 Transform:
   m_ObjectHideFlags: 0
@@ -6566,7 +6568,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.0012551947
+      value: -0.0014153649
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -10381,7 +10383,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.0007450391}
+  m_AnchoredPosition: {x: 0, y: -0.0027512636}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Packages/manifest.json

@@ -15,8 +15,7 @@
     "com.unity.xr.arkit-face-tracking": "4.2.7",
     "com.unity.xr.interactionsubsystems": "1.0.1",
     "com.unity.xr.openxr": "1.5.3",
-    "jh.immersalsdk.engine": "file:G:/GUnityProject/ImmersalSDK/package",
-    "jh.xr.engine": "file:G:/GUnityProject/NavigatorXRSDK/XRSDK/package",
+    "jh.xr.engine": "file:D:/JiHe/XRSDK/package",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

Packages/packages-lock.json

@@ -251,18 +251,8 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "jh.immersalsdk.engine": {
-      "version": "file:G:/GUnityProject/ImmersalSDK/package",
-      "depth": 0,
-      "source": "local",
-      "dependencies": {
-        "com.unity.xr.management": "4.0.1",
-        "com.unity.xr.legacyinputhelpers": "2.1.2",
-        "com.unity.inputsystem": "1.4.2"
-      }
-    },
     "jh.xr.engine": {
-      "version": "file:G:/GUnityProject/NavigatorXRSDK/XRSDK/package",
+      "version": "file:D:/JiHe/XRSDK/package",
       "depth": 0,
       "source": "local",
       "dependencies": {

ProjectSettings/ProjectSettings.asset

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