加载逻辑修改

Assets/2.0/Tools/LoadManager.cs

@@ -121,7 +121,7 @@ public class LoadManager : Singleton<LoadManager>
             if (b)
             {
                 Debug.Log("Vuforia 下载完成  ===>" + VufroiaTrigger.LoacldatFile);
-                File.WriteAllBytes(VufroiaTrigger.LoaclxmlFile, xmlFileItem.downLoadData);
+              //  File.WriteAllBytes(VufroiaTrigger.LoaclxmlFile, xmlFileItem.downLoadData);
             }
             xmlcallback.Invoke(b);
         };
@@ -141,7 +141,7 @@ public class LoadManager : Singleton<LoadManager>
             if (b)
             {
                 Debug.Log("Vuforia 下载完成  ===>"+ VufroiaTrigger.LoacldatFile);
-                File.WriteAllBytes(VufroiaTrigger.LoacldatFile, datFileItem.downLoadData);
+              //  File.WriteAllBytes(VufroiaTrigger.LoacldatFile, datFileItem.downLoadData);
             }
             datcallback.Invoke(b);
         };

Assets/2.0/User/Trigger/VufroiaTrigger.cs

@@ -43,7 +43,7 @@ public class VufroiaTrigger
     IEnumerator loadVuforia()
     {
 
-        Debug.Log("加载Database");
+        Debug.Log("加载Database  "+ LoaclxmlFile);
         IEnumerable<ObserverBehaviour> observer = VuforiaBehaviour.Instance.ObserverFactory.CreateBehavioursFromDatabase(LoaclxmlFile);
         // Create an Image Target from the database.
         yield return observer;

Assets/2.0/User/UserScene/UserSceneManager.cs

@@ -30,7 +30,9 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
             {
                 init(data["data"]["list"][i]["id"].ToString(), data["data"]["list"][i]["name"].ToString());
             }
-        }else
+           
+        }
+        else
         {
             callback?.Invoke(true);
         }
@@ -164,6 +166,8 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
         if (SceneList.ContainsKey(id))
         SceneList[id].load();
         DataManager.Instance.ProjectID = int.Parse(id);
+        GameManager.Instance.isShowDownTip = true;
+        DownloadResManager.Instance.StartDownLoad();
     }
 
     public Dictionary<string, UserSceneItem> GetScenes()

Assets/COSScripts/DownloadResManager.cs

@@ -49,7 +49,7 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
             Debug.Log("DGJ  CompletedMaterial ==>" + msg);
             listCompletedMaterial = JsonConvert.DeserializeObject<List<DownLoadMaterial>>(msg);
         }
-
+       
         if(PlayerPrefs.HasKey("CompletedMaterial"))
         {
             string msg = PlayerPrefs.GetString("CompletedMaterial");
@@ -91,12 +91,16 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
     /// <param name="downloadMaterial"></param>
     public void DownLoad(DownLoadMaterial downloadMaterial)
     {
-        //Debug.LogError("单个素材下载   " + downloadMaterial.downLoadPath);
+        Debug.LogError("单个素材下载   " + downloadMaterial.downLoadPath);
         //List<DownLoadMaterial> list = new List<DownLoadMaterial>();
         //list.Add(downloadMaterial);
         // COSDownLoad.Instance.TransferBatchDownloadObjects(list, path);
         if(downloadMaterial.type=="-9")
+        {
             LocalLoadManager.Instance.LocalLoadMaterial(downloadMaterial);
+            return;
+        }
+           
 
         if (Screen(downloadMaterial) == false)
         {
@@ -166,11 +170,12 @@ private bool Screen(DownLoadMaterial downloadMaterial)
                     finish = true;
             }
         }
-
+        Debug.Log("DGJ  ===> Screen  " + finish +"  "+ qDownload.Count);
         if (!finish)
         {
             listNotMaterial.Add(downloadMaterial);
 
+            Debug.Log("DGJ  ===> showDownLoadCount  " + COSDownLoad.showDownLoadCount );
             COSDownLoad.showDownLoadCount++;
             qDownload.Enqueue(downloadMaterial);
         }

Assets/COSScripts/LocalLoadManager.cs

@@ -20,7 +20,7 @@ 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 + "    ");
@@ -117,7 +117,7 @@ public class LocalLoadManager : MonoSingleton<LocalLoadManager>
                 dicLoaclData.Add(downloadMaterial.downLoadPath, buffer);
                 // isDownLoad = true;
                 MsgHandler.SendMsg(downloadMaterial.downLoadPath, new Msg(downloadMaterial.downLoadPath, buffer));
-
+                fs.Close();
             }
         }
           

Assets/MRNavigatorPro.unity

@@ -1451,7 +1451,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &260758066
 MonoBehaviour:
@@ -1612,170 +1612,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 275096928}
   m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!43 &278576580
-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!1001 &292033093
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2411,7 +2247,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 278576580}
+  m_Mesh: {fileID: 939847687}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2736,7 +2572,7 @@ RectTransform:
   - {fileID: 1494370970}
   - {fileID: 1180406930700069013}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2962,7 +2798,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &588301978
 MonoBehaviour:
@@ -3460,7 +3296,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1001 &706104185
 PrefabInstance:
@@ -4215,7 +4051,7 @@ PrefabInstance:
     - target: {fileID: 3134174762876500537, guid: 697420e71aa8bea4b938e2f3986965a6,
         type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 3134174762876500537, guid: 697420e71aa8bea4b938e2f3986965a6,
         type: 3}
@@ -4446,6 +4282,170 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!43 &939847687
+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 &980339763
 GameObject:
   m_ObjectHideFlags: 0
@@ -5424,7 +5424,6 @@ MonoBehaviour:
   m_UseGeoPoseLocalizer: 0
   m_UseServerLocalizer: 0
   m_MapIds: []
-  m_UseYUV: 0
 --- !u!1 &1330922971
 GameObject:
   m_ObjectHideFlags: 0
@@ -5905,7 +5904,7 @@ Transform:
   - {fileID: 1942196190}
   - {fileID: 1813820188}
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1367052369
 PrefabInstance:
@@ -6689,7 +6688,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.005139529
+      value: -0.0024981713
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6819,37 +6818,37 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0019483159
+      value: -0.0035065874
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 188
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 61
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -101.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714058937656, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6859,62 +6858,62 @@ PrefabInstance:
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 188
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 61
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -35.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 188
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 61
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -35.5
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3e8996c442fe40541beb734ca45f2bf6, type: 3}
@@ -7399,6 +7398,7 @@ MonoBehaviour:
   canTwoHandScale: 0
   minScaleRatio: 0.8
   maxScaleRatio: 3
+  isParentDrag: 0
 --- !u!114 &1605254284
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7907,7 +7907,7 @@ RectTransform:
   m_Children:
   - {fileID: 1778699411}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -10007,7 +10007,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.001277233
+      value: -0.00019225816
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -13853,7 +13853,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.0051413425}
+  m_AnchoredPosition: {x: 0, y: -0.0025444399}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Assets/Script/MQTTClient.cs

@@ -120,7 +120,11 @@ public class MQTTClient : MonoSingleton<MQTTClient>
             this.username = username;
     }
 
-
+    public void SetFront(string front)
+    {
+        if (front != null)
+            this.front = front;
+    }
     //连接
     public void Connect()
     {
@@ -129,16 +133,16 @@ public class MQTTClient : MonoSingleton<MQTTClient>
         if (DeviceType.type == "Phone")
         {
             id =UserInfo.Instance.Account + "_Phone";
-            rid = UserInfo.Instance.Account + "_Glasses";
+            rid = front+UserInfo.Instance.Account + "_Glasses";
 
         }
         else
         {
             id = UserInfo.Instance.Account + "_Glasses";
-            rid =  UserInfo.Instance.Account + "_Phone";
+            rid = front+UserInfo.Instance.Account + "_Phone";
         }
         DisConnect();
-        qt = new QTTManager(id, username, password);
+        qt = new QTTManager(front+id, username, password);
         qt.Connect();
         StartCoroutine(Reconnection());
         qt.ConnectionFailed += onFaild;
@@ -184,7 +188,7 @@ public class MQTTClient : MonoSingleton<MQTTClient>
         ushort s = qt.Subscribe(
                         new string[]
                         {
-                              id
+                              front+id
 
                         },
                         new byte[]
@@ -258,7 +262,7 @@ public class MQTTClient : MonoSingleton<MQTTClient>
     {
         if(qt!=null&& qt.IsConnect())
         {
-            Debug.Log(id + "  DGJ  publish =====>  " + rid + "   " + bs.Length);
+            Debug.Log(id + "  DGJ  publish =====>  " + front+rid + "   " + bs.Length);
             qt.Publish(rid, bs, MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE, false);
         }
         else

Assets/Scripts/Blue/Temp/MoveChange.cs

@@ -13,7 +13,7 @@ public class MoveChange : MonoBehaviour
     private float y=> SetSceneActive.Instance.goReference_y;
     void Start()
     {
-        ControllerTracker = GameObject.Find("SDKSystem").transform.Find("NRInput/Right/ControllerTracker");
+        ControllerTracker = API_GSXR_Module_InputSystem_KS.GSXR_KSRight.inputDeviceKSPartUI.transform;
         DispatcherBase.KeyDownDelegateRegister(keyDownEventDelegate);
         DispatcherBase.KeyUpDelegateRegister(keyUpEventDelegate);
         RotToggle.onValueChanged.AddListener(RotToggleOnValueChanged);

Assets/Scripts/UI/GameManager.cs

@@ -337,6 +337,7 @@ public class GameManager : MonoSingleton<GameManager>
         //API_GSXR_Slam.GSXR_Get_Head().localEulerAngles = new Vector3(0, -35.9f, 0);
         StartCoroutine(StartScene(isPlayMRZhanTing));
         HttpSocket.Instance.SendIpToElectric();
+        if(!UserInfo.Instance.is20)
         MQTTClient.Instance.StartSendCameraPos();
     }
     IEnumerator StartScene( bool isPlayMRZhanTing)
@@ -1518,6 +1519,7 @@ public class GameManager : MonoSingleton<GameManager>
             {
                 ListShowObjs[i].gameObject.SetActive(true);
 
+                
                 MQTTClient.Instance.sendActiveSp(ListShowObjs[i].name, true);
 
                 Debug.Log(i);

Assets/Scripts/UI/LoginPanel.cs

@@ -262,7 +262,9 @@ public class LoginPanel : BaseUI
 #if UNITY_EDITOR
         m_AccountStr = "4444@qq.com";
         m_AccountStr = "jiajun.hu@ghz-tech.com";
-      //  m_AccountStr = "1768147286@qq.com";
+        //  m_AccountStr = "1768147286@qq.com";
+        m_AccountStr = "bactest1@1.com";
+     //   m_AccountStr = "devtest1@1.com";
 #endif
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))
@@ -391,6 +393,7 @@ public class LoginPanel : BaseUI
             {
                 Debug.Log(jobect["data"]["type"].ToString());
                StartCoroutine( LoginCallBack2YS(2));
+                UserInfo.Instance.is20 = true;
             }
             else if (int.Parse(jobect["data"]["type"].ToString()) == 1)
             {
@@ -398,6 +401,7 @@ public class LoginPanel : BaseUI
 
                 Debug.Log(jobect["data"]["type"].ToString());
                StartCoroutine( LoginCallBackYS(2));
+                UserInfo.Instance.is20 = false;
             }
             else
                 return;
@@ -466,6 +470,7 @@ public class LoginPanel : BaseUI
     {
         List<SceneValue> sucessvalues = new List<SceneValue>();
         List<SceneValue> failevalues = new List<SceneValue>();
+        bool finish = false;
         for (int i = 0; i < scenes.Count; i++)
         {
             SendSnInfo sendNet = new SendSnInfo();
@@ -485,6 +490,7 @@ public class LoginPanel : BaseUI
                 {
                     failevalues.Add(scenes[i]);
                 }
+                finish = true;
             }));
         }
 
@@ -494,6 +500,7 @@ public class LoginPanel : BaseUI
         ((LoadingPanel)UIManager.Instance.GetUI(UINameConfig.LoadingPanel)).TextStr = str;
 
         yield return new WaitForSeconds(1f);
+        yield return finish;
         UIManager.Instance.ShowUI(UINameConfig.SceneChoose, typeof(SceneChoose), sucessvalues);
         UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
         Hide();

Assets/Scripts/UI/SceneChoose.cs

@@ -144,7 +144,7 @@ public class SceneChoose : BaseUI
                     {
                         //MQTTClinet  连接
                         MQTTClient.Instance.SetUserName(data["data"]["auth"].ToString());
-
+                        MQTTClient.Instance.SetFront(data["data"]["topicPrefix"].ToString());
                         MQTTClient.Instance.Connect();
                     }
                     else

ProjectSettings/ProjectSettings.asset

@@ -147,7 +147,10 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 10.13.3
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
+  - {fileID: -6682207197718421661, guid: 8f422df2931cba0478c1fe8ab232b9a3, type: 2}
+  - {fileID: 3493090336618791480, guid: 2d049ae1db0e2b74c8251022ae6dcb95, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -177,7 +180,7 @@ PlayerSettings:
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 10133
-  AndroidMinSdkVersion: 26
+  AndroidMinSdkVersion: 28
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -924,7 +927,6 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
-      EnterpriseAuthentication: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -936,6 +938,7 @@ PlayerSettings:
       PrivateNetworkClientServer: False
       InternetClientServer: False
       VideosLibrary: False
+      BackgroundMediaPlayback: False
       Objects3D: False
       RemoteSystem: False
       BlockedChatMessages: False
@@ -957,10 +960,10 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
-      Proximity: False
       InternetClient: True
+      Proximity: False
       CodeGeneration: False
-      BackgroundMediaPlayback: False
+      EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False