解决2.2的一些问题

Assets/2.0/Tools/DownLoadItem.cs

@@ -266,16 +266,22 @@ public class DownLoadItem : MonoBehaviour
             isDownLoad = true;
             downLoadState = "下载成功";
 
+            callback?.Invoke(isDownLoad);
+            MsgHandler.RemoveListener(Application.persistentDataPath + "" + downLoadPath, HandleMsg);
         }
         else
         {
-            isDownLoad = true;
+         //   isDownLoad = true;
             downLoadState = "下载失败";
+            StartCoroutine(ReDownloadFileMsg());
         }
-        callback?.Invoke(isDownLoad);
-        MsgHandler.RemoveListener(Application.persistentDataPath + "" + downLoadPath, HandleMsg);
 
     }
+    IEnumerator ReDownloadFileMsg()
+    {
+        yield return null;
+        DownloadFileMsg();
+    }
 
     Dictionary<string, string> requestHeader = new Dictionary<string, string>();  //  header
     public void initHead()

Assets/COSScripts/DownloadResManager.cs

@@ -34,6 +34,14 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
     // Start is called before the first frame update
     void Start()
     {
+        if (File.Exists(Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia.xml"))
+        {
+            File.Delete(Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia.xml");
+        }
+        if (File.Exists(Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia.dat"))
+        {
+            File.Delete(Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia.dat");
+        }
         path = Application.persistentDataPath + "/Material/";
         listNotMaterial = new List<DownLoadMaterial>();
         listFaildMaterial = new List<DownLoadMaterial>();
@@ -61,8 +69,8 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
 
         if (listCompletedMaterial == null)
             listCompletedMaterial = new List<DownLoadMaterial>();
-
-        for (int i = 0; i < listCompletedMaterial.Count; i++)
+        int ct = listCompletedMaterial.Count; 
+        for (int i = ct - 1; i>=0; i--)
         {
             if(!File.Exists(listCompletedMaterial[i].localLoadPath))
             {
@@ -219,7 +227,7 @@ private bool Screen(DownLoadMaterial downloadMaterial)
             }
 
             if((localFilePath.Split('.')[1]=="xml"|| localFilePath.Split('.')[1]=="dat")&&( (localFilePath.Split('.')[1] == Path.GetFileName(listNotMaterial[i].downLoadPath).Split('.')[1])))
-                {
+            {
                 listCompletedMaterial.Add(listNotMaterial[i]);
                 LocalLoadManager.Instance.LocalLoadMaterial(listNotMaterial[i]);
                 listNotMaterial.RemoveAt(i);

Assets/MRNavigatorPro.unity

@@ -725,170 +725,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 75027676}
   m_CullTransparentMesh: 1
---- !u!43 &92726529
-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 &100084576
 GameObject:
   m_ObjectHideFlags: 0
@@ -2411,7 +2247,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 92726529}
+  m_Mesh: {fileID: 1710439311}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2949,6 +2785,7 @@ MonoBehaviour:
   m_IsRuning: 0
   m_UIAnchorsPanel: {fileID: 1180406930700069014}
   EditorToggle: {fileID: 0}
+  theadID: 0
   isShowDownTip: 0
   avplayer: {fileID: 0}
   needSavePosRotScale: 1
@@ -6813,7 +6650,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.005118994
+      value: -0.0023013395
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6943,7 +6780,7 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.001912435
+      value: -0.0037937537
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -7903,6 +7740,170 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 344366729}
   m_PrefabAsset: {fileID: 0}
+--- !u!43 &1710439311
+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 &1719082178
 GameObject:
   m_ObjectHideFlags: 0
@@ -10405,7 +10406,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0012479041
+      value: -0.0012925363
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -14251,7 +14252,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.0051532784}
+  m_AnchoredPosition: {x: 0, y: -0.0023118989}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Assets/Resources/Template/Prefab/yangshi1.prefab

@@ -186,6 +186,7 @@ MonoBehaviour:
   video: {fileID: 4992514377020551806}
   img: {fileID: 1388037075789994784}
   model: {fileID: 2579081798879946333}
+  useObj: {fileID: 0}
 --- !u!1001 &1182857870308325850
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Resources/VuforiaConfiguration.asset

@@ -20,7 +20,7 @@ MonoBehaviour:
     cameraDeviceModeSetting: -1
     maxSimultaneousImageTargets: 1
     virtualSceneScaleFactor: 1
-    modelTargetRecoWhileExtendedTracked: 1
+    modelTargetRecoWhileExtendedTracked: 0
     shareRecordingsInITunes: 0
     logLevel: 0
     version: 10.13.3
@@ -39,7 +39,7 @@ MonoBehaviour:
     unlitShader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
     videoBackgroundEnabled: 1
   deviceTracker:
-    autoStartTracker: 1
+    autoStartTracker: 0
     arcoreRequirement: 1
     autoImportArcore: 1
     thirdPartyARCoreClientDetected: 1

Assets/Scripts/UI/EdirPanel/UIEditorPanel.cs

@@ -295,6 +295,7 @@ public class UIEditorPanel : AbstractController, EventObserver
     private void SplitSpoitData(SpoitValue spoit,int spoitCount)
     {
         countSplit++;
+     //   GameManager.Instance.UpdateSpoitValue();
         SendSaveData data = new SendSaveData();
         data.id = GameManager.Instance.SpoitsValueDetail[spoit.id].id;
         data.name = GameManager.Instance.SpoitsValueDetail[spoit.id].name;
@@ -302,6 +303,12 @@ public class UIEditorPanel : AbstractController, EventObserver
         data.material = spoit.material;
         data.spoittf = GameManager.Instance.SpoitsValueDetail[spoit.id].spoitTf;
         data.position = GameManager.Instance.SpoitsValueDetail[spoit.id].position;
+        data.spoittf.nowPos = GameManager.Instance.spoitposObjDic[spoit.id].transform.localPosition - GameManager.Instance.spoitposDic[spoit.id];
+        Debug.Log("最新保存====》保存的POS" + data.spoittf.nowPos);
+        Debug.Log("最新保存====》物體的POS" + GameManager.Instance.spoitposObjDic[spoit.id].transform.localPosition);
+        Debug.Log("最新保存====》原始的POS" + GameManager.Instance.spoitposDic[spoit.id]);
+        data.spoittf.nowRot = GameManager.Instance.spoitposObjDic[spoit.id].transform.localEulerAngles;
+        data.spoittf.nowScale = GameManager.Instance.spoitposObjDic[spoit.id].transform.localScale;
         data.triggerImageId = GameManager.Instance.SpoitsValueDetail[spoit.id].triggerImageId;
         data.triggerRange = GameManager.Instance.SpoitsValueDetail[spoit.id].triggerRange;
 

Assets/Scripts/UI/EdirPanel/UIMaterialsPanel.cs

@@ -173,6 +173,8 @@ public class UIMaterialsPanel : UIPanelBase, EventObserver
                 item.gameObject.SetActive(true);
                 item.transform.localScale = new Vector3(1, 1, 1);
                 item.transform.localRotation = Quaternion.identity;
+
+                Debug.Log("objvalue.ChildrenObj===》"+objvalue.ChildrenObj.Count);
                 item.SetData(matObj[m], objvalue.ChildrenObj[m]);
             }
         }

Assets/Scripts/UI/GameManager.cs

@@ -1268,29 +1268,39 @@ public class GameManager : MonoSingleton<GameManager>
             Debug.LogFormat("{0}{1}", spoit.name, "景点不存在");
         }
     }
-
+    public Dictionary<int, Vector3> spoitposDic = new Dictionary<int, Vector3>();
+    public Dictionary<int, GameObject> spoitposObjDic = new Dictionary<int, GameObject>();
     private GameObject CreateSpoit(SpoitValue spoit, Vector3 spoitPos)
     {
         //生成景点父物体
         GameObject spoitObj = new GameObject(spoit.name);
         spoitObj.transform.SetParent(ObjsParent.transform);
         spoitObj.AddComponent<EditorEventHandler>().IsClickEditor = false;
-
-
+        spoitposObjDic.Add(spoit.id, spoitObj);
+        /*
         //为景点位置信息赋值
         if (spoit.spoitTf.startPos == Vector3.zero && spoit.spoitTf.nowPos == Vector3.zero)
-        {
-            spoitObj.transform.localPosition = new Vector3(spoitPos.x, 0.5f, spoitPos.z);
+        {*/
+            spoitposDic.Add(spoit.id, new Vector3(spoitPos.x, 0.5f, spoitPos.z));
+            spoitObj.transform.localPosition = new Vector3(spoitPos.x, 0.5f, spoitPos.z)+ spoit.spoitTf.nowPos;
+            Debug.Log("最新保存====》獲取的POS" + new Vector3(spoitPos.x, 0.5f, spoitPos.z));
+            Debug.Log("最新保存====》獲取的偏移POS" + spoit.spoitTf.nowPos);
+            Debug.Log("最新保存====》獲取的物體Pos" + spoitObj.transform.localPosition);
             spoitObj.transform.localRotation = Quaternion.identity;
+            spoitObj.transform.localEulerAngles = spoit.spoitTf.nowRot;
             spoitObj.transform.localScale = new Vector3(1, 1, 1);
+            if(spoit.spoitTf.nowScale!=Vector3.zero)
+            {
+                spoitObj.transform.localScale = spoit.spoitTf.nowScale;
+            }
             spoit.spoitTf.SetStartValue(spoitObj.transform.localPosition, spoitObj.transform.localEulerAngles, spoitObj.transform.localScale);
-        }
+       /* }
         else
         {
             spoitObj.transform.localPosition = spoit.spoitTf.nowPos;
             spoitObj.transform.localEulerAngles = spoit.spoitTf.nowRot;
             spoitObj.transform.localScale = spoit.spoitTf.nowScale;
-        }
+        }*/
 
         return spoitObj;
     }
@@ -1366,7 +1376,8 @@ public class GameManager : MonoSingleton<GameManager>
             spoit.material[i] = newmaterial;
             spoitValue.ChildrenObj.AddRange(objsvalue);
             spoitValues.ChildrenObj.Add(spoitValue);
-        }
+                    Debug.Log("DGJ ===> 创建整体素材  " + spoitValues.ChildrenObj.Count);
+                }
 
 
             SV = spoit;
@@ -1926,29 +1937,34 @@ public class GameManager : MonoSingleton<GameManager>
     /// </summary>
     public void UpdateSpoitValue()
     {
-        var spoit = SpoitValues[SpoitIndex];
-        var objvalues = ObjectValues[spoit.id];
-        spoit.spoitTf.SavePos(objvalues.nowPos, objvalues.nowRot, objvalues.nowScale);
-        //X\Y\W\H
-        var collidervalue = ColliderObjectValues[SpoitIndex];
-        var collider = collidervalue.Object;
-
-        var pos = collidervalue.nowPos;
-        var w = collidervalue.nowScale.x;
-        var h = collidervalue.nowScale.z;
-
+        if(SpoitValues!=null&& SpoitValues.Count> SpoitIndex&& SpoitIndex!=-1)
+        {
+            Debug.Log("SpoitValues====>"+SpoitValues.Count+" _  "+ SpoitIndex);
+            var spoit = SpoitValues[SpoitIndex];
+            var objvalues = ObjectValues[spoit.id];
+            spoit.spoitTf.SavePos(objvalues.nowPos, objvalues.nowRot, objvalues.nowScale);
+            //X\Y\W\H
+            var collidervalue = ColliderObjectValues[SpoitIndex];
+            var collider = collidervalue.Object;
 
-        var webpos = new Vector3(Math.Abs(pos.x) / MapSize.x * WebMapSize.x, 0, Math.Abs(pos.z) / MapSize.y * WebMapSize.y);
-        var webw = w / MapSize.x * WebMapSize.x;
-        var webh = h / MapSize.y * WebMapSize.y;
-        spoit.SpoitTransform[0].areaRelativeX = webpos.x;
-        spoit.SpoitTransform[0].areaRelativeY = webpos.z;
-        spoit.SpoitTransform[0].areaRelativeW = webw;
-        spoit.SpoitTransform[0].areaRelativeH = webh;
+            var pos = collidervalue.nowPos;
+            var w = collidervalue.nowScale.x;
+            var h = collidervalue.nowScale.z;
 
-        spoit.spoitTf.SavePos(objvalues.nowPos, objvalues.nowRot, objvalues.nowScale);
 
+            var webpos = new Vector3(Math.Abs(pos.x) / MapSize.x * WebMapSize.x, 0, Math.Abs(pos.z) / MapSize.y * WebMapSize.y);
+            var webw = w / MapSize.x * WebMapSize.x;
+            var webh = h / MapSize.y * WebMapSize.y;
+            spoit.SpoitTransform[0].areaRelativeX = webpos.x;
+            spoit.SpoitTransform[0].areaRelativeY = webpos.z;
+            spoit.SpoitTransform[0].areaRelativeW = webw;
+            spoit.SpoitTransform[0].areaRelativeH = webh;
 
+            spoit.spoitTf.SavePos(objvalues.nowPos, objvalues.nowRot, objvalues.nowScale);
+            SpoitValues[SpoitIndex] = spoit;
+        }
+        return;
+        /*
         if (objvalues.Object == null)
         {
             RemoveSpoitObjectValue(spoit.id);
@@ -1990,7 +2006,7 @@ public class GameManager : MonoSingleton<GameManager>
                 }
             }
         }
-        SpoitValues[SpoitIndex] = spoit;
+        SpoitValues[SpoitIndex] = spoit;*/
 
     }