修复2.0编辑的一些BUG

Assets/2.0/Tools/DownLoadItem.cs

@@ -242,7 +242,7 @@ public class DownLoadItem : MonoBehaviour
 
     public void DownloadFileMsg()
     {
-        Debug.Log("查询需要下载的updateTime"+updateTime);
+        Debug.Log("查询需要下载的updateTime"+updateTime  + downLoadPath);
         MsgHandler.AddListener(downLoadPath, HandleMsg);
         DownLoadMaterial data = new DownLoadMaterial();
         data.downLoadPath = downLoadPath;

Assets/2.0/User/Model/ModelItem.cs

@@ -198,42 +198,7 @@ public class ModelItem
         url = DownloadPath;
         Debug.Log(url);
         this.modelList = modelList;
-        BoundingBox bb = modelList.GetComponent<BoundingBox>();
-        if (!bb)
-        {
-            bb= modelList.AddComponent<BoundingBox>();
-            bb.FlattenAxis = BoundingBox.FlattenModeType.FlattenZ;
-            bb.ActiveHandle = BoundingBox.HandleType.Rotation | BoundingBox.HandleType.Scale;
-            modelList.AddComponent<NearInterationGrabbable>();
-            modelList.AddComponent<ManipulationHandler>();
-        }
 
-        if (itemI==null)
-        {
-            itemI = TimerMgr.Instance.CreateTimer(() => {
-                BoxCollider bc = modelList.GetComponent<BoxCollider>();
-                if (!bc)
-                {
-                    bc = modelList.AddComponent<BoxCollider>();
-                    bc.size = new Vector3(bc.size.x,bc.size.y,0.01f);
-                }
-                ManipulationHandler mh = modelList.GetComponent<ManipulationHandler>();
-                if (!mh)
-                    mh = modelList.AddComponent<ManipulationHandler>();
-                BoundingBox bb = modelList.GetComponent<BoundingBox>();
-                if (!bb)
-                    bb = modelList.AddComponent<BoundingBox>();
-                bb.enabled = GameManager.m_IsStartEditorzu;
-                if (modelList.transform.Find("BoundingBox") && modelList.transform.Find("BoundingBox").gameObject != null)
-                    modelList.transform.Find("BoundingBox").gameObject.SetActive(GameManager.m_IsStartEditorzu);
-                if (bc)
-                {
-                    bc.enabled = GameManager.m_IsStartEditorzu;
-                }
-                if (mh)
-                    mh.enabled = GameManager.m_IsStartEditorzu;
-            }, 1, -1);
-        }
         if (Version == null)
             Version = Application.version.ToString();
         init();
@@ -299,6 +264,7 @@ public class ModelItem
         {
             case ModelType.Text:
             prefabModel.GetComponent<TemplateText>().SetData(textContent, TextBJ);
+                Debug.Log(" ddddddddddddddddddddd"+prefabModel.name);
             break;
             default:
                 break;

Assets/2.0/User/Spots/SpotsItem.cs

@@ -93,22 +93,79 @@ public class SpotsItem
                 }, 0.1f,10);
                 if(!isInitModel)
                 {
-                    foreach(var ml in modelList.Values)
+                     Dictionary<string, ModelList> NewmodelList = new Dictionary<string, ModelList>();
+                    foreach (var mlkeys in modelList.Keys)
                     {
+                        ModelList ml = modelList[mlkeys];
                         ml._model = GameObject.Instantiate<GameObject>(ml.Model);
+                        NewmodelList.Add(mlkeys, ml);
                         for (int i = 0; i < ml.materialList.Count; i++)
                         {
-                            if (ml.materialList[i]._model)
+                            if (ml._model.transform.GetChild(0).GetComponent<YangShiManager>())
+                            {
+                                if (ml.materialList[i]._model)
+                                {
+
+                                    ml.materialList[i]._model = ml._model.transform.GetChild(0).GetComponent<YangShiManager>().yangshiList[i].useObj;
+                                    ml.materialList[i].prefabModel = ml.materialList[i]._model;
+                                }else
+                                {
+
+                                    ml.materialList[i]._model = ml._model.transform.GetChild(0).GetComponent<YangShiManager>().yangshiText.gameObject;
+                                    ml.materialList[i].prefabModel = ml.materialList[i]._model;
+                                }
+                            }
+                            else
                             {
                                 ml.materialList[i]._model = ml._model.transform.GetChild(i).gameObject;
-                                ml.materialList[i].prefabModel = ml.materialList[i]._model;
-                                ml.materialList[i]._model.SetActive(true);
+                                ml.materialList[i].prefabModel = ml._model.transform.GetChild(i).gameObject;
                             }
                         }
                         ml.Model.SetActive(true);
                         ml.Model.transform.parent = _spotsObj.transform;
+                        GameObject modelList2 = ml.Model;
+                        BoundingBox bb = modelList2.GetComponent<BoundingBox>();
+                        if (bb)
+                        {
+                            GameObject.Destroy(bb);
+                        }
+                        NearInterationGrabbable ng = modelList2.GetComponent<NearInterationGrabbable>();
+                        if (ng)
+                        {
+                            GameObject.Destroy(ng);
+                        }
+                        ManipulationHandler mh = modelList2.GetComponent<ManipulationHandler>();
+                        if (mh)
+                        {
+                            GameObject.Destroy(mh);
+                        }
+                        BoxCollider bc = modelList2.GetComponent<BoxCollider>();
+                        if (!bc)
+                        {
+                            bc = modelList2.AddComponent<BoxCollider>();
+                            bc.size = new Vector3(bc.size.x, bc.size.y, 0.01f);
+                        }
+                        bb = modelList2.AddComponent<BoundingBox>();
+                        bb.FlattenAxis = BoundingBox.FlattenModeType.FlattenZ;
+                        bb.ActiveHandle = BoundingBox.HandleType.Rotation | BoundingBox.HandleType.Scale;
+                        modelList2.AddComponent<NearInterationGrabbable>();
+                        modelList2.AddComponent<ManipulationHandler>();
+                        TimerMgr.Instance.CreateTimer(() => {
+                                
+                                bb.enabled = GameManager.m_IsStartEditorzu;
+                                if (modelList2.transform.Find("BoundingBox") && modelList2.transform.Find("BoundingBox").gameObject != null)
+                                    modelList2.transform.Find("BoundingBox").gameObject.SetActive(GameManager.m_IsStartEditorzu);
+                                if (bc)
+                                {
+                                    bc.enabled = GameManager.m_IsStartEditorzu;
+                                }
+                                if (mh)
+                                    mh.enabled = GameManager.m_IsStartEditorzu;
+                            }, 1, -1);
+
                         ml.initModelObj();
                     }
+                    modelList = NewmodelList;
                     isInitModel = true;
                 }
             }

Assets/ImmersalSDK/Core/Scripts/AR/ARSpace.cs

@@ -254,7 +254,11 @@ namespace Immersal.AR
             {
                 Transform tr = spaceToTransform[space];
         		tr.SetPositionAndRotation(pos, rot);
-                //tr.eulerAngles = new Vector3(tr.eulerAngles.x-90,tr.eulerAngles.y,tr.eulerAngles.z);
+                tr.eulerAngles = new Vector3(0,tr.eulerAngles.y,0);
+                if(tr.position.y>0.5f)
+                {
+                    tr.position = new Vector3(tr.position.x, 0.5f, tr.position.z);
+                }
             }
 		}
     }

Assets/MRNavigatorPro.unity

@@ -1091,6 +1091,170 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!43 &185968220
+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 &197044968
 GameObject:
   m_ObjectHideFlags: 0
@@ -2247,7 +2411,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 1053928561}
+  m_Mesh: {fileID: 185968220}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4566,170 +4730,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1048479801}
   m_PrefabAsset: {fileID: 0}
---- !u!43 &1053928561
-Mesh:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 10
-  m_SubMeshes:
-  - serializedVersion: 2
-    firstByte: 0
-    indexCount: 0
-    topology: 5
-    baseVertex: 0
-    firstVertex: 0
-    vertexCount: 0
-    localAABB:
-      m_Center: {x: 0, y: 0, z: 0}
-      m_Extent: {x: 0, y: 0, z: 0}
-  m_Shapes:
-    vertices: []
-    shapes: []
-    channels: []
-    fullWeights: []
-  m_BindPose: []
-  m_BoneNameHashes: 
-  m_RootBoneNameHash: 0
-  m_BonesAABB: []
-  m_VariableBoneCountWeights:
-    m_Data: 
-  m_MeshCompression: 0
-  m_IsReadable: 1
-  m_KeepVertices: 0
-  m_KeepIndices: 0
-  m_IndexFormat: 1
-  m_IndexBuffer: 
-  m_VertexData:
-    serializedVersion: 3
-    m_VertexCount: 0
-    m_Channels:
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    m_DataSize: 0
-    _typelessdata: 
-  m_CompressedMesh:
-    m_Vertices:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UV:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Normals:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Tangents:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Weights:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_NormalSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_TangentSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_FloatColors:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_BoneIndices:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Triangles:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UVInfo: 0
-  m_LocalAABB:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
-  m_MeshUsageFlags: 0
-  m_BakedConvexCollisionMesh: 
-  m_BakedTriangleCollisionMesh: 
-  m_MeshMetrics[0]: 1
-  m_MeshMetrics[1]: 1
-  m_MeshOptimizationFlags: 1
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
 --- !u!114 &1065976460 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7931960824797962037, guid: 73594541ba5ecf84680e516628f9f8a8,
@@ -6813,7 +6813,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0051041385
+      value: -0.00508881
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6943,37 +6943,37 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0019273536
+      value: -0.0018824529
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -101.5
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714058937656, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6983,62 +6983,62 @@ PrefabInstance:
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -35.5
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -35.5
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3e8996c442fe40541beb734ca45f2bf6, type: 3}
@@ -10405,7 +10405,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.0018398619
+      value: -0.0012375291
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -14251,7 +14251,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.005119532}
+  m_AnchoredPosition: {x: 0, y: -0.005093407}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Assets/Scripts/Blue/Patch/Patch_ModelController.cs

@@ -106,6 +106,8 @@ public class Patch_ModelController : AbstractController
                 else
                 {
                     boundingBox.enabled = true;
+                    if (transform.Find("BoundingBox") && transform.Find("BoundingBox").gameObject != null)
+                        transform.Find("BoundingBox").gameObject.SetActive(true);
                 }
 
                 if (boxCollider != null)

Assets/Scripts/Blue/Patch/Video/Patch_VideoController.cs

@@ -114,6 +114,8 @@ public class Patch_VideoController : AbstractController
                 else
                 {
                     boundingBox.enabled = true;
+                    if (transform.Find("BoundingBox") && transform.Find("BoundingBox").gameObject != null)
+                        transform.Find("BoundingBox").gameObject.SetActive(true);
                 }
 
                 if (boxCollider != null)

Assets/Scripts/PlayerTrigger.cs

@@ -74,7 +74,7 @@ public class PlayerTrigger : MonoBehaviour
                 HttpSocket.Instance.SendIpToPointPos(pos, (message) =>
                 {
                 });
-            }else if(GameManager.Instance.IsRuning && UserInfo.Instance.is20 && times > 14 && DataManager.Instance.ProjectID != 0)
+            }else if(UserInfo.Instance.is20 && times > 14 && DataManager.Instance.ProjectID != 0)
             {
                 times = 0;
 

Assets/Scripts/UI/GameManager.cs

@@ -1090,8 +1090,8 @@ public class GameManager : MonoSingleton<GameManager>
             //}
 
             //var tiggerpos = new Vector3((float)trans.areaRelativeX / WebMapSize.x * MapSize.x, -0.5f, -(float)trans.areaRelativeY / WebMapSize.y * MapSize.y);
-            var tiggerpos = new Vector3((float)(trans.areaRelativeX + trans.areaRelativeW / 2) / WebMapSize.x * MapSize.x, -0.5f, -(float)(trans.areaRelativeY + trans.areaRelativeH / 2) / WebMapSize.y * MapSize.y);
-            var tiggerRange = new Vector3((float)trans.areaRelativeW / WebMapSize.x * MapSize.x, 0.1f, (float)trans.areaRelativeH / WebMapSize.y * MapSize.y);
+            var tiggerpos = new Vector3((float)(trans.areaRelativeX + trans.areaRelativeW / 2) / WebMapSize.x * MapSize.x, -0.5f, MapSize.y - (float)(trans.areaRelativeY + trans.areaRelativeH / 2) / WebMapSize.y * MapSize.y);
+            var tiggerRange = new Vector3((float)trans.areaRelativeW / WebMapSize.x * MapSize.x, 0.1f, MapSize.y-(float)trans.areaRelativeH / WebMapSize.y * MapSize.y);
             var triggerobj = Instantiate(ColliderItem, CollidersParent);
             triggerobj.name = spoit.name;
             triggerobj.transform.localPosition = tiggerpos;

Assets/YangShiItem.cs

@@ -8,8 +8,10 @@ public class YangShiItem : MonoBehaviour
     public GameObject img;
     public GameObject model;
 
+    public GameObject useObj;
     public GameObject showvideo()
     {
+        useObj = video;
         video.gameObject.SetActive(true);
         img.gameObject.SetActive(false);
         model.gameObject.SetActive(false);
@@ -17,6 +19,7 @@ public class YangShiItem : MonoBehaviour
     }
     public GameObject showimg()
     {
+        useObj = img;
         video.gameObject.SetActive(false);
         img.gameObject.SetActive(true);
         model.gameObject.SetActive(false);
@@ -24,6 +27,7 @@ public class YangShiItem : MonoBehaviour
     }
     public GameObject showmodel()
     {
+        useObj = model;
 
         video.gameObject.SetActive(false);
         img.gameObject.SetActive(false);
@@ -33,7 +37,7 @@ public class YangShiItem : MonoBehaviour
 
     public void Close()
     {
-
+        useObj = null;
         video.gameObject.SetActive(false);
         img.gameObject.SetActive(false);
         model.gameObject.SetActive(false);