Merge branch 'F/0710_2.1+2.0' of ssh://gogs.ghz-tech.com:30979/GHzGlass/GHZMRNavigatorProXR into F/0710_2.1+2.0

Assets/MRNavigatorPro.unity

@@ -2247,7 +2247,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 1593389663}
+  m_Mesh: {fileID: 2036575705}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6552,7 +6552,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0051647467
+      value: -0.0051234276
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6682,37 +6682,37 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0019267632
+      value: -0.0019214216
       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}
@@ -6722,62 +6722,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}
@@ -7086,170 +7086,6 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 8019606653617611915}
   m_PrefabAsset: {fileID: 0}
---- !u!43 &1593389663
-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 &1594020696
 GameObject:
   m_ObjectHideFlags: 0
@@ -8076,7 +7912,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 3}
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 1
@@ -8085,10 +7921,10 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: New Text
+  m_Text: 1111
 --- !u!222 &1778699414
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -9567,6 +9403,170 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+--- !u!43 &2036575705
+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 &2063916783
 GameObject:
   m_ObjectHideFlags: 0
@@ -10035,7 +10035,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.001263615
+      value: -0.0012451621
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -13881,7 +13881,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.00511703}
+  m_AnchoredPosition: {x: 0, y: -0.0051484634}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Assets/Resources/Template/Prefab/Text.prefab

@@ -441,4 +441,3 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   boundingBox: {fileID: 3735631276721690460}
   manipulationHandler: {fileID: 183926529109974472}
-  obj_BoundingBox: {fileID: 0}

Assets/Resources/UI/LoginPanel.prefab

@@ -4164,6 +4164,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: SNAndVersion
       objectReference: {fileID: 0}
+    - target: {fileID: 1536495084242872656, guid: af35dd847a693ca4d9d6a092c7487e22,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1621527033159262363, guid: af35dd847a693ca4d9d6a092c7487e22,
         type: 3}
       propertyPath: m_Pivot.x

Assets/Resources/VuforiaConfiguration.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: VuforiaConfiguration
   m_EditorClassIdentifier: 
   vuforia:
-    vuforiaLicenseKey: 
+    vuforiaLicenseKey: AVdaifr/////AAABmTxtN/ZN0Eg+uuJIO4iBD7dsw2+y7PFk/RTJIeK591PAPZFHjA0YUX2pybiHDZk+xm0fFr2tLCDPOwMR8S/wxajuVOXUYDkGA8NlzQiNbSfQyFSEFLS92UNrOQO0dnMwsTnZKS0VUhk+Xh9bYy4Iv7lfQ8fPvG6/DSQ/qfSrn8IbZsQ3Dl2MomN1VAO5YPXSQwjCyY8Lncu6XwJXfrxZoDvBJkDDnp5NiWhlqdiYi/ZewaJyrhAE1tImEkTKR4B4bu2VE1n8qaXCEFmRGtX2SLYiCchylxYXzYnF9DwTlLOVvY/3vXnuJ8VPhaUtAM8xIrk072ZL5lvBnVJ508LHC5vzzWJcLBI8pDmS9p6BcU1D
     ufoLicenseKey: QWRvTlZRYi8vLy8vQUFBQUtFUlVmMFlNSUUyWG5CbzJUQ2JlazFZSXptZnlBb29UdzVkdGg2bmdRWjQyWjM4eEphZjZPa2VFcDlSb2xoekRPeXZCcVlKbXQvZjduby9xbjVjNVMxVnlxZ2VhNVBiVzlBTVpJRVU5TmJCaVNxcGc4QzVXdWpySEJWOVcvT1JJZGdxbmowUVp2OHR5UytzQk9CWWlMbVJaZXErTE5MWXJSUEhlNjMzWWh0NnR3Q2RxTFRVVzFtSjNacUIwYW5pYnk3S2FhK241UDVtTXZoRzUyWkZKM2VKZk9JTXZEV05WU05wOFVOY0tyalZwRDRkeEw2Y3d5cFpDWjJub09IOUxUNVNEV2xqMDRYUnZRYXZ2UTJjVlFqUkdvc2E1NjY3TFNjQ0JqTUJFaXlFRTFtbDNhbERnQUtldllOalpoVkpadVkydnl3NzU5eVhYUXl3STZIZXFsYUh2aWxwV05EaTcrZCtFZE04bTlVanI=
     delayedInitialization: 0
     cameraFocusModeSetting: 2

Assets/Script/GongShi2.cs

@@ -84,9 +84,9 @@ public class GongShi2 : MonoBehaviour
         WebPosObj.transform.parent = parent;
         WebPosObj2.transform.parent = parent;
         List<Vector2> lvlist = new List<Vector2>();
-        Vector2 p1 = new Vector2(Mathf.Abs(WebPosObj.transform.localPosition.x / sceneLength * tw  ), Mathf.Abs(th-((WebPosObj.transform.localPosition.z) / sceneWidth * th  )));
+        Vector2 p1 = new Vector2(WebPosObj.transform.localPosition.x / sceneLength * tw  , th-((WebPosObj.transform.localPosition.z) / sceneWidth * th  ));
         lvlist.Add(p1);
-        Vector2 p2 = new Vector2(Mathf.Abs(WebPosObj2.transform.localPosition.x / sceneLength * tw ), Mathf.Abs(th-((WebPosObj2.transform.localPosition.z )/ sceneWidth * th  )));
+        Vector2 p2 = new Vector2(WebPosObj2.transform.localPosition.x / sceneLength * tw , th-((WebPosObj2.transform.localPosition.z )/ sceneWidth * th  ));
         lvlist.Add(p2);
         Debug.Log("Web¶ËPos  :" + p1);
         Debug.Log("Web¶ËPos 2 :" + p2);

Assets/Scripts/BaseManager/DataManager.cs

@@ -224,6 +224,8 @@ public class SendSaveDataNew
 
 public class SendSaveData
 {
+    public List<SpoitPos> position { get; set; }
+    public int triggerImageId { get; set; }
     /// <summary>
     /// 景点ID
     /// </summary>

Assets/Scripts/Config/DataConfig.cs

@@ -196,6 +196,8 @@ public class MaterialObjValueNew
 /// </summary>
 public class MaterialObjValue
 {
+    public int fileId { get; set; }
+    public int id { get; set; }
     public string uid { get; set; }
 
     //素材名称
@@ -285,7 +287,8 @@ public class MaterialObl
     public string typesetting { get; set; }
 
     public bool autoplay { get; set; }
-
+    public int iconId { get; set; }
+    
 
     public MaterialObl()
     {
@@ -363,6 +366,7 @@ public class MaterialOblNew
 /// </summary>
 public class SpoitValue
 {
+    public int triggerImageId;
     /// <summary>
     /// 景点ID
     /// </summary>
@@ -393,7 +397,7 @@ public class SpoitValue
     /// <summary>
     /// 景点和触发范围信息
     /// </summary>
-    public SpoitPos position { get; set; }
+    public List<SpoitPos> position { get; set; }
     /// <summary>
     /// 景点和触发范围信息
     /// </summary>
@@ -434,7 +438,8 @@ public class SpoitValueDetail
     /// 素材
     /// </summary>
     public List<MaterialObl> material { get; set; }
-
+    public int triggerImageId { get; set; }
+    
 }
 
 

Assets/Scripts/LayoutGroup/DRFanLayout.cs

@@ -11,6 +11,7 @@ public class DRFanLayout : MonoBehaviour
 {
     public static List<ObjectValue> CalLayout(MaterialObl materialObls, GameObject par, out MaterialObl newmaterial)
     {
+        Debug.LogError("HJJmaterialObls.select  DRFanLayout  " );
         newmaterial = materialObls;
         BaseTemPlate text = new BaseTemPlate();
         MaterialObjValue textmat = null;
@@ -56,12 +57,15 @@ public class DRFanLayout : MonoBehaviour
                     break;
             }
 
+            Debug.LogError("HJJmaterialObls.select   123 " );
             if (go != null)
             {
+                Debug.LogError("HJJmaterialObls.select 42121   " );
                 go.name = string.IsNullOrWhiteSpace(mat.name) ? par.name + "-" + i.ToString() : mat.name;
                 go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
                 if (materialObls.select)
                 {
+                    Debug.LogError("HJJmaterialObls.select    " + go.transform.name +"    "+ mat.ObjectTransform.nowPos);
                     go.transform.localPosition = mat.ObjectTransform.nowPos;
                     go.transform.localEulerAngles = mat.ObjectTransform.nowRot;
                     go.transform.localScale = mat.ObjectTransform.nowScale;

Assets/Scripts/LayoutTemplate/TemplateVideo.cs

@@ -52,6 +52,7 @@ public class TemplateVideo : BaseTemPlate
             }
         }
 
+        GameManager.Instance.text.text += localSavePath + "\n";
         if (autoplay)
         {
             Debug.Log("HJJ    ¿ªÊ¼×Ô¶¯²¥·Å" + localSavePath);

Assets/Scripts/Net/HttpTool.cs

@@ -132,7 +132,7 @@ public class HttpTool : MonoSingleton<HttpTool>
             yield return webRequest.SendWebRequest();
 
             Debug.Log("CallBack==>"+ webRequest.downloadHandler.text);
-            if (webRequest.isHttpError || webRequest.isNetworkError)//webRequest.result == UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError
+            if (webRequest.result == UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)//
             {
                 Debug.LogError(url + "\n" + webRequest.error + "\n" + webRequest.downloadHandler.text);
                 string error = webRequest.downloadHandler.text;

Assets/Scripts/UI/EdirPanel/MaterialBtnItem.cs

@@ -108,9 +108,9 @@ public class MaterialBtnItem : MonoBehaviour, EventObserver
         m_ObjectValue = objValue;
         MaterialObj = objValue.Object;
         m_Text.text = string.IsNullOrWhiteSpace(value.name) ? MaterialObj.name : value.name;
-        MaterialObj.transform.localPosition = m_ObjectValue.nowPos;
-        MaterialObj.transform.localEulerAngles = m_ObjectValue.nowRot;
-        MaterialObj.transform.localScale = m_ObjectValue.nowScale;
+        //MaterialObj.transform.localPosition = m_ObjectValue.nowPos;
+        //MaterialObj.transform.localEulerAngles = m_ObjectValue.nowRot;
+        //MaterialObj.transform.localScale = m_ObjectValue.nowScale;
 
         //m_Image.sprite = 
     }

Assets/Scripts/UI/EdirPanel/UIEditorPanel.cs

@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using Blue;
+using LitJson;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
@@ -216,6 +217,8 @@ public class UIEditorPanel : AbstractController, EventObserver
 
         RevocationBtn.onClick.AddListener(() =>
         {
+            GameManager.Instance.SetPosRotScale();
+            
             if (MaterialObj == null)
                 return;
 
@@ -242,6 +245,9 @@ public class UIEditorPanel : AbstractController, EventObserver
             }
             GameManager.Instance.SaveSpoitObjs();
             */
+
+            // TODO 需要再保存一次
+            GameManager.Instance.GetPosRotScale();
             StartCoroutine(SetSpoitInfo());
         });
     }
@@ -259,9 +265,19 @@ public class UIEditorPanel : AbstractController, EventObserver
                 for (int k = 0;k< spoit.material[j].materialList.Count; k++)
                 {
                     spoit.material[j].select = true;
-                    spoit.material[j].materialList[k].ObjectTransform.nowPos = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition;
-                    spoit.material[j].materialList[k].ObjectTransform.nowRot = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles;
-                    spoit.material[j].materialList[k].ObjectTransform.nowScale = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale;
+                    if (GameManager.Instance.ObjsParent.childCount > i)
+                    {
+                        if (GameManager.Instance.ObjsParent.GetChild(i).childCount > j)
+                        {
+                            if (GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).childCount > k)
+                            {
+                                Debug.LogError("HJJ  materialList   " + GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).name +"_" + GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition);
+                                spoit.material[j].materialList[k].ObjectTransform.nowPos = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition;
+                                spoit.material[j].materialList[k].ObjectTransform.nowRot = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles;
+                                spoit.material[j].materialList[k].ObjectTransform.nowScale = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale;
+                            }
+                        }
+                    }
                 }
             }
             SplitSpoitData(spoit,count-1); //// 第一个LocalNULLShowObj是无用的 ,so -1
@@ -273,72 +289,125 @@ public class UIEditorPanel : AbstractController, EventObserver
     {
         countSplit++;
         SendSaveData data = new SendSaveData();
-        data.id = spoit.id;
-        data.name = spoit.name;
+        data.id = GameManager.Instance.SpoitsValueDetail[spoit.id].id;
+        data.name = GameManager.Instance.SpoitsValueDetail[spoit.id].name;
         data.projectId = DataManager.Instance.ProjectID;
         data.material = spoit.material;
-        data.spoittf = spoit.spoitTf;
+        data.spoittf = GameManager.Instance.SpoitsValueDetail[spoit.id].spoitTf;
+        data.position = GameManager.Instance.SpoitsValueDetail[spoit.id].position;
+        data.triggerImageId = GameManager.Instance.SpoitsValueDetail[spoit.id].triggerImageId;
+        data.triggerRange = GameManager.Instance.SpoitsValueDetail[spoit.id].triggerRange;
+
         saveData.Add(data);
 
-        string sendData = JsonConvert.SerializeObject(saveData);
-        Debug.LogError(countSplit+"=="+spoitCount);
-        if(countSplit==spoitCount)
-            HttpTool.Instance.PostTest("/viewpoint/update", sendData, SaveCallBack);
+
+        if (countSplit==spoitCount)
+        {
+
+            string sendData = JsonConvert.SerializeObject(saveData);
+            JsonData jsdata = JsonMapper.ToObject(sendData);
+
+            for (int i = 0; i < jsdata.Count; i++)
+            {
+                if(jsdata[i].Keys.Contains("material")&&jsdata[i]["material"].IsArray)
+                {
+                    for (int j = 0; j < jsdata[i]["material"].Count; j++)
+                    {
+                        if (jsdata[i]["material"][j].Keys.Contains("materialList") && jsdata[i]["material"][j]["materialList"].IsArray)
+                        {
+                            for (int k = 0; k < jsdata[i]["material"][j]["materialList"].Count; k++)
+                            {
+                                jsdata[i]["material"][j]["materialList"][k]["textBJ"] = jsdata[i]["material"][j]["materialList"][k]["TextBJ"];
+                                jsdata[i]["material"][j]["materialList"][k]["downloadPath"] = jsdata[i]["material"][j]["materialList"][k]["DownloadPath"];
+                                jsdata[i]["material"][j]["materialList"][k]["objectTransform"] = jsdata[i]["material"][j]["materialList"][k]["ObjectTransform"];
+                            }
+                        }
+                        
+                    }
+                }
+            }
+
+            Debug.LogError(countSplit + "==" + spoitCount);
+            Debug.LogError("sendDatasendDatasendData====>" + jsdata.ToJson());
+            HttpTool.Instance.PostTest("/viewpoint/update", jsdata.ToJson(), SaveCallBack);
+        }
     }
     private int countSplit =0;
 
     private void SaveCallBack(string message)
     {
-        if (message == "UnityWebRequest Error")
+        try
         {
-            InstantiateCommand ErrorCommand = new InstantiateCommand(
-                InstantiateSystem.Instance.BlueObject.WarningPopUp,
-                InstantiateSystem.Instance.BlueObject.NetErrorText);
-            CommandSystem.Instance.Send(ErrorCommand);
-            //this.GetService<ISendLogService>().SendLog("Blue","UnityWebRequest Error");
-            return;
-        }
 
-        //Debug.LogError("SaveCallBack:  " + message);
-        JObject jObject = JObject.Parse(message);
-        string str = jObject["message"].ToString();
-        if (str != "更新成功")
+            JsonData jd = JsonMapper.ToObject(message);
+            if (jd.Keys.Contains("message"))
+            {
+                if (jd["message"].ToString() == "success")
+                {
+                    Debug.Log("更新成功");
+                    UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.SaveSpoitDataEnd);
+                    ((LoadingPanel)UIManager.Instance.GetUI(UINameConfig.LoadingPanel)).TextStr = "更新成功";
+
+                    InstantiateCommand Command = new InstantiateCommand(
+                            InstantiateSystem.Instance.BlueObject.WarningPopUp,
+                            InstantiateSystem.Instance.BlueObject.SuccessText);
+                    CommandSystem.Instance.Send(Command);
+
+                    PosRotScale.PosRotScalePatchList.Clear();
+                    for (int i = 0; i < GameManager.Instance.ObjsParent.childCount; i++)
+                    {
+                        if (i != 0)
+                        {
+                            for (int j = 0; j < GameManager.Instance.ObjsParent.GetChild(i).childCount; j++)
+                            {
+                                for (int k = 0; k < GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).childCount; k++)
+                                {
+                                    PosRotScalePatch PosRotScalePatch = new PosRotScalePatch();
+                                    PosRotScalePatch.PosPatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition;
+                                    PosRotScalePatch.RotPatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles;
+                                    PosRotScalePatch.ScalePatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale;
+                                    PosRotScale.PosRotScalePatchList.Add(PosRotScalePatch);
+                                }
+                            }
+                        }
+                    }
+                    return;
+                }
+                else
+                {
+
+                    InstantiateCommand ErrorCommand = new InstantiateCommand(
+                        InstantiateSystem.Instance.BlueObject.WarningPopUp,
+                        InstantiateSystem.Instance.BlueObject.NetErrorText);
+                    CommandSystem.Instance.Send(ErrorCommand);
+                    //this.GetService<ISendLogService>().SendLog("Blue","UnityWebRequest Error");
+                    return;
+                }
+            }
+            else
+            {
+
+                InstantiateCommand ErrorCommand = new InstantiateCommand(
+                    InstantiateSystem.Instance.BlueObject.WarningPopUp,
+                    InstantiateSystem.Instance.BlueObject.NetErrorText);
+                CommandSystem.Instance.Send(ErrorCommand);
+                //this.GetService<ISendLogService>().SendLog("Blue","UnityWebRequest Error");
+                return;
+            }
+
+        }
+        catch
         {
             InstantiateCommand ErrorCommand = new InstantiateCommand(
                 InstantiateSystem.Instance.BlueObject.WarningPopUp,
                 InstantiateSystem.Instance.BlueObject.NetErrorText);
             CommandSystem.Instance.Send(ErrorCommand);
-            Debug.LogError("执行协程数：" + countSplit);
-            //this.GetService<ISendLogService>().SendLog("Blue","更新成功出现问题");
+            //this.GetService<ISendLogService>().SendLog("Blue","UnityWebRequest Error");
             return;
-        }
-        Debug.Log("更新成功");
-        UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.SaveSpoitDataEnd);
-        ((LoadingPanel)UIManager.Instance.GetUI(UINameConfig.LoadingPanel)).TextStr = str;
 
-        InstantiateCommand Command = new InstantiateCommand(
-                InstantiateSystem.Instance.BlueObject.WarningPopUp,
-                InstantiateSystem.Instance.BlueObject.SuccessText);
-        CommandSystem.Instance.Send(Command);
-
-        PosRotScale.PosRotScalePatchList.Clear();
-        for (int i = 0; i < GameManager.Instance.ObjsParent.childCount;i++)
-        {
-            if (i != 0)
-            {
-                for (int j = 0; j < GameManager.Instance.ObjsParent.GetChild(i).childCount; j++)
-                {
-                    for (int k = 0; k < GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).childCount; k++)
-                    {
-                        PosRotScalePatch PosRotScalePatch = new PosRotScalePatch();
-                        PosRotScalePatch.PosPatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition;
-                        PosRotScalePatch.RotPatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles;
-                        PosRotScalePatch.ScalePatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale;
-                        PosRotScale.PosRotScalePatchList.Add(PosRotScalePatch);
-                    }
-                }
-            }
         }
+
+    
     }
 
     /// <summary>

Assets/Scripts/UI/GameManager.cs

@@ -262,15 +262,17 @@ public class GameManager : MonoSingleton<GameManager>
         var t = TimerMgr.Instance.CreateTimer(()=> {
             if(isShowDownTip)
             {
-
+                Debug.Log("HJJ  判断正在下载");
                 if (downLoadCount == 0)
                 {
                     downLoadCount = COSDownLoad.showDownEndLoadCount;
+                    Debug.Log("HJJ  判断正在下载downLoadCount==0");
                 }
 
                 if (COSDownLoad.showDownLoadCount > COSDownLoad.showDownEndLoadCount)
                 {
-                  
+
+                    Debug.Log("HJJ  判断正在下载COSDownLoad.showDownLoadCount > COSDownLoad.showDownEndLoadCount");
                     string str = string.Format("{0}/{1}正在下载，{2}%", (COSDownLoad.showDownEndLoadCount - downLoadCount), COSDownLoad.showDownLoadCount - downLoadCount, COSDownLoad.showDownLoadPre.ToString("F2"));
                     UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.download);
                     ((LoadingPanel)UIManager.Instance.GetUI(UINameConfig.LoadingPanel)).TextStr = str;
@@ -280,6 +282,7 @@ public class GameManager : MonoSingleton<GameManager>
                 {
                     if (downLoadCount != 0)
                     {
+                        Debug.Log("HJJ  判断正在下载downLoadCount != 0");
                         UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
                         downLoadCount = 0;
                         UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.updateEnd);
@@ -290,6 +293,7 @@ public class GameManager : MonoSingleton<GameManager>
 
                 if(COSDownLoad.showDownLoadCount==0&& downLoadCount ==0)
                 {
+                    Debug.Log("HJJ  判断正在下载COSDownLoad.showDownLoadCount==0&& downLoadCount ==0");
                     Debug.Log("DGJ   updateEnd  ");
                     UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.updateEnd);
                     isShowDownTip = false;
@@ -328,7 +332,8 @@ public class GameManager : MonoSingleton<GameManager>
             },3);
             TemplateVideo video = TemplateVideo.temQueue.Dequeue();
 #if !UNITY_EDITOR
-            video.m_Video.SetUrl("file://"+ video.localSavePath);
+            if (!video.localSavePath.Contains("file"))
+                video.m_Video.SetUrl("file://" + video.localSavePath);
 #endif
             video.m_Video.transform.GetComponent<VideoPlayBtn>().m_IsPlaying = false;
             video.m_Video.transform.GetComponent<VideoPlayBtn>().PlayVideoAuto();
@@ -489,8 +494,8 @@ public class GameManager : MonoSingleton<GameManager>
     //}
 
 
-#region 设置功能
-
+    #region 设置功能
+    public bool needSavePosRotScale = true;
     public void OnEditorBtnValueChanged(bool ison)
     {
         m_EditorCanvas.gameObject.SetActive(ison);
@@ -503,6 +508,11 @@ public class GameManager : MonoSingleton<GameManager>
 
         if (ison)
         {
+            if (needSavePosRotScale)
+            {
+                GetPosRotScale(); // 获取所有物体位置旋转缩放
+                needSavePosRotScale = false;
+            }
             m_EditorCanvas.position = OpenXRCamera.Instance.head.position + Player.transform.forward + new Vector3(0, 0.5f, 0);
             m_EditorCanvas.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
 
@@ -676,7 +686,29 @@ public class GameManager : MonoSingleton<GameManager>
         }
 
     }
-#endregion
+
+    public void GetPosRotScale()
+    {
+        PosRotScale.PosRotScalePatchList.Clear();
+        for (int i = 0; i < GameManager.Instance.ObjsParent.childCount; i++)
+        {
+            if (i != 0)
+            {
+                for (int j = 0; j < GameManager.Instance.ObjsParent.GetChild(i).childCount; j++)
+                {
+                    for (int k = 0; k < GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).childCount; k++)
+                    {
+                        PosRotScalePatch PosRotScalePatch = new PosRotScalePatch();
+                        PosRotScalePatch.PosPatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition;
+                        PosRotScalePatch.RotPatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles;
+                        PosRotScalePatch.ScalePatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale;
+                        PosRotScale.PosRotScalePatchList.Add(PosRotScalePatch);
+                    }
+                }
+            }
+        }
+    }
+    #endregion
 
 #region 获取景点信息--素材编辑模式下
     /// <summary>
@@ -945,7 +977,7 @@ public class GameManager : MonoSingleton<GameManager>
     private void CreateCrystalAndTrigger(SpoitValue spoit)
     {
         var spoitPos = Vector3.zero;
-        if (spoit.SpoitTransform.Count > 0)
+        if (spoit.SpoitTransform!=null&&spoit.SpoitTransform.Count > 0)
         {
             Debug.LogFormat("{0}{1}", spoit.name, " DGJ ===>  景点存在");
             SpoitPos trans = spoit.SpoitTransform[0];
@@ -1033,7 +1065,13 @@ public class GameManager : MonoSingleton<GameManager>
     /// </summary>
     private void CreateMaterial(SpoitValue spoit, out SpoitValue newspoit)
     {
-        
+        if(!ObjectValues.ContainsKey(spoit.id))
+        {
+            newspoit = new SpoitValue();
+        }
+        else
+        {
+
         var spoitValues = ObjectValues[spoit.id];
         var spoitObj = spoitValues.Object;
         Debug.Log("DGJ ===> 创建整体素材  "+ spoit.material.Count);
@@ -1053,19 +1091,12 @@ public class GameManager : MonoSingleton<GameManager>
             //素材组物体
             GameObject matObj = new GameObject(material.name);
             matObj.transform.SetParent(spoitValues.Object.transform);
-            if (!material.select)
-            {
-                matObj.transform.localPosition = Vector3.zero;
-                matObj.transform.localEulerAngles = Vector3.zero;
-                matObj.transform.localScale = new Vector3(1, 1, 1);
-                material.objectTransform.SetStartValue(matObj.transform.localPosition, matObj.transform.localEulerAngles, matObj.transform.localScale);
-            }
-            else
-            {
-                matObj.transform.localPosition = material.objectTransform.nowPos;
-                matObj.transform.localEulerAngles = material.objectTransform.nowRot;
-                matObj.transform.localScale = material.objectTransform.nowScale;
-            }
+
+            matObj.transform.localPosition = Vector3.zero;
+            matObj.transform.localEulerAngles = Vector3.zero;
+            matObj.transform.localScale = new Vector3(1, 1, 1);
+            material.objectTransform.SetStartValue(matObj.transform.localPosition, matObj.transform.localEulerAngles, matObj.transform.localScale);
+
             //素材组合对应ObjectValue的
             ObjectValue spoitValue = new ObjectValue(i, spoit.id, material.name, matObj);
             //素材组合下的单个素材ObjectValue
@@ -1113,6 +1144,7 @@ public class GameManager : MonoSingleton<GameManager>
             ObjectValues.Add(spoit.id, spoitValues);
         }
         spoitObj.gameObject.SetActive(false);
+        }
     }
 
     /// <summary>
@@ -1401,6 +1433,7 @@ public class GameManager : MonoSingleton<GameManager>
     /// </summary>
     private List<ObjectValue> CreateImage_Video_Text(MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
     {
+        Debug.LogError("HJJmaterialObls.select  DRFanLayout.CreateImage_Video_Text  ");
         newmaterial = material;
         List<ObjectValue> objects = new List<ObjectValue>();
         //switch (material.typesetting)
@@ -1450,12 +1483,14 @@ public class GameManager : MonoSingleton<GameManager>
                 DRTitleLayout.CalLayout(material, spoit, out newmaterial);
                 break;
             case "8":
+                Debug.LogError("HJJmaterialObls.select  DRFanLayout.CalLayout  ");
                 DRFanLayout.CalLayout(material, spoit, out newmaterial);
                 break;
 
             default:
                 break;
         }
+        Debug.LogError("HJJmaterialObls.select  DRFanLayout.CalLayout default ");
 
         return objects;
     }
@@ -1635,16 +1670,13 @@ public class GameManager : MonoSingleton<GameManager>
                 SpoitIndex = i;
                 ListCrystals[SpoitIndex].gameObject.SetActive(false);
                 m_EditorPanel.SetSpoit(SpoitValues[i]);
-                StartCoroutine(patch());
                 return;
             }
         }
-        StartCoroutine(patch());
     }
 
-    private IEnumerator patch()
+    public void SetPosRotScale()
     {
-        yield return new WaitForSeconds(0.005f);
         if (PosRotScale.PosRotScalePatchList.Count != 0)
         {
             int temp = 0;

Assets/Scripts/UI/LoginPanel.cs

@@ -96,47 +96,24 @@ public class LoginPanel : BaseUI
         //m_SNBtn.onClick.AddListener(OnClickSnBtn);
 
         // OnClickLogin();
+
         if (PlayerPrefs.HasKey("Account") && PlayerPrefs.HasKey("Password"))
         {
             m_AccountStr = PlayerPrefs.GetString("Account", "");
             m_PasswordStr = PlayerPrefs.GetString("Password", "");
-            if (!string.IsNullOrWhiteSpace(m_AccountStr) && !string.IsNullOrWhiteSpace(m_PasswordStr))
-            {
-                m_Account.text = m_AccountStr;
-                m_Password.text = m_PasswordStr;
-                m_Logn.interactable = true;
-            }
-            else
-            {
-                m_Account.text = "";
-                m_Password.text = "";
-                m_AccountStr = "";
-                m_PasswordStr = "";
-                m_Logn.interactable = false;
-            }
         }
-      
-        if(PlayerPrefs.HasKey("IsremPwd"))
+
+        if (PlayerPrefs.HasKey("IsremPwd"))
         {
             int n = int.Parse(PlayerPrefs.GetString("IsremPwd", "0"));
             m_RemenberPwd.isOn = n > 0 ? true : false;
             m_IsRemberPwd = n > 0 ? true : false;
         }
 
-        if (!string.IsNullOrWhiteSpace(m_AccountStr) && !string.IsNullOrWhiteSpace(m_PasswordStr))
-        {
-            m_Account.text = m_AccountStr;
-            m_Password.text = m_PasswordStr;
-            m_Logn.interactable = true;
-        }
-        else
-        {
-            m_Account.text = "";
-            m_Password.text = "";
-            m_AccountStr = "";
-            m_PasswordStr = "";
-            m_Logn.interactable = false;
-        }
+        m_Account.text = m_AccountStr;
+        m_Password.text = m_PasswordStr;
+        m_Logn.interactable = m_IsRemberPwd;
+        m_RemenberPwd.isOn = m_IsRemberPwd;
 
 
     }
@@ -305,14 +282,6 @@ public class LoginPanel : BaseUI
     /// </summary>
     private void OnClickLogin()
     {
-#if UNITY_EDITOR
-        m_AccountStr = "4444@qq.com";
-      //  m_AccountStr = "jiajun.hu@ghz-tech.com";
-       //   m_AccountStr = "advtest1@1.com";
-       // m_AccountStr = "bactest1@1.com";
-       // m_AccountStr = "1768147286@qq.com";
-          m_AccountStr = "advtest1@1.com";
-#endif
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))
         {
@@ -731,26 +700,11 @@ public class LoginPanel : BaseUI
         //m_AccountStr = "test_adv@ghz-tech.com";
         //m_PasswordStr = "123456789";
 
-      
 
         if (PlayerPrefs.HasKey("Account") && PlayerPrefs.HasKey("Password"))
         {
             m_AccountStr = PlayerPrefs.GetString("Account", "");
             m_PasswordStr = PlayerPrefs.GetString("Password", "");
-            if (!string.IsNullOrWhiteSpace(m_AccountStr) && !string.IsNullOrWhiteSpace(m_PasswordStr))
-            {
-                m_Account.text = m_AccountStr;
-                m_Password.text = m_PasswordStr;
-                m_Logn.interactable = true;
-            }
-            else
-            {
-                m_Account.text = "";
-                m_Password.text = "";
-                m_AccountStr = "";
-                m_PasswordStr = "";
-                m_Logn.interactable = false;
-            }
         }
 
         if (PlayerPrefs.HasKey("IsremPwd"))
@@ -759,34 +713,14 @@ public class LoginPanel : BaseUI
             m_RemenberPwd.isOn = n > 0 ? true : false;
             m_IsRemberPwd = n > 0 ? true : false;
         }
-#if UNITY_EDITOR
-           m_AccountStr = "1768147286@qq.com";
-      //  m_AccountStr = "jiajun.hu@ghz-tech.com";
-        m_PasswordStr = "123456Aa";
-#endif
-        //m_AccountStr = "2463951@qq.com";
-        //m_PasswordStr = "123456Aa";
-
-        //m_AccountStr = "6555474@qq.com";
-        //m_PasswordStr = "123456Aa";
 
+        m_Account.text = m_AccountStr;
+        m_Password.text = m_PasswordStr;
+        m_Logn.interactable = m_IsRemberPwd;
         m_RemenberPwd.isOn = m_IsRemberPwd;
 
 
-        if (!string.IsNullOrWhiteSpace(m_AccountStr) && !string.IsNullOrWhiteSpace(m_PasswordStr))
-        {
-            m_Account.text = m_AccountStr;
-            m_Password.text = m_PasswordStr;
-            m_Logn.interactable = true;
-        }
-        else
-        {
-            m_Account.text = "";
-            m_Password.text = "";
-            m_AccountStr = "";
-            m_PasswordStr = "";
-            m_Logn.interactable = false;
-        }
+
     }
 
     private void Update()

Assets/Scripts/UI/SceneChoose.cs

@@ -285,6 +285,8 @@ public class SceneChoose : BaseUI
 
             if (scene.vuforiaXML != null)
             {
+                if(Directory.Exists(Application.persistentDataPath + "/StreamingAssets"))
+                    Directory.Delete(Application.persistentDataPath + "/StreamingAssets");
                 //DownloadData xml = new DownloadData();
                 //string filename = Path.GetFileName(scene.vuforiaXML);
                 //xml.name = filename;

Assets/VuforiaLicense.cs

@@ -1,12 +0,0 @@
-
-            //This class is auto-generated, please do not overwrite
-
-            public class VuforiaLicense
-            {
-const string license = "QVZkYWlmci8vLy8vQUFBQm1UeHROL1pOMEVnK3V1SklPNGlCRDdkc3cyK3k3UEZrL1JUSkllSzU5MVBBUFpGSGpBMFlVWDJweWJpSERaayt4bTBmRnIydExDRFBPd01SOFMvd3hhanVWT1hVWURrR0E4Tmx6UWlOYlNmUXlGU0VGTFM5MlVOck9RTzBkbk13c1RuWktTMFZVaGsrWGg5Yll5NEl2N2xmUThmUHZHNi9EU1EvcWZTcm44SWJac1EzRGwyTW9tTjFWQU81WVBYU1F3akN5WThMbmN1Nlh3Slhmcnhab0R2QkprRERucDVOaVdobHFkaVlpL1pld2FKeXJoQUUxdEltRWtUS1I0QjRidTJWRTFuOHFhWENFRm1SR3RYMlNMWWlDY2h5bHhZWHpZbkY5RHdUbExPVnZZLzN2WG51SjhWUGhhVXRBTTh4SXJrMDcyWkw1bHZCblZKNTA4TEhDNXZ6eldKY0xCSThwRG1TOXA2QmNVMUQ=";
-
-                static string GetLicenseKey()
-                {
-                    return license;
-                }
-            }

Assets/VuforiaLicense.cs.meta

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

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