修复部分BUG

Assets/2.0/Tools/DownLoadItem.cs

@@ -269,8 +269,6 @@ public class DownLoadItem : MonoBehaviour
         }
         else
         {
-            Debug.LogError("下载失败==："+downLoadPath);
-            UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), downLoadPath+"下载失败");
             isDownLoad = true;
             downLoadState = "下载失败";
         }

Assets/2.0/User/Model/ModelItem.cs

@@ -157,6 +157,7 @@ public class ModelItem
     public int fileId { get; set; }
     public int id { get; set; }
 
+    Timer itemI;
     public void init(GameObject modelList)
     {
         switch (type)
@@ -184,10 +185,10 @@ public class ModelItem
         url = DownloadPath;
         Debug.Log(url);
         this.modelList = modelList;
-
-        if (!modelList.GetComponent<BoundingBox>())
+        BoundingBox bb = modelList.GetComponent<BoundingBox>();
+        if (!bb)
         {
-            BoundingBox bb = modelList.AddComponent<BoundingBox>();
+            bb= modelList.AddComponent<BoundingBox>();
             bb.FlattenAxis = BoundingBox.FlattenModeType.FlattenZ;
             bb.ActiveHandle = BoundingBox.HandleType.Rotation | BoundingBox.HandleType.Scale;
             modelList.AddComponent<NearInterationGrabbable>();
@@ -197,9 +198,32 @@ public class ModelItem
             ob.transform.localEulerAngles = Vector3.zero;
             ob.transform.localScale = Vector3.one;
             ob.SetActive(false);
-            TimerMgr.Instance.CreateTimer(() => {
-                ob.SetActive(GameManager.Instance.IsStartEditor);
-                bb.enabled = GameManager.Instance.IsStartEditor;
+        }
+
+        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)

Assets/2.0/User/Model/ModelList.cs

@@ -482,23 +482,6 @@ public class ModelList: System.ICloneable
         {
             _model.transform.localEulerAngles = getInfoPos();
         }
-        if (!_model.GetComponent<BoundingBox>())
-        {
-            BoundingBox bb = _model.AddComponent<BoundingBox>();
-            bb.FlattenAxis = BoundingBox.FlattenModeType.FlattenZ;
-            bb.ActiveHandle = BoundingBox.HandleType.Rotation | BoundingBox.HandleType.Scale;
-            _model.AddComponent<NearInterationGrabbable>();
-            _model.AddComponent<ManipulationHandler>();
-            GameObject ob =GameObject.Instantiate( Resources.Load<GameObject>("Template/Prefab/Tip"),_model.transform);
-            ob.transform.localPosition = new Vector3(0, -0.3f, 0);// Vector3.zero;
-            ob.transform.localEulerAngles = Vector3.zero;
-            ob.transform.localScale = Vector3.one;
-            ob.SetActive(false);
-            TimerMgr.Instance.CreateTimer(()=> { 
-                    ob.SetActive(GameManager.m_IsStartEditorzu);
-                bb.enabled = GameManager.m_IsStartEditorzu;
-            },1,-1);
-        }
         // _model.transform.localPosition = getInfoPos();
         //  _model.transform.localEulerAngles = getInfoEul();
     }

Assets/2.0/User/UserScene/UserSceneManager.cs

@@ -121,6 +121,7 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
                         si.SpotsObj.transform.localScale = Vector3.one;
                     }
                     si.updateTime = msg["listSpoit"][i]["updateTime"].ToString();
+                    si.triggerImageId =int.Parse( msg["listSpoit"][i]["triggerImageId"].ToString());
                     if ( msg["listSpoit"][i].Keys.Contains("triggerImage"))
                         si.triggerImage = msg["listSpoit"][i]["triggerImage"].ToString();
                     if(msg["listSpoit"][i]["material"]!=null&& msg["listSpoit"][i]["material"].IsArray)

Assets/MRNavigatorPro.unity

@@ -1612,170 +1612,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 275096928}
   m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!43 &278014125
-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: 278014125}
+  m_Mesh: {fileID: 439122559}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2482,6 +2318,170 @@ Transform:
   m_Father: {fileID: 210725851}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!43 &439122559
+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 &493550942 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 3134174762876500542, guid: 697420e71aa8bea4b938e2f3986965a6,
@@ -2952,6 +2952,9 @@ MonoBehaviour:
   isShowDownTip: 0
   avplayer: {fileID: 0}
   needSavePosRotScale: 1
+  sc3D20zuJD: {fileID: 1782637209}
+  sc3D20zuEditor: {fileID: 630007992}
+  sc3Dopen20zu: {fileID: 1567377504}
   SaveButton: {fileID: 1931320905}
 --- !u!4 &588301977
 Transform:
@@ -3242,6 +3245,18 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 630007989}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &630007992 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
+    type: 3}
+  m_PrefabInstance: {fileID: 630007989}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9d8c0c92afac4a148b6f3f99678da806, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &647507121 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8030973376965847205, guid: 7e724082e3f166747b1152780155e212,
@@ -6798,7 +6813,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0051048356
+      value: -0.005145443
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6928,7 +6943,7 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0019229886
+      value: -0.0018900792
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -7326,6 +7341,18 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1567377501}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &1567377504 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
+    type: 3}
+  m_PrefabInstance: {fileID: 1567377501}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9d8c0c92afac4a148b6f3f99678da806, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1581693244 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8030973376965847205, guid: 7e724082e3f166747b1152780155e212,
@@ -8179,6 +8206,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1778699410}
   m_CullTransparentMesh: 0
+--- !u!114 &1782637209 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
+    type: 3}
+  m_PrefabInstance: {fileID: 1346853077}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9d8c0c92afac4a148b6f3f99678da806, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1797779334
 GameObject:
   m_ObjectHideFlags: 0
@@ -9342,6 +9381,7 @@ GameObject:
   - component: {fileID: 1931320909}
   - component: {fileID: 1931320908}
   - component: {fileID: 1931320907}
+  - component: {fileID: 1931320910}
   m_Layer: 0
   m_Name: Canvas
   m_TagString: Untagged
@@ -9431,6 +9471,18 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
+--- !u!114 &1931320910
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1931320905}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 948b9ab040508dc48a294230f85b39e2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1942196189
 GameObject:
   m_ObjectHideFlags: 0
@@ -10353,7 +10405,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0012723476
+      value: -0.0012788516
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -14199,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.0051641306}
+  m_AnchoredPosition: {x: 0, y: -0.0051639667}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Assets/Resources/Template/Prefab/Model.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 3528169654842172380}
   - component: {fileID: 2730452126022077698}
   - component: {fileID: 8336077329453702976}
+  - component: {fileID: 1667173426323438671}
   m_Layer: 0
   m_Name: Model
   m_TagString: Untagged
@@ -28,6 +29,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -51,10 +53,12 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -79,3 +83,19 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!114 &1667173426323438671
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1680760298263809534}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 25a17a30a2296954d9bfa8febecdcd29, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  boundingBox: {fileID: 0}
+  manipulationHandler: {fileID: 0}
+  boxCollider: {fileID: 0}

Assets/Resources/Template/Prefab/Text.prefab

@@ -334,8 +334,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.6356422, y: 0.14300746, z: 0.009999998}
-  m_Center: {x: -0.00073832273, y: -0.013667971, z: 0.02}
+  m_Size: {x: 0.6356422, y: 0.14300746, z: 0.048570186}
+  m_Center: {x: -0.00073832273, y: -0.013667971, z: 0.0007149046}
 --- !u!114 &183926529109974472
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scripts/BaseManager/DataManager.cs

@@ -229,6 +229,8 @@ public class SendSaveDataNew
     /// 触发范围
     /// </summary>
     public SpoitPos triggerRange { get; set; }
+
+    public int triggerImageId;
 }
 
 public class SendSaveData

Assets/Scripts/Blue/Patch/Patch_ModelController.cs

@@ -7,47 +7,113 @@ public class Patch_ModelController : AbstractController
 {
     [SerializeField] private BoundingBox boundingBox;
     [SerializeField] private ManipulationHandler manipulationHandler;
+    [SerializeField] private BoxCollider boxCollider;
     void Start()
     {
-        if (GetComponent<ManipulationHandler>() != null)
+        boundingBox = GetComponent<BoundingBox>();
+        manipulationHandler = GetComponent<ManipulationHandler>();
+        boxCollider = GetComponent<BoxCollider>();
+        if (manipulationHandler != null)
         {
-            Destroy(manipulationHandler);
+            manipulationHandler.enabled = false;
         }
 
-        if (GetComponent<BoundingBox>() != null)
+        if (boundingBox != null)
         {
-            Destroy(boundingBox);
+            boundingBox.enabled = false;
         }
 
-        toggle = GameObject.Find("SetBtn/2.1/Canvas/Parent/EditorBtn/Toggle").GetComponent<Toggle>();
+        if (boxCollider != null)
+        {
+            boxCollider.enabled = false;
+        }
+        if (GameObject.Find("SetBtn/2.1/Canvas/Parent/EditorBtn/Toggle"))
+            toggle = GameObject.Find("SetBtn/2.1/Canvas/Parent/EditorBtn/Toggle").GetComponent<Toggle>();
     }
 
     private Toggle toggle;
 
     private void Update()
     {
-        if(!toggle.isOn)
+        if (toggle && !UserInfo.Instance.is20)
         {
-            if(manipulationHandler!=null)
-                Destroy(manipulationHandler);
-            if (boundingBox != null)
+            if (!toggle.isOn)
+            {
+                if (manipulationHandler != null)
+                    Destroy(manipulationHandler);
+                if (boundingBox != null)
+                {
+                    Destroy(boundingBox);
+                    if (transform.Find("BoundingBox").gameObject != null)
+                        Destroy(transform.Find("BoundingBox").gameObject);
+                }
+                if (boxCollider != null)
+                    boxCollider.enabled = false;
+            }
+            else
             {
-                Destroy(boundingBox);
-                if (transform.Find("BoundingBox").gameObject != null)
-                    Destroy(transform.Find("BoundingBox").gameObject);
+                if (manipulationHandler == null)
+                {
+                    manipulationHandler = gameObject.AddComponent<ManipulationHandler>();
+                }
+                if (boundingBox == null)
+                {
+                    boundingBox = gameObject.AddComponent<BoundingBox>();
+                    boundingBox.FlattenAxis = FlattenModeType.DoNotFlatten;
+                    boundingBox.ActiveHandle = HandleType.Rotation | HandleType.Scale;
+                }
+                if (boxCollider != null)
+                    boxCollider.enabled = true;
+                else
+                {
+                    boxCollider = gameObject.AddComponent<BoxCollider>();
+                }
             }
+
         }
-        else
+        else if (UserInfo.Instance.is20)
         {
-            if (manipulationHandler == null)
+
+            if (!GameManager.m_IsStart20Editor)
             {
-                manipulationHandler = gameObject.AddComponent<ManipulationHandler>();
+                if (manipulationHandler != null)
+                    manipulationHandler.enabled = false;
+                if (boundingBox != null)
+                {
+                    boundingBox.enabled = false;
+                    if (transform.Find("BoundingBox") && transform.Find("BoundingBox").gameObject != null)
+                        transform.Find("BoundingBox").gameObject.SetActive(false);
+                }
+                if (boxCollider != null)
+                    boxCollider.enabled = false;
             }
-            if (boundingBox == null)
+            else
             {
-                boundingBox = gameObject.AddComponent<BoundingBox>();
-                boundingBox.FlattenAxis = FlattenModeType.DoNotFlatten;
-                boundingBox.ActiveHandle = HandleType.Rotation | HandleType.Scale;
+                if (manipulationHandler == null)
+                {
+                    manipulationHandler = gameObject.AddComponent<ManipulationHandler>();
+                }
+                else
+                {
+                    manipulationHandler.enabled = true;
+                }
+                if (boundingBox == null)
+                {
+                    boundingBox = gameObject.AddComponent<BoundingBox>();
+                    boundingBox.FlattenAxis = FlattenModeType.DoNotFlatten;
+                    boundingBox.ActiveHandle = HandleType.Rotation | HandleType.Scale;
+                }
+                else
+                {
+                    boundingBox.enabled = true;
+                }
+
+                if (boxCollider != null)
+                    boxCollider.enabled = true;
+                else
+                {
+                    boxCollider = gameObject.AddComponent<BoxCollider>();
+                }
             }
         }
     }

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

@@ -7,26 +7,35 @@ public class Patch_VideoController : AbstractController
 {
     [SerializeField] private BoundingBox boundingBox;
     [SerializeField] private ManipulationHandler manipulationHandler;
+    [SerializeField] private BoxCollider boxCollider;
 
     void Start()
     {
-        if (GetComponent<ManipulationHandler>() != null)
+        boundingBox = GetComponent<BoundingBox>();
+        manipulationHandler = GetComponent<ManipulationHandler>();
+        boxCollider = GetComponent<BoxCollider>();
+        if (manipulationHandler != null)
         {
-            GetComponent<ManipulationHandler>().enabled = false;
+            manipulationHandler.enabled = false;
         }
 
-        if (GetComponent<BoundingBox>() != null)
+        if (boundingBox != null)
         {
-            GetComponent<BoundingBox>().enabled = false;
+            boundingBox.enabled = false;
         }
-        if(GameObject.Find("SetBtn/2.1/Canvas/Parent/EditorBtn/Toggle"))
+
+        if (boxCollider != null)
+        {
+            boxCollider.enabled = false;
+        }
+        if (GameObject.Find("SetBtn/2.1/Canvas/Parent/EditorBtn/Toggle"))
         toggle = GameObject.Find("SetBtn/2.1/Canvas/Parent/EditorBtn/Toggle").GetComponent<Toggle>();
     }
 
     private Toggle toggle;
     private void Update()
     {
-        if(toggle)
+        if(toggle&&!UserInfo.Instance.is20)
         {
             if (!toggle.isOn)
             {
@@ -38,6 +47,8 @@ public class Patch_VideoController : AbstractController
                     if (transform.Find("BoundingBox")&&transform.Find("BoundingBox").gameObject != null)
                         transform.Find("BoundingBox").gameObject.SetActive(false);
                 }
+                if (boxCollider != null)
+                    boxCollider.enabled = false;
             }
             else
             {
@@ -58,8 +69,66 @@ public class Patch_VideoController : AbstractController
                 {
                     boundingBox.enabled = true;
                 }
+
+
+                if (boxCollider != null)
+                    boxCollider.enabled = true;
+                else
+                {
+                    boxCollider = gameObject.AddComponent<BoxCollider>();
+                }
             }
 
+        }else if(UserInfo.Instance.is20)
+        {
+
+            if (!GameManager.m_IsStart20Editor)
+            {
+                if (manipulationHandler != null)
+                    manipulationHandler.enabled = false;
+                if (boundingBox != null)
+                {
+                    boundingBox.enabled = false;
+                    if (transform.Find("BoundingBox") && transform.Find("BoundingBox").gameObject != null)
+                        transform.Find("BoundingBox").gameObject.SetActive(false);
+                }
+                if (boxCollider != null)
+                    boxCollider.enabled = false;
+            }
+            else
+            {
+                if (manipulationHandler == null)
+                {
+                    manipulationHandler = gameObject.AddComponent<ManipulationHandler>();
+                }
+                else
+                {
+                    manipulationHandler.enabled = true;
+                }
+                if (boundingBox == null)
+                {
+                    boundingBox = gameObject.AddComponent<BoundingBox>();
+                    boundingBox.FlattenAxis = FlattenModeType.FlattenZ;
+                    boundingBox.ActiveHandle = HandleType.Rotation | HandleType.Scale;
+                }
+                else
+                {
+                    boundingBox.enabled = true;
+                }
+
+                if (boxCollider != null)
+                    boxCollider.enabled = true;
+                else
+                {
+                    boxCollider = gameObject.AddComponent<BoxCollider>();
+                }
+            }
+            isBox = boxCollider.enabled;
+            isMan = manipulationHandler.enabled;
+            isboud = boundingBox.enabled;
         }
     }
+    public bool isBox;
+        public bool isMan;
+    public bool isboud;
 }

Assets/Scripts/LayoutTemplate/BaseTemPlate.cs

@@ -81,7 +81,7 @@ public class BaseTemPlate : MonoBehaviour
 
     private void Update()
     {
-        if(state)
+        if(state&&!UserInfo.Instance.is20)
         {
             HideCollider();
         }

Assets/Scripts/Net/HttpSocket.cs

@@ -47,7 +47,7 @@ public class HttpSocket : MonoSingleton<HttpSocket>
     {
         while (true)
         {
-           // CalElectric();
+            CalElectric();
             yield return new WaitForSeconds(60f);
         }
     }

Assets/Scripts/UI/GameManager.cs

@@ -284,10 +284,19 @@ public class GameManager : MonoSingleton<GameManager>
                 else
                 {
                     Debug.Log("HJJ  判断正在下载downLoadCount != 0");
-                //    UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
-                    downLoadCount = 0;
-                    DownloadResManager.Instance.Save();
-                    isShowDownTip = false;
+                    TimerMgr.Instance.CreateTimer(()=> {
+                        if (COSDownLoad.showDownLoadCount > COSDownLoad.showDownEndLoadCount)
+                        {
+
+                        }else
+                        {
+
+                            //    UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
+                            downLoadCount = 0;
+                            DownloadResManager.Instance.Save();
+                            isShowDownTip = false;
+                        }
+                    },1f);
                 }
 
                 if(COSDownLoad.showDownLoadCount==0&& downLoadCount ==0)
@@ -573,16 +582,24 @@ public class GameManager : MonoSingleton<GameManager>
         }
 
     }
+
+    public SCToggleSwitch3D sc3D20zuJD;
+    public SCToggleSwitch3D sc3D20zuEditor;
+    public SCToggleSwitch3D sc3Dopen20zu;
+
     public static bool m_IsStartEditorJD;
     public void open20zuJD(bool ison)
     {
         m_IsStartEditorJD = ison;
         if (!ison)
         {
-          //  save20All();
+            //  save20All();
+        }else
+        {
+            sc3D20zuEditor.isOn = false;
+            sc3Dopen20zu.isOn = false;
         }
         SaveButton.SetActive(ison);
-
     }
     public static bool m_IsStartEditorzu;
     public void open20zu(bool ison)
@@ -592,19 +609,30 @@ public class GameManager : MonoSingleton<GameManager>
         {
          //   save20All();
         }
+        else
+        {
+            sc3D20zuJD.isOn = false;
+            sc3D20zuEditor.isOn = false;
+        }
 
         SaveButton.SetActive(ison);
     }
+    public static bool m_IsStart20Editor;
     //2.0编辑模式 保存
     public void open20Editor(bool ison)
     {
 
-        m_IsStartEditor = ison;
+        m_IsStart20Editor = ison;
         if(!ison)
         {
-          //  save20All();
+            //  save20All();
+        }
+        else
+        {
+            sc3D20zuJD.isOn = false;
+            sc3Dopen20zu.isOn = false;
         }
-            SaveButton.SetActive(ison);
+        SaveButton.SetActive(ison);
 
     }
     public GameObject SaveButton;
@@ -612,14 +640,15 @@ public class GameManager : MonoSingleton<GameManager>
     public void save20All()
     {
 
-        if (!m_IsStartEditor)
-        {
+        //if (!m_IsStartEditor)
+       // {
             List<SendSaveDataNew> saveData = new List<SendSaveDataNew>();
             foreach (var i in UserSceneManager.Instance.SceneList[UserSceneManager.Instance.nowId].SpotsList.Keys)
             {
                 SpotsItem sp = UserSceneManager.Instance.SceneList[UserSceneManager.Instance.nowId].SpotsList[i.ToString()];
                 SendSaveDataNew data = new SendSaveDataNew();
                 data.position = sp.position;
+                data.triggerImageId = sp.triggerImageId;
                 data.id = int.Parse(sp.id);
                 data.name = sp.name;
                 data.projectId = int.Parse(UserSceneManager.Instance.SceneList[UserSceneManager.Instance.nowId].id);
@@ -705,7 +734,7 @@ public class GameManager : MonoSingleton<GameManager>
                 Debug.Log("保存回调===》" + str);
             });
 
-        }
+     //   }
     }
     public void OnSettingBtnValueChanged(bool ison)
     {

Assets/Scripts/UI/LoginPanel.cs

@@ -93,6 +93,7 @@ public class LoginPanel : BaseUI
         //m_LockPwdBtn.onClick.AddListener(OnclickLockPwd);
         //m_Password.contentType = SCInputField.ContentType.Standard;
 
+        Debug.Log("1111111111111111111111111111111111111111111111111111");
         m_Logn.onClick.AddListener(OnClickLogin);
         m_RemenberPwd.onValueChanged.AddListener(OnRemPwdValueChange);
         m_Versaion.text = Application.version;
@@ -100,6 +101,7 @@ public class LoginPanel : BaseUI
 
         // OnClickLogin();
 
+
         string path = Application.persistentDataPath + "/Login/";
         LoginAcct la = new LoginAcct();
         la.acc = "";
@@ -110,18 +112,19 @@ public class LoginPanel : BaseUI
             string msg = File.ReadAllText(path + "Login.txt");
             la = JsonConvert.DeserializeObject<LoginAcct>(msg);
 
-        }else
+        }
+        else
         {
             Directory.CreateDirectory(Application.persistentDataPath + "/Login");
         }
 
-
         m_Account.text = la.acc;
         m_Password.text = la.pw;
         m_Logn.interactable = la.isre;
         m_RemenberPwd.isOn = la.isre;
         m_IsRemberPwd = la.isre;
-
+        m_AccountStr = la.acc;
+        m_PasswordStr = la.pw;
 
     }
 
@@ -295,7 +298,7 @@ public class LoginPanel : BaseUI
     /// </summary>
     private void OnClickLogin()
     {
-
+        Debug.Log("22222222222222222222222222222222222");
         if (string.IsNullOrWhiteSpace(m_AccountStr))
         {
             //m_AccountError.gameObject.SetActive(true);
@@ -752,7 +755,6 @@ public class LoginPanel : BaseUI
         base.OnShow(param);
 
         gameObject.transform.localScale = new Vector3(1, 1, 1);
-        m_Logn.interactable = false;